From: Jim Meyering <jim@meyering.net>
Date: Sat, 8 Feb 2003 17:07:38 +0000 (+0000)
Subject: (ftw_startup): When using FTW_CHDIR, always remember
X-Git-Tag: v4.5.7~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f99cc7ac67856c66c751442f524f530fcde6f344;p=thirdparty%2Fcoreutils.git

(ftw_startup): When using FTW_CHDIR, always remember
the current directory, not just when DIR contains a slash.
---

diff --git a/lib/ftw.c b/lib/ftw.c
index 982b047c3e..b3dd2fc706 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