Changeset 3179 for trunk

Timestamp:

Apr 22, 2007, 9:11:48 AM (18 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
+
+# if defined(__OS2__) || defined(__NT__) || defined(__WIN__)
+# define NEED_STRRSLASH 1
+# define IS_SLASH(ch)   ( (ch) == '/' || (ch) == '\\' )
+#else
+# define IS_SLASH(ch)   ( (ch) == '/' )
+#endif
+
 
 #include <dirent.h>
@@ -495 +503 @@
 }
 
+#ifdef NEED_STRRSLASH
+static char *strrslash(register char *psz)
+{
+    register char ch;
+    char *pszLast = NULL;
+    for (; (ch = *psz); psz++)
+        switch (ch)
+        {
+            case '/':
+            case '\\':
+            case ':':
+                pszLast = psz;
+                break;
+        }
+    return pszLast;
+}
+#endif
+
 static void
 internal_function
@@ -511 +537 @@
         len = p->fts_pathlen = p->fts_namelen;
         memmove(sp->fts_path, p->fts_name, len + 1);
+#ifdef NEED_STRRSLASH
+        if ((cp = strrslash(p->fts_name)) && (cp != p->fts_name || cp[1])) {
+#else
         if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
+#endif
                 len = strlen(++cp);
                 memmove(p->fts_name, cp, len + 1);
@@ -579 +609 @@
  */
 #define NAPPEND(p)                                                      \
-        (p->fts_path[p->fts_pathlen - 1] == '/'                         \
+        (IS_SLASH(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 || IS_SLASH(p->fts_accpath[0]) ||
             ISSET(FTS_NOCHDIR))
                 return (sp->fts_child = fts_build(sp, instr));
@@ -1004 +1034 @@
          */
         if (nlinks || type == BREAD) {
+#ifdef __EMX__
+                if (fts_safe_changedir(sp, cur, -1, cur->fts_accpath)) {
+#else
                 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)) {
+#endif 
                         if (nlinks && type == BREAD)
                                 cur->fts_errno = errno;
@@ -1013 +1047 @@
                         descend = false;
                         closedir(dirp);
+#ifndef __EMX__
                         if (ISSET(FTS_CWDFD) && 0 <= dir_fd)
                                 close (dir_fd);
+#endif
                         dirp = NULL;
                 } else