Changeset 1966 for trunk/src

Timestamp:

May 6, 2005, 1:24:48 AM (21 years ago)

Author:

bird

Message:

There is a bunch of things here we don't support, fchdir related mostly. Hope this'll work...

File:

• trunk/src/emx/src/lib/bsd/gen/fts.c (modified) (27 diffs, 1 prop)

trunk/src/emx/src/lib/bsd/gen/fts.c

@@ -39 +39 @@
 #endif /* LIBC_SCCS and not lint */
 #endif
+
+
+
+
+
+
+
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.27 2004/06/08 06:23:23 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.27 2004/06/08 06:23:23 das Exp $");
 
 #include "namespace.h"
@@ -75 +82 @@
 #define SET(opt)        (sp->fts_options |= (opt))
 
+
 #define FCHDIR(sp, fd)  (!ISSET(FTS_NOCHDIR) && fchdir(fd))
+
+
+
 
 /* fts_build flags */
@@ -94 +105 @@
 };
 
+
 /*
  * The "FTS_NOSTAT" option can avoid a lot of calls to stat(2) if it
@@ -110 +122 @@
         0
 };
+
 
 FTS *
@@ -212 +225 @@
          * descriptor we run anyway, just more slowly.
          */
+
         if (!ISSET(FTS_NOCHDIR) && (sp->fts_rfd = _open(".", O_RDONLY, 0)) < 0)
-                SET(FTS_NOCHDIR);
+#else
+        if (!ISSET(FTS_NOCHDIR) && (sp->fts_rdir = getcwd(NULL, 0)) != NULL)
+#endif
+            SET(FTS_NOCHDIR);
 
         return (sp);
@@ -224 +241 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 static void
 fts_load(sp, p)
@@ -241 +276 @@
         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);
@@ -280 +319 @@
         /* Return to original directory, save errno if necessary. */
         if (!ISSET(FTS_NOCHDIR)) {
+
                 saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
                 (void)_close(sp->fts_rfd);
+
+
+
+
 
                 /* Set errno and return. */
@@ -297 +341 @@
 }
 
+
 /*
  * Special case of "/" at the end of the path so that slashes aren't
@@ -302 +347 @@
  */
 #define NAPPEND(p)                                                      \
-        (p->fts_path[p->fts_pathlen - 1] == '/'                         \
+        (                      \
             ? p->fts_pathlen - 1 : p->fts_pathlen)
 
@@ -341 +386 @@
                 p->fts_info = fts_stat(sp, p, 1);
                 if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
+
                         if ((p->fts_symfd = _open(".", O_RDONLY, 0)) < 0) {
                                 p->fts_errno = errno;
@@ -346 +392 @@
                         } else
                                 p->fts_flags |= FTS_SYMFOLLOW;
+
                 }
                 return (p);
@@ -355 +402 @@
                 if (instr == FTS_SKIP ||
                     (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
+
                         if (p->fts_flags & FTS_SYMFOLLOW)
                                 (void)_close(p->fts_symfd);
+
                         if (sp->fts_child) {
                                 fts_lfree(sp->fts_child);
@@ -413 +462 @@
                  */
                 if (p->fts_level == FTS_ROOTLEVEL) {
+
                         if (FCHDIR(sp, sp->fts_rfd)) {
+
+
+
                                 SET(FTS_STOP);
                                 return (NULL);
@@ -431 +484 @@
                         p->fts_info = fts_stat(sp, p, 1);
                         if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
+
                                 if ((p->fts_symfd =
                                     _open(".", O_RDONLY, 0)) < 0) {
@@ -437 +491 @@
                                 } else
                                         p->fts_flags |= FTS_SYMFOLLOW;
+
                         }
                         p->fts_instr = FTS_NOINSTR;
@@ -470 +525 @@
          */
         if (p->fts_level == FTS_ROOTLEVEL) {
+
                 if (FCHDIR(sp, sp->fts_rfd)) {
+
+
+
                         SET(FTS_STOP);
                         return (NULL);
                 }
+
         } else if (p->fts_flags & FTS_SYMFOLLOW) {
                 if (FCHDIR(sp, p->fts_symfd)) {
@@ -483 +543 @@
                 }
                 (void)_close(p->fts_symfd);
+
+
+
         } else if (!(p->fts_flags & FTS_DONTCHDIR) &&
             fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
@@ -520 +583 @@
 {
         FTSENT *p;
+
         int fd;
-
+#else
+        char *pszRoot;
+        int rc;
+#endif
         if (instr != 0 && instr != FTS_NAMEONLY) {
                 errno = EINVAL;
@@ -569 +636 @@
          * 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));
 
+
         if ((fd = _open(".", O_RDONLY, 0)) < 0)
+
+
+
                 return (NULL);
         sp->fts_child = fts_build(sp, instr);
+
         if (fchdir(fd))
                 return (NULL);
         (void)_close(fd);
+
+
+
+
+
+
         return (sp->fts_child);
 }
@@ -653 +731 @@
                 oflag = DTF_HIDEW | DTF_NODUP | DTF_REWIND;
 #else
+
 #define __opendir2(path, flag) opendir(path)
 #endif
@@ -705 +784 @@
         cderrno = 0;
         if (nlinks || type == BREAD) {
+
                 if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
+
+
+
                         if (nlinks && type == BREAD)
                                 cur->fts_errno = errno;
@@ -870 +953 @@
         if (descend && (type == BCHILD || !nitems) &&
             (cur->fts_level == FTS_ROOTLEVEL ?
+
             FCHDIR(sp, sp->fts_rfd) :
+
+
+
             fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
                 cur->fts_info = FTS_ERR;
@@ -1172 +1259 @@
         if (ISSET(FTS_NOCHDIR))
                 return (0);
+
         if (fd < 0 && (newfd = _open(path, O_RDONLY, 0)) < 0)
                 return (-1);
         if (_fstat(newfd, &sb)) {
+
+
+
+
                 ret = -1;
                 goto bail;
@@ -1183 +1275 @@
                 goto bail;
         }
+
         ret = fchdir(newfd);
+
+
+
 bail:
+
         oerrno = errno;
         if (fd < 0)
                 (void)_close(newfd);
         errno = oerrno;
+
+
+
         return (ret);
 }
@@ -1202 +1302 @@
 
         priv = (struct _fts_private *)sp;
+
+
+
+
+
         /*
          * If this node's device is different from the previous, grab
@@ -1223 +1328 @@
                 }
         }
+
         return (priv->ftsp_linksreliable);
 }