Changeset 2497

Timestamp:

Dec 18, 2005, 12:25:44 PM (20 years ago)

Author:

bird

Message:

Fixes #24

• chdir() crash in fts.c.
• dirfd() problem in fts.c which prevent us from getting

any results in child directories.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/bsd/gen/fts.c (modified) (17 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -5 +5 @@
 2005-12-18: knut st. osmundsen <bird-gccos2-spam@anduin.net>
     - libc:
+        o #24: Fixed chdir() crash in fts.c.
+        o #24: Fixed dirfd() problem in fts.c which prevent us from getting
+          any results in child directories.
         o #22: Added DosFindFirst() as fallback when DosQueryPathInfo() fails
           to query the symlink EA in the path resolver. This problem occurs

branches/libc-0.6/src/emx/src/lib/bsd/gen/fts.c

@@ -40 +40 @@
 #endif
 #ifndef __EMX__
+# define HAVE_FCHDIR
+# define HAVE_DIRFD
 # define IS_SLASH(ch)   ( (ch) == '/' )
 #else
 # define NEED_STRRSLASH
+# define HAVE_FCHDIR
+# undef HAVE_DIRFD
 # define IS_SLASH(ch)   ( (ch) == '/' || (ch) == '\\' )
 #endif
@@ -224 +228 @@
          * descriptor we run anyway, just more slowly.
          */
+#ifdef HAVE_FCHDIR
         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);
@@ -314 +322 @@
         /* Return to original directory, save errno if necessary. */
         if (!ISSET(FTS_NOCHDIR)) {
+#ifdef HAVE_FCHDIR
                 saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
                 (void)_close(sp->fts_rfd);
+#else
+                saved_errno = chdir(sp->fts_rdir) ? errno : 0;
+                free(sp->fts_rdir); sp->fts_rdir = NULL;
+#endif
 
                 /* Set errno and return. */
@@ -375 +388 @@
                 p->fts_info = fts_stat(sp, p, 1);
                 if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
+#ifdef HAVE_FCHDIR
                         if ((p->fts_symfd = _open(".", O_RDONLY, 0)) < 0) {
                                 p->fts_errno = errno;
@@ -380 +394 @@
                         } else
                                 p->fts_flags |= FTS_SYMFOLLOW;
+#endif
                 }
                 return (p);
@@ -389 +404 @@
                 if (instr == FTS_SKIP ||
                     (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
+#ifdef HAVE_FCHDIR
                         if (p->fts_flags & FTS_SYMFOLLOW)
                                 (void)_close(p->fts_symfd);
+#endif
                         if (sp->fts_child) {
                                 fts_lfree(sp->fts_child);
@@ -447 +464 @@
                  */
                 if (p->fts_level == FTS_ROOTLEVEL) {
+#ifdef HAVE_FCHDIR
                         if (FCHDIR(sp, sp->fts_rfd)) {
+#else
+                        if (FCHDIR(sp, sp->fts_rdir)) {
+#endif
                                 SET(FTS_STOP);
                                 return (NULL);
@@ -465 +486 @@
                         p->fts_info = fts_stat(sp, p, 1);
                         if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
+#ifdef HAVE_FCHDIR
                                 if ((p->fts_symfd =
                                     _open(".", O_RDONLY, 0)) < 0) {
@@ -471 +493 @@
                                 } else
                                         p->fts_flags |= FTS_SYMFOLLOW;
+#endif
                         }
                         p->fts_instr = FTS_NOINSTR;
@@ -504 +527 @@
          */
         if (p->fts_level == FTS_ROOTLEVEL) {
+#ifdef HAVE_FCHDIR
                 if (FCHDIR(sp, sp->fts_rfd)) {
+#else
+                if (FCHDIR(sp, sp->fts_rdir)) {
+#endif
                         SET(FTS_STOP);
                         return (NULL);
                 }
+#ifdef HAVE_FCHDIR
         } else if (p->fts_flags & FTS_SYMFOLLOW) {
                 if (FCHDIR(sp, p->fts_symfd)) {
@@ -517 +545 @@
                 }
                 (void)_close(p->fts_symfd);
+#else
+        (void)saved_errno;
+#endif
         } else if (!(p->fts_flags & FTS_DONTCHDIR) &&
             fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
@@ -554 +585 @@
 {
         FTSENT *p;
+#ifdef HAVE_FCHDIR
         int fd;
-
+#else
+        char *pszRoot;
+        int rc;
+#endif
         if (instr != 0 && instr != FTS_NAMEONLY) {
                 errno = EINVAL;
@@ -607 +642 @@
                 return (sp->fts_child = fts_build(sp, instr));
 
+#ifdef HAVE_FCHDIR
         if ((fd = _open(".", O_RDONLY, 0)) < 0)
+#else
+        if ((pszRoot = getcwd(NULL, 0)) == NULL)
+#endif
                 return (NULL);
         sp->fts_child = fts_build(sp, instr);
+#ifdef HAVE_FCHDIR
         if (fchdir(fd))
                 return (NULL);
         (void)_close(fd);
+#else
+        rc = chdir(pszRoot);
+        free(pszRoot);
+        if (rc)
+            return NULL;
+#endif
         return (sp->fts_child);
 }
@@ -740 +786 @@
         cderrno = 0;
         if (nlinks || type == BREAD) {
+#ifdef HAVE_DIRFD
                 if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
+#else
+                if (fts_safe_changedir(sp, cur, -1, cur->fts_accpath)) {
+#endif
                         if (nlinks && type == BREAD)
                                 cur->fts_errno = errno;
@@ -905 +955 @@
         if (descend && (type == BCHILD || !nitems) &&
             (cur->fts_level == FTS_ROOTLEVEL ?
+#ifdef HAVE_FCHDIR
             FCHDIR(sp, sp->fts_rfd) :
+#else
+            FCHDIR(sp, sp->fts_rdir) :
+#endif
             fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
                 cur->fts_info = FTS_ERR;
@@ -1207 +1261 @@
         if (ISSET(FTS_NOCHDIR))
                 return (0);
+#ifdef HAVE_FCHDIR
         if (fd < 0 && (newfd = _open(path, O_RDONLY, 0)) < 0)
                 return (-1);
         if (_fstat(newfd, &sb)) {
+#else
+        (void)newfd;
+        if (_stat(path, &sb)) {
+#endif
                 ret = -1;
                 goto bail;
@@ -1218 +1277 @@
                 goto bail;
         }
+#ifdef HAVE_FCHDIR
         ret = fchdir(newfd);
+#else
+        ret = chdir(path);
+#endif
 bail:
+#ifdef HAVE_FCHDIR
         oerrno = errno;
         if (fd < 0)
                 (void)_close(newfd);
         errno = oerrno;
+#else
+        (void)oerrno;
+#endif
         return (ret);
 }