Changeset 269 in kBuild

Timestamp:

May 6, 2005 3:48:25 AM (20 years ago)

Author:

bird

Message:

whiteout.

File:

• trunk/src/gmake/kmkbuiltin/rm.c (modified) (7 diffs)

trunk/src/gmake/kmkbuiltin/rm.c

@@ -58 +58 @@
 #include <unistd.h>
 
+#ifdef __EMX__
+#undef S_IFWHT
+#endif
 #ifndef S_IFWHT
 #define S_IFWHT 0
@@ -143 +146 @@
                         vflag = 1;
                         break;
+#ifdef FTS_WHITEOUT
                 case 'W':
                         Wflag = 1;
                         break;
+#endif
                 default:
                         return usage();
@@ -197 +202 @@
         if (!needstat)
                 flags |= FTS_NOSTAT;
+#ifdef FTS_WHITEOUT
         if (Wflag)
                 flags |= FTS_WHITEOUT;
+#endif
         if (!(fts = fts_open(argv, flags, NULL)))
                 err(1, "fts_open");
@@ -278 +285 @@
                                 break;
 
+#ifdef FTS_W
                         case FTS_W:
                                 rval = undelete(p->fts_accpath);
@@ -287 +295 @@
                                 }
                                 break;
+#endif
 
                         case FTS_NS:
@@ -333 +342 @@
                 /* Assume if can't stat the file, can't unlink it. */
                 if (lstat(f, &sb)) {
+#ifdef FTS_WHITEOUT
                         if (Wflag) {
                                 sb.st_mode = S_IFWHT|S_IWUSR|S_IRUSR;
                         } else {
+#else
+                        {
+#endif
                                 if (!fflag || errno != ENOENT) {
                                         fprintf(stderr, "%s: %s: %s\n", argv0, f, strerror(errno));
@@ -342 +355 @@
                                 continue;
                         }
+#ifdef FTS_WHITEOUT
                 } else if (Wflag) {
                         fprintf(stderr, "%s: %s: %s\n", argv0, f, strerror(EEXIST));
                         eval = 1;
                         continue;
+#endif
                 }