Changeset 370 for trunk/src/gmake/kmkbuiltin/rm.c

Timestamp:

Dec 18, 2005, 4:48:02 AM (20 years ago)

Author:

bird

Message:

o Ported all kmk builtins to win32.
o Fixed serveral bugs in kmk builtins.
o Probably broke both linux, bsd and OS/2. :-)

File:

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

trunk/src/gmake/kmkbuiltin/rm.c

@@ -38 +38 @@
 static char sccsid[] = "@(#)rm.c        8.5 (Berkeley) 4/18/94";
 #endif /* not lint */
-#endif
 #include <sys/cdefs.h>
 //__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.47 2004/04/06 20:06:50 markm Exp $");
+#endif
 
 #include <sys/stat.h>
+#ifndef _MSC_VER
 #include <sys/param.h>
 #include <sys/mount.h>
-
-#include <err.h>
+#endif 
+
+#include "err.h"
 #include <errno.h>
 #include <fcntl.h>
+#ifdef DO_RMTREE
 #include <fts.h>
+#endif 
+#ifndef _MSC_VER
 #include <grp.h>
 #include <pwd.h>
+#endif 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <sysexits.h>
 #include <unistd.h>
+#else
+#include "mscfakes.h"
+#endif
 
 #ifdef __EMX__
@@ -81 +91 @@
 static void     rm_file(char **);
 static int      rm_overwrite(char *, struct stat *);
+#ifdef DO_RMTREE
 static void     rm_tree(char **);
+#endif
 static int      usage(void);
 
@@ -100 +112 @@
         dflag = eval = fflag = iflag = Pflag = vflag = Wflag = stdin_ok = 0;
         uid = 0;
+        /* kmk: reset getopt and set program name. */
+        g_progname = argv[0];
         opterr = 1;
         optarg = NULL;
@@ -110 +124 @@
 #endif
 
+#if 0 /* kmk: we don't need this */
         /*
          * Test for the special case where the utility is called as
@@ -129 +144 @@
                 return eval;
         }
-
+#else   
+        (void)p;
+#endif 
         Pflag = rflag = 0;
         while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1)
@@ -149 +166 @@
                 case 'R':
                 case 'r':                       /* Compatibility. */
+#ifdef DO_RMTREE
                         rflag = 1;
                         break;
+#else
+                        errno = EINVAL;
+                        return err(1, "Recursion is not supported!");
+#endif
                 case 'v':
                         vflag = 1;
@@ -176 +198 @@
         if (*argv) {
                 stdin_ok = isatty(STDIN_FILENO);
-
+#ifdef DO_RMTREE
                 if (rflag)
                         rm_tree(argv);
                 else
+#endif
                         rm_file(argv);
         }
@@ -186 +209 @@
 }
 
+#ifdef DO_RMTREE
 static void
 rm_tree(char **argv)
@@ -214 +238 @@
                 flags |= FTS_WHITEOUT;
 #endif
-        if (!(fts = fts_open(argv, flags, NULL)))
-                err(1, "fts_open");
+        if (!(fts = fts_open(argv, flags, NULL))) {
+                eval = err(1, "fts_open");
+                return;
+        }
         while ((p = fts_read(fts)) != NULL) {
                 switch (p->fts_info) {
@@ -226 +252 @@
                         continue;
                 case FTS_ERR:
-                        errx(1, "%s: %s", p->fts_path, strerror(p->fts_errno));
+                        eval = errx(1, "%s: %s", p->fts_path, strerror(p->fts_errno));
+                        return;
                 case FTS_NS:
                         /*
@@ -318 +345 @@
                                                 continue;
                                 rval = unlink(p->fts_accpath);
+#ifdef _MSC_VER
+                                if (rval != 0) {
+                                        chmod(p->fts_accpath, 0777);
+                                        rval = unlink(p->fts_accpath);
+                                }
+#endif 
+
                                 if (rval == 0 || (fflag && errno == ENOENT)) {
                                         if (rval == 0 && vflag)
@@ -335 +369 @@
         }
 }
+#endif /* DO_RMTREE */
 
 static void
@@ -395 +430 @@
                                                 continue;
                                 rval = unlink(f);
+#ifdef _MSC_VER
+                                if (rval != 0) {
+                                        chmod(f, 0777);
+                                        rval = unlink(f);
+                                }
+#endif 
                         }
                 }
@@ -448 +489 @@
 #endif
         if ((buf = malloc(bsize)) == NULL)
-                err(1, "%s: malloc", file);
+                exit(err(1, "%s: malloc", file));
 
 #define PASS(byte) {                                                    \
@@ -512 +553 @@
 #ifdef SF_APPEND
                 if ((flagsp = fflagstostr(sp->st_flags)) == NULL)
-                        err(1, "fflagstostr");
+                        exit(err(1, "fflagstostr"));
                 (void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",
                     modep + 1, modep[9] == ' ' ? "" : " ",
@@ -521 +562 @@
                 free(flagsp);
 #else
+                (void)flagsp;
                 (void)fprintf(stderr, "override %s%s %d/%d for %s? ",
                     modep + 1, modep[9] == ' ' ? "" : " ",