diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-05-11 14:01:43 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-05-11 14:01:43 +0000 |
| commit | 3ec0d26c76d6905501034692d05bddbabae64e76 (patch) | |
| tree | 191efcdfd934a0369cdef723fe4f650fe2f3dcfc /io/ftw.c | |
| parent | 262cf6b3df91d5bb7cbdcae2390333b21e8008d5 (diff) | |
| download | glibc-3ec0d26c76d6905501034692d05bddbabae64e76.tar.gz glibc-3ec0d26c76d6905501034692d05bddbabae64e76.tar.xz glibc-3ec0d26c76d6905501034692d05bddbabae64e76.zip | |
Updated to fedora-glibc-20060511T1325 cvs/fedora-glibc-2_4_90-7
Diffstat (limited to 'io/ftw.c')
| -rw-r--r-- | io/ftw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/io/ftw.c b/io/ftw.c index e96076a203..413871744e 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -301,8 +301,7 @@ open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp) int save_err = errno; free (buf); __set_errno (save_err); - result = -1; - break; + return -1; } buf = newp; } @@ -526,7 +525,7 @@ fail: /* Next, update the `struct FTW' information. */ ++data->ftw.level; - startp = strchr (data->dirbuf, '\0'); + startp = __rawmemchr (data->dirbuf, '\0'); /* There always must be a directory name. */ assert (startp != data->dirbuf); if (startp[-1] != '/') |