lineedit: do not hang on error, but return error indicator.

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

diff --git a/coreutils/rm.c b/coreutils/rm.c
index a686fc40c9bbbc56fbf59f3425ffab915f180886..69c473ddbf06fcc93b5cfbd4b485f0c341bcf604 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -19,21 +19,22 @@
 
 /* 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(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) {
@@ -41,7 +42,7 @@ int rm_main(int argc, char **argv)
                        const char *base = bb_get_last_path_component_strip(*argv);
 
                        if (DOT_OR_DOTDOT(base)) {
-                               bb_error_msg("cannot remove '.' or '..'");
+                               bb_error_msg("can't remove '.' or '..'");
                        } else if (remove_file(*argv, flags) >= 0) {
                                continue;
                        }