Changeset 2708 for trunk/src/kmk

Timestamp:

Nov 21, 2013, 11:26:40 AM (12 years ago)

Author:

bird

Message:

Optimized ftsfake.c for windows (similar things can be done for OS/2, if we care).

File:

• trunk/src/kmk/kmkbuiltin/fts.c (modified) (7 diffs)

trunk/src/kmk/kmkbuiltin/fts.c

@@ -127 +127 @@
 static FTSENT   *fts_sort(FTS *, FTSENT *, size_t);
 static u_short   fts_stat(FTS *, FTSENT *, int);
+#ifdef _MSC_VER
+static u_short   fts_stat_dirent(FTS *sp, FTSENT *p, int follow, struct dirent *pDirEnt);
+#endif
 static int       fts_safe_changedir(const FTS *, const FTSENT *, int,
     const char *);
 
 #ifdef _MSC_VER
-#undef HAVE_STRUCT_DIRENT_D_NAMLEN
-#undef HAVE_FCHDIR
+# undef HAVE_FCHDIR
 #endif
 
@@ -387 +389 @@
                 if (chdir(sp->fts_rdir))
                         saved_errno =  errno;
-        free(sp->fts_rdir);
+                free(sp->fts_rdir);
                 sp->fts_rdir = NULL;
 #endif
@@ -786 +788 @@
         else
                 oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND;
+#elif defined(_MSC_VER)
+# define __opendir2(path, flag) birdDirOpenExtraInfo(path)
 #else
 #define __opendir2(path, flag) opendir(path)
@@ -941 +945 @@
                         } else
                                 p->fts_accpath = p->fts_name;
+
                         /* Stat it. */
+#ifdef _MSC_VER
+                        p->fts_info = fts_stat_dirent(sp, p, 0, dp);
+#else
                         p->fts_info = fts_stat(sp, p, 0);
+#endif
 
                         /* Decrement link count if applicable. */
@@ -1012 +1021 @@
 }
 
+#ifdef _MSC_VER
+/** Special version of fts_stat that takes the information from the directory
+ *  entry returned by readdir().
+ *
+ *  Directory listing returns all the stat information on systems likes
+ *  Windows and OS/2. */
 static u_short
-fts_stat(sp, p, follow)
-        FTS *sp;
-        FTSENT *p;
-        int follow;
+fts_stat_dirent(FTS *sp, FTSENT *p, int follow, struct dirent *pDirEnt)
 {
         FTSENT *t;
@@ -1030 +1042 @@
         sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
 
-#ifdef FTS_WHITEOUT
-        /* check for whiteout */
-        if (p->fts_flags & FTS_ISW) {
-                if (sbp != &sb) {
-                        memset(sbp, '\0', sizeof (*sbp));
-                        sbp->st_mode = S_IFWHT;
-                }
-                return (FTS_W);
-        }
-#endif
+        /*
+         * Copy over the stat info from the direntry.
+         */
+        *sbp = pDirEnt->d_stat;
 
         /*
          * If doing a logical walk, or application requested FTS_FOLLOW, do
-         * a stat(2).  If that fails, check for a non-existent symlink.  If
-         * fail, set the errno from the stat call.
-         */
-        if (ISSET(FTS_LOGICAL) || follow) {
+         * a stat(2) on symlinks.  If that fails, assume non-existent
+         * symlink and set the errno from the stat call.
+         */
+        if (S_ISLNK(sbp->st_mode) && (ISSET(FTS_LOGICAL) || follow)) {
                 if (stat(p->fts_accpath, sbp)) {
                         saved_errno = errno;
-                        if (!lstat(p->fts_accpath, sbp)) {
-                                errno = 0;
-                                return (FTS_SLNONE);
-                        }
-                        p->fts_errno = saved_errno;
-                        goto err;
-                }
-        } else if (lstat(p->fts_accpath, sbp)) {
-                p->fts_errno = errno;
-err:            memset(sbp, 0, sizeof(struct STAT));
-                return (FTS_NS);
+                        errno = 0;
+                        return (FTS_SLNONE);
+                }
         }
 
@@ -1087 +1085 @@
                 if (ino && dev) /** @todo ino emulation on windows... */
 #endif
+                    for (t = p->fts_parent;
+                        t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
+                            if (ino == t->fts_ino && dev == t->fts_dev) {
+                                    p->fts_cycle = t;
+                                    return (FTS_DC);
+                            }
+                return (FTS_D);
+        }
+        if (S_ISLNK(sbp->st_mode))
+                return (FTS_SL);
+        if (S_ISREG(sbp->st_mode))
+                return (FTS_F);
+        return (FTS_DEFAULT);
+}
+
+#endif /* fts_stat_dirent */
+
+static u_short
+fts_stat(sp, p, follow)
+        FTS *sp;
+        FTSENT *p;
+        int follow;
+{
+        FTSENT *t;
+        dev_t dev;
+        ino_t ino;
+        struct STAT *sbp, sb;
+        int saved_errno;
+
+        _DIAGASSERT(sp != NULL);
+        _DIAGASSERT(p != NULL);
+
+        /* If user needs stat info, stat buffer already allocated. */
+        sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
+
+#ifdef FTS_WHITEOUT
+        /* check for whiteout */
+        if (p->fts_flags & FTS_ISW) {
+                if (sbp != &sb) {
+                        memset(sbp, '\0', sizeof (*sbp));
+                        sbp->st_mode = S_IFWHT;
+                }
+                return (FTS_W);
+        }
+#endif
+
+        /*
+         * If doing a logical walk, or application requested FTS_FOLLOW, do
+         * a stat(2).  If that fails, check for a non-existent symlink.  If
+         * fail, set the errno from the stat call.
+         */
+        if (ISSET(FTS_LOGICAL) || follow) {
+                if (stat(p->fts_accpath, sbp)) {
+                        saved_errno = errno;
+                        if (!lstat(p->fts_accpath, sbp)) {
+                                errno = 0;
+                                return (FTS_SLNONE);
+                        }
+                        p->fts_errno = saved_errno;
+                        goto err;
+                }
+        } else if (lstat(p->fts_accpath, sbp)) {
+                p->fts_errno = errno;
+err:            memset(sbp, 0, sizeof(struct STAT));
+                return (FTS_NS);
+        }
+
+        if (S_ISDIR(sbp->st_mode)) {
+                /*
+                 * Set the device/inode.  Used to find cycles and check for
+                 * crossing mount points.  Also remember the link count, used
+                 * in fts_build to limit the number of stat calls.  It is
+                 * understood that these fields are only referenced if fts_info
+                 * is set to FTS_D.
+                 */
+                dev = p->fts_dev = sbp->st_dev;
+                ino = p->fts_ino = sbp->st_ino;
+                p->fts_nlink = sbp->st_nlink;
+
+                if (ISDOT(p->fts_name))
+                        return (FTS_DOT);
+
+                /*
+                 * Cycle detection is done by brute force when the directory
+                 * is first encountered.  If the tree gets deep enough or the
+                 * number of symbolic links to directories is high enough,
+                 * something faster might be worthwhile.
+                 */
+
+#ifdef _MSC_VER
+                if (ino && dev) /** @todo ino emulation on windows... */
+#endif
                 for (t = p->fts_parent;
                     t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)