diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-02-08 18:29:49 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-02-08 18:29:49 +0000 |
| commit | 34c86f425441d13e9e6cebd2ce1ebd99fc373ce2 (patch) | |
| tree | be85fca7458e1d4c889ec278868d5d091462bee7 /io/ftw.c | |
| parent | ae9ecd08db965a4987a4d1351e2c51deb5c6e9b5 (diff) | |
| download | glibc-34c86f425441d13e9e6cebd2ce1ebd99fc373ce2.tar.gz glibc-34c86f425441d13e9e6cebd2ce1ebd99fc373ce2.tar.xz glibc-34c86f425441d13e9e6cebd2ce1ebd99fc373ce2.zip | |
Update.
2003-02-08 Ulrich Drepper <drepper@redhat.com> * io/ftwtest.c: Get current working directory before and after the nftw call and make sure they match. 2003-02-08 Jim Meyering <jim@meyering.net> * ftw.c (ftw_startup): When using FTW_CHDIR, always remember the current directory, not just when DIR contains a slash. Reported by Manoj Srivastava.
Diffstat (limited to 'io/ftw.c')
| -rw-r--r-- | io/ftw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/io/ftw.c b/io/ftw.c index 227f3f3b52..3d2d940cd8 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -629,13 +629,13 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, data.known_objects = NULL; /* Now go to the directory containing the initial file/directory. */ - if ((flags & FTW_CHDIR) && data.ftw.base > 0) + if (flags & FTW_CHDIR) { /* GNU extension ahead. */ cwd = __getcwd (NULL, 0); if (cwd == NULL) result = -1; - else + else if (data.ftw.base > 0) { /* Change to the directory the file is in. In data.dirbuf we have a writable copy of the file name. Just NUL |