Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/rm.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/rm.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/coreutils/rm.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -20 +20 @@
 /* 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;
@@ -28 +28 @@
 
     opt_complementary = "f-i:i-f";
-    opt = getopt32(argv, "fiRr");
+    /* -v (verbose) is ignored */
+    opt = getopt32(argv, "fiRrv");
     argv += optind;
     if (opt & 1)
@@ -34 +35 @@
     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 '..'");
+                bb_error_msg("can't remove '.' or '..'");
             } else if (remove_file(*argv, flags) >= 0) {
                 continue;