gzip: speed up send_bits()

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

diff --git a/coreutils/rm.c b/coreutils/rm.c
index 042fba16238ca7c33e86f086cbd6abb4ec42b71e..b68a82dc42d95ecc5ae5df9ed2b43dbadbad15d6 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -6,14 +6,23 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-/* BB_AUDIT SUSv3 compliant */
-/* http://www.opengroup.org/onlinepubs/007904975/utilities/rm.html */
-
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
  *
  * Size reduction.
  */
+//config:config RM
+//config:      bool "rm (4.9 kb)"
+//config:      default y
+//config:      help
+//config:      rm is used to remove files or directories.
+
+//applet:IF_RM(APPLET_NOEXEC(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm))
+/* was NOFORK, but then "rm -i FILE" can't be ^C'ed if run by hush */
+
+//kbuild:lib-$(CONFIG_RM) += rm.o
+
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/rm.html */
 
 //usage:#define rm_trivial_usage
 //usage:       "[-irf] FILE..."
@@ -28,7 +37,7 @@
 
 #include "libbb.h"
 
-/* This is a NOFORK applet. Be very careful! */
+/* This is a NOEXEC applet. Be very careful! */
 
 int rm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rm_main(int argc UNUSED_PARAM, char **argv)
@@ -37,9 +46,7 @@ int rm_main(int argc UNUSED_PARAM, char **argv)
        int flags = 0;
        unsigned opt;
 
-       opt_complementary = "f-i:i-f";
-       /* -v (verbose) is ignored */
-       opt = getopt32(argv, "fiRrv");
+       opt = getopt32(argv, "^" "fiRrv" "\0" "f-i:i-f");
        argv += optind;
        if (opt & 1)
                flags |= FILEUTILS_FORCE;
@@ -47,6 +54,8 @@ int rm_main(int argc UNUSED_PARAM, char **argv)
                flags |= FILEUTILS_INTERACTIVE;
        if (opt & (8|4))
                flags |= FILEUTILS_RECUR;
+       if ((opt & 16) && FILEUTILS_VERBOSE)
+               flags |= FILEUTILS_VERBOSE;
 
        if (*argv != NULL) {
                do {