Changeset 809 for trunk/src/gmake/kmkbuiltin/fts.c

Timestamp:

Jan 29, 2007, 6:54:36 AM (18 years ago)

Author:

bird

Message:

Solaris + cleanup.

File:

• trunk/src/gmake/kmkbuiltin/fts.c (modified) (14 diffs)

trunk/src/gmake/kmkbuiltin/fts.c

@@ -56 +56 @@
 #include <stdlib.h>
 #include <string.h>
-#ifndef _MSC_VER
 #include <unistd.h>
-#else
-#include "mscfakes.h"
-#define dirfd(dir) -1
-#endif 
-#include "ftsfake.h"
+
+#ifdef __sun__
+# include "solfakes.h"
+# define dirfd(dir) -1
+#endif
+#ifdef _MSC_VER
+# include "mscfakes.h"
+# define dirfd(dir) -1
+#endif
 
 #if ! HAVE_NBTOOL_CONFIG_H
+#ifndef __sun__
 #define HAVE_STRUCT_DIRENT_D_NAMLEN 1
+#endif
 #endif
 
@@ -78 +83 @@
 #endif /* __LIBC12_SOURCE__ */
 #endif /* __weak_alias */
-#endif 
+#endif
 
 #ifdef __LIBC12_SOURCE__
@@ -120 +125 @@
 #undef HAVE_STRUCT_DIRENT_D_NAMLEN
 #undef HAVE_FCHDIR
-#endif 
+#endif
 
 #if defined(__EMX__) || defined(_MSC_VER)
@@ -268 +273 @@
                 if ((sp->fts_rdir = getcwd(NULL, 0)) != NULL)
                         SET(FTS_NOCHDIR);
-#endif 
+#endif
         }
 
@@ -374 +379 @@
                 if (chdir(sp->fts_rdir))
                         saved_errno =  errno;
-        free(sp->fts_rdir); 
+        free(sp->fts_rdir);
                 sp->fts_rdir = NULL;
-#endif 
+#endif
         }
 
@@ -467 +472 @@
                         p->fts_info = FTS_DP;
                         return (p);
-                } 
+                }
 
                 /* Rebuild if only read the names and now traversing. */
@@ -520 +525 @@
 #else
                         if (CHDIR(sp, sp->fts_rdir)) {
-#endif 
+#endif
                                 SET(FTS_STOP);
                                 return (NULL);
@@ -587 +592 @@
 #else
                 if (CHDIR(sp, sp->fts_rdir)) {
-#endif 
+#endif
                         SET(FTS_STOP);
                         return (NULL);
@@ -691 +696 @@
                 SET(FTS_NAMEONLY);
                 instr = BNAMES;
-        } else 
+        } else
                 instr = BCHILD;
 
@@ -913 +918 @@
                 } else if (nlinks == 0
 #ifdef DT_DIR
-                    || (nostat && 
+                    || (nostat &&
                     dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
 #endif
@@ -979 +984 @@
 #else
             CHDIR(sp, sp->fts_rdir) :
-#endif 
+#endif
             fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
                 cur->fts_info = FTS_ERR;
@@ -1039 +1044 @@
                                 errno = 0;
                                 return (FTS_SLNONE);
-                        } 
+                        }
                         p->fts_errno = saved_errno;
                         goto err;
@@ -1114 +1119 @@
         for (ap = sp->fts_array, p = head; p; p = p->fts_link)
                 *ap++ = p;
-        qsort((void *)sp->fts_array, nitems, sizeof(FTSENT *), 
+        qsort((void *)sp->fts_array, nitems, sizeof(FTSENT *),
                 (int (*)(const void *, const void *))sp->fts_compar);
         for (head = *(ap = sp->fts_array); --nitems; ++ap)
@@ -1222 +1227 @@
  * Most systems will allow creation of paths much longer than MAXPATHLEN, even
  * though the kernel won't resolve them.  Round up the new size to a power of 2,
- * so we don't realloc the path 2 bytes at a time. 
+ * so we don't realloc the path 2 bytes at a time.
  */
 static int