ls: make --color more compatible with coreutils

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

diff --git a/coreutils/rm.c b/coreutils/rm.c
index 5df7d5f65f2fe6ac160897dac1b38d7991b9ad51..6b3fbcf253d7811b8a5c3144d7d4fed6495981f0 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -15,29 +15,33 @@
  * Size reduction.
  */
 
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-int rm_main(int argc, char **argv)
+/* This is a NOFORK applet. Be very careful! */
+
+int rm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rm_main(int argc UNUSED_PARAM, char **argv)
 {
        int status = 0;
        int flags = 0;
        unsigned opt;
 
        opt_complementary = "f-i:i-f";
-       opt = getopt32(argc, argv, "fiRr");
-       if(opt & 1)
-                               flags |= FILEUTILS_FORCE;
-       if(opt & 2)
+       /* -v (verbose) is ignored */
+       opt = getopt32(argv, "fiRrv");
+       argv += optind;
+       if (opt & 1)
+               flags |= FILEUTILS_FORCE;
+       if (opt & 2)
                flags |= FILEUTILS_INTERACTIVE;
-       if(opt & 12)
+       if (opt & (8|4))
                flags |= FILEUTILS_RECUR;
 
-       if (*(argv += optind) != NULL) {
+       if (*argv != NULL) {
                do {
-                       const char *base = bb_get_last_path_component(*argv);
+                       const char *base = bb_get_last_path_component_strip(*argv);
 
-                       if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
+                       if (DOT_OR_DOTDOT(base)) {
                                bb_error_msg("cannot remove '.' or '..'");
                        } else if (remove_file(*argv, flags) >= 0) {
                                continue;