Jean Wolter writes:

[oweals/busybox.git] / coreutils / rm.c

diff --git a/coreutils/rm.c b/coreutils/rm.c
index f8e16625c9063fd90596168a6e99637fd8530168..39609e7b828b4d4c4eb1dccb91875dea75f31289 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -2,7 +2,6 @@
 /*
  * Mini rm implementation for busybox
  *
- *
  * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
  *
@@ -22,54 +21,45 @@
  *
  */
 
-#include <stdio.h>
-#include <time.h>
-#include <utime.h>
-#include <dirent.h>
-#include <errno.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/rm.html */
+
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * Size reduction.
+ */
+
 #include <unistd.h>
-#include <stdlib.h>
-#include <getopt.h>
 #include "busybox.h"
 
 extern int rm_main(int argc, char **argv)
 {
        int status = 0;
-       int opt;
        int flags = 0;
-       int i;
+       unsigned long opt;
 
-       while ((opt = getopt(argc, argv, "fiRr")) != -1) {
-               switch (opt) {
-               case 'f':
-                       flags &= ~FILEUTILS_INTERACTIVE;
-                       flags |= FILEUTILS_FORCE;
-                       break;
-               case 'i':
-                       flags &= ~FILEUTILS_FORCE;
-                       flags |= FILEUTILS_INTERACTIVE;
-                       break;
-               case 'R':
-               case 'r':
-                       flags |= FILEUTILS_RECUR;
-                       break;
-               }
-       }
-
-       if (!(flags & FILEUTILS_FORCE) && optind == argc)
-               show_usage();
+       bb_opt_complementaly = "f-i:i-f";
+       opt = bb_getopt_ulflags(argc, argv, "fiRr");
+       if(opt & 1)
+                               flags |= FILEUTILS_FORCE;
+       if(opt & 2)
+               flags |= FILEUTILS_INTERACTIVE;
+       if(opt & 12)
+               flags |= FILEUTILS_RECUR;
 
-       for (i = optind; i < argc; i++) {
-               char *base = get_last_path_component(argv[i]);
-
-               if (strcmp(base, ".") == 0 || strcmp(base, "..") == 0) {
-                       error_msg("cannot remove `.' or `..'");
-                       status = 1;
-                       continue;
-               }
+       if (*(argv += optind) != NULL) {
+               do {
+                       const char *base = bb_get_last_path_component(*argv);
 
-               if (remove_file(argv[i], flags) < 0)
+                       if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
+                               bb_error_msg("cannot remove `.' or `..'");
+                       } else if (remove_file(*argv, flags) >= 0) {
+                               continue;
+                       }
                        status = 1;
+               } while (*++argv);
+       } else if (!(flags & FILEUTILS_FORCE)) {
+               bb_show_usage();
        }
 
        return status;