Changeset 2990 in kBuild

Timestamp:

Nov 1, 2016 9:55:39 PM (8 years ago)

Author:

bird

Message:

fts-nt: Ported fts_children.

File:

• trunk/src/lib/nt/fts-nt.c (modified) (5 diffs)

trunk/src/lib/nt/fts-nt.c

@@ -176 +176 @@
                        the API user code happy.  1. Lone drive letters get a dot
                        appended so it won't matter if a slash is appended afterwards.
-                           2. DOS slashes are converted to UNIX ones. */
+                       2. DOS slashes are converted to UNIX ones. */
                 char *slash;
                 len = strlen(*argv);
@@ -261 +261 @@
         len = p->fts_pathlen = p->fts_namelen;
         memmove(sp->fts_path, p->fts_name, len + 1);
-/** @todo check for ':' and '\\'? */
         if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
                 len = strlen(++cp);
@@ -510 +509 @@
 }
 
-#if 0
 FTSENT * FTSCALL
 fts_children(FTS *sp, int instr)
 {
         FTSENT *p;
-        int fd, rc, serrno;
 
         if (instr != 0 && instr != FTS_NAMEONLY) {
@@ -548 +545 @@
 
         /* Free up any previous child list. */
-        if (sp->fts_child != NULL)
+        if (sp->fts_child != NULL) {
                 fts_lfree(sp->fts_child);
-
+                sp->fts_child = NULL; /* (bird - double free for _open(".") failure in original) */
+        }
+
+        /* NT: Some BSD utility sets FTS_NAMEONLY? We don't really need this
+               optimization, but since it only hurts that utility, it can stay.  */
         if (instr == FTS_NAMEONLY) {
+                assert(0); /* don't specify FTS_NAMEONLY on NT. */
                 SET(FTS_NAMEONLY);
                 instr = BNAMES;
@@ -557 +559 @@
                 instr = BCHILD;
 
-        /*
-         * If using chdir on a relative path and called BEFORE fts_read does
-         * its chdir to the root of a traversal, we can lose -- we need to
-         * chdir into the subdirectory, and we don't know where the current
-         * directory is, so we can't get back so that the upcoming chdir by
-         * fts_read will work.
-         */
-        if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
-            ISSET(FTS_NOCHDIR))
-                return (sp->fts_child = fts_build(sp, instr));
-
-        if ((fd = _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0)
-                return (NULL);
-        sp->fts_child = fts_build(sp, instr);
-        serrno = (sp->fts_child == NULL) ? errno : 0;
-        rc = fchdir(fd);
-        if (rc < 0 && serrno == 0)
-                serrno = errno;
-        (void)_close(fd);
-        errno = serrno;
-        if (rc < 0)
-                return (NULL);
-        return (sp->fts_child);
-}
-#endif /* PORTME */
+        return (sp->fts_child = fts_build(sp, instr));
+}
 
 #ifndef fts_get_clientptr