From f99cc7ac67856c66c751442f524f530fcde6f344 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 8 Feb 2003 17:07:38 +0000 Subject: [PATCH] (ftw_startup): When using FTW_CHDIR, always remember the current directory, not just when DIR contains a slash. --- lib/ftw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ftw.c b/lib/ftw.c index 982b047..b3dd2fc 100644 --- a/lib/ftw.c +++ b/lib/ftw.c @@ -691,13 +691,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 -- 2.7.4