ls: make --color more compatible with coreutils

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

diff --git a/coreutils/rm.c b/coreutils/rm.c
index cc2264770398e2e20b281442fab059e9ff44f4c5..6b3fbcf253d7811b8a5c3144d7d4fed6495981f0 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -19,26 +19,27 @@
 
 /* This is a NOFORK applet. Be very careful! */
 
-int rm_main(int argc, char **argv);
-int rm_main(int argc, char **argv)
+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");
+       /* -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 != NULL) {
                do {
-                       const char *base = bb_get_last_path_component(*argv);
+                       const char *base = bb_get_last_path_component_strip(*argv);
 
                        if (DOT_OR_DOTDOT(base)) {
                                bb_error_msg("cannot remove '.' or '..'");