Changeset 3179 for trunk/essentials

Timestamp:

Apr 22, 2007, 9:11:48 AM (19 years ago)

Author:

bird

Message:

Why can't these guys just use the libc fts when present. crap.

File:

• trunk/essentials/sys-apps/findutils/gnulib/lib/fts.c (modified) (7 diffs)

trunk/essentials/sys-apps/findutils/gnulib/lib/fts.c

@@ -77 +77 @@
 # include "same-inode.h"
 #endif
+
+
+
+
+
+
+
+
 
 #include <dirent.h>
@@ -495 +503 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 static void
 internal_function
@@ -511 +537 @@
         len = p->fts_pathlen = p->fts_namelen;
         memmove(sp->fts_path, p->fts_name, len + 1);
+
+
+
         if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
+
                 len = strlen(++cp);
                 memmove(p->fts_name, cp, len + 1);
@@ -579 +609 @@
  */
 #define NAPPEND(p)                                                      \
-        (p->fts_path[p->fts_pathlen - 1] == '/'                         \
+        (                              \
             ? p->fts_pathlen - 1 : p->fts_pathlen)
 
@@ -881 +911 @@
          * fts_read will work.
          */
-        if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
+        if (p->fts_level != FTS_ROOTLEVEL ||  ||
             ISSET(FTS_NOCHDIR))
                 return (sp->fts_child = fts_build(sp, instr));
@@ -1004 +1034 @@
          */
         if (nlinks || type == BREAD) {
+
+
+
                 int dir_fd = dirfd(dirp);
                 if (ISSET(FTS_CWDFD) && 0 <= dir_fd)
                   dir_fd = dup (dir_fd);
                 if (dir_fd < 0 || fts_safe_changedir(sp, cur, dir_fd, NULL)) {
+
                         if (nlinks && type == BREAD)
                                 cur->fts_errno = errno;
@@ -1013 +1047 @@
                         descend = false;
                         closedir(dirp);
+
                         if (ISSET(FTS_CWDFD) && 0 <= dir_fd)
                                 close (dir_fd);
+
                         dirp = NULL;
                 } else