maint: fts: give __opendir2 a new parameter and rename

[gnulib.git] / lib / fts.c

diff --git a/lib/fts.c b/lib/fts.c
index 7210c1b..e600a99 100644 (file)
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -1192,6 +1192,17 @@ set_stat_type (struct stat *st, unsigned int dtype)
   st->st_mode = type;
 }
 
+#define fts_opendir(file, Pdir_fd)                              \
+        opendirat((! ISSET(FTS_NOCHDIR) && ISSET(FTS_CWDFD)     \
+                   ? sp->fts_cwd_fd : AT_FDCWD),                \
+                  file,                                         \
+                  (((ISSET(FTS_PHYSICAL)                        \
+                     && ! (ISSET(FTS_COMFOLLOW)                 \
+                           && cur->fts_level == FTS_ROOTLEVEL)) \
+                    ? O_NOFOLLOW : 0)                           \
+                   | (ISSET (FTS_NOATIME) ? O_NOATIME : 0)),    \
+                  Pdir_fd)
+
 /*
  * This is the tricky part -- do not casually change *anything* in here.  The
  * idea is to build the linked list of entries that are used by fts_children
@@ -1229,59 +1240,39 @@ fts_build (register FTS *sp, int type)
         /* Set current node pointer. */
         cur = sp->fts_cur;
 
-        /*
-         * Open the directory for reading.  If this fails, we're done.
-         * If being called from fts_read, set the fts_info field.
-         */
-#if defined FTS_WHITEOUT && 0
-        if (ISSET(FTS_WHITEOUT))
-                oflag = DTF_NODUP|DTF_REWIND;
-        else
-                oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND;
-#else
-# define __opendir2(file, flag) \
-        opendirat((! ISSET(FTS_NOCHDIR) && ISSET(FTS_CWDFD)     \
-                   ? sp->fts_cwd_fd : AT_FDCWD),                \
-                  file,                                         \
-                  (((ISSET(FTS_PHYSICAL)                        \
-                     && ! (ISSET(FTS_COMFOLLOW)                 \
-                           && cur->fts_level == FTS_ROOTLEVEL)) \
-                    ? O_NOFOLLOW : 0)                           \
-                   | (ISSET (FTS_NOATIME) ? O_NOATIME : 0)),    \
-                  &dir_fd)
-#endif
-       if ((dirp = __opendir2(cur->fts_accpath, oflag)) == NULL) {
+        /* Open the directory for reading.  If this fails, we're done.
+           If being called from fts_read, set the fts_info field.  */
+        if ((dirp = fts_opendir(cur->fts_accpath, &dir_fd)) == NULL) {
                 if (type == BREAD) {
                         cur->fts_info = FTS_DNR;
                         cur->fts_errno = errno;
                 }
                 return (NULL);
         }
-       /* Rather than calling fts_stat for each and every entry encountered
-          in the readdir loop (below), stat each directory only right after
-          opening it.  */
-       if (cur->fts_info == FTS_NSOK)
-         cur->fts_info = fts_stat(sp, cur, false);
-       else if (sp->fts_options & FTS_TIGHT_CYCLE_CHECK) {
-                /* Now read the stat info again after opening a directory to
-                 * reveal eventual changes caused by a submount triggered by
-                 * the traversal.  But do it only for utilities which use
-                 * FTS_TIGHT_CYCLE_CHECK.  Therefore, only find and du
-                 * benefit/suffer from this feature for now.
-                 */
-                LEAVE_DIR (sp, cur, "4");
-                fts_stat (sp, cur, false);
-                if (! enter_dir (sp, cur)) {
-                         __set_errno (ENOMEM);
-                         return NULL;
-                }
-        }
+        /* Rather than calling fts_stat for each and every entry encountered
+           in the readdir loop (below), stat each directory only right after
+           opening it.  */
+        if (cur->fts_info == FTS_NSOK)
+          cur->fts_info = fts_stat(sp, cur, false);
+        else if (sp->fts_options & FTS_TIGHT_CYCLE_CHECK)
+          {
+            /* Now read the stat info again after opening a directory to
+               reveal eventual changes caused by a submount triggered by
+               the traversal.  But do it only for utilities which use
+               FTS_TIGHT_CYCLE_CHECK.  Therefore, only find and du
+               benefit/suffer from this feature for now. */
+            LEAVE_DIR (sp, cur, "4");
+            fts_stat (sp, cur, false);
+            if (! enter_dir (sp, cur))
+              {
+                __set_errno (ENOMEM);
+                return NULL;
+              }
+          }
 
-        /*
-         * Nlinks is the number of possible entries of type directory in the
-         * directory if we're cheating on stat calls, 0 if we're not doing
-         * any stat calls at all, (nlink_t) -1 if we're statting everything.
-         */
+        /* Nlinks is the number of possible entries of type directory in the
+           directory if we're cheating on stat calls, 0 if we're not doing
+           any stat calls at all, (nlink_t) -1 if we're statting everything.  */
         if (type == BNAMES) {
                 nlinks = 0;
                 /* Be quiet about nostat, GCC. */
@@ -1412,10 +1403,6 @@ mem1:                           saved_errno = errno;
                 p->fts_parent = sp->fts_cur;
                 p->fts_pathlen = new_len;
 
-#if defined FTS_WHITEOUT && 0
-                if (dp->d_type == DT_WHT)
-                        p->fts_flags |= FTS_ISW;
-#endif
                 /* Store dirent.d_ino, in case we need to sort
                    entries before processing them.  */
                 p->fts_statp->st_ino = D_INO (dp);
@@ -1690,15 +1677,6 @@ fts_stat(FTS *sp, register FTSENT *p, bool follow)
         if (p->fts_level == FTS_ROOTLEVEL && ISSET(FTS_COMFOLLOW))
                 follow = true;
 
-#if defined FTS_WHITEOUT && 0
-        /* check for whiteout */
-        if (p->fts_flags & FTS_ISW) {
-                memset(sbp, '\0', sizeof (*sbp));
-                sbp->st_mode = S_IFWHT;
-                return (FTS_W);
-       }
-#endif
-
         /*
          * If doing a logical walk, or application requested FTS_FOLLOW, do
          * a stat(2).  If that fails, check for a non-existent symlink.  If