gzip: speed up send_bits()

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

diff --git a/coreutils/rm.c b/coreutils/rm.c
index e29073db8c2421a463aa240bce22749a1b81c51b..b68a82dc42d95ecc5ae5df9ed2b43dbadbad15d6 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -4,44 +4,65 @@
  *
  * 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 */
-/* 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..."
+//usage:#define rm_full_usage "\n\n"
+//usage:       "Remove (unlink) FILEs\n"
+//usage:     "\n       -i      Always prompt before removing"
+//usage:     "\n       -f      Never prompt"
+//usage:     "\n       -R,-r   Recurse"
+//usage:
+//usage:#define rm_example_usage
+//usage:       "$ rm -rf /tmp/foo\n"
 
-#include "busybox.h"
+#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);
-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");
+       opt = getopt32(argv, "^" "fiRrv" "\0" "f-i:i-f");
        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 ((opt & 16) && FILEUTILS_VERBOSE)
+               flags |= FILEUTILS_VERBOSE;
 
        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 '..'");
+                               bb_error_msg("can't remove '.' or '..'");
                        } else if (remove_file(*argv, flags) >= 0) {
                                continue;
                        }