Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/rmdir.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/rmdir.c (modified) (5 diffs)

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

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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.
  */
 
@@ -11 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
 
-#include <libgen.h>
 #include "libbb.h"
 
@@ -17 +16 @@
 
 
-int rmdir_main(int argc, char **argv);
-int rmdir_main(int argc, char **argv)
+#define PARENTS 0x01
+#define IGNORE_NON_EMPTY 0x02
+
+int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rmdir_main(int argc UNUSED_PARAM, char **argv)
 {
     int status = EXIT_SUCCESS;
     int flags;
-    int do_dot;
     char *path;
 
+#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
+    static const char rmdir_longopts[] ALIGN1 =
+        "parents\0"                  No_argument "p"
+        /* Debian etch: many packages fail to be purged or installed
+         * because they desperately want this option: */
+        "ignore-fail-on-non-empty\0" No_argument "\xff"
+        ;
+    applet_long_options = rmdir_longopts;
+#endif
     flags = getopt32(argv, "p");
     argv += optind;
@@ -35 +45 @@
         path = *argv;
 
-        /* Record if the first char was a '.' so we can use dirname later. */
-        do_dot = (*path == '.');
-
         while (1) {
             if (rmdir(path) < 0) {
-                bb_perror_msg("'%s'", path);    /* Match gnu rmdir msg. */
+#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
+                if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY)
+                    break;
+#endif
+                bb_perror_msg("'%s'", path);  /* Match gnu rmdir msg. */
                 status = EXIT_FAILURE;
-            } else if (flags) {
-                /* Note: path was not empty or null since rmdir succeeded. */
+            } else if (flags & PARENTS) {
+                /* Note: path was not "" since rmdir succeeded. */
                 path = dirname(path);
-                /* Path is now just the parent component.  Note that dirname
-                 * returns "." if there are no parents.  We must distinguish
-                 * this from the case of the original path starting with '.'.
+                /* Path is now just the parent component.  Dirname
+                 * returns "." if there are no parents.
                  */
-                if (do_dot || (*path != '.') || path[1]) {
+                if (NOT_LONE_CHAR(path, '.')) {
                     continue;
                 }
@@ -55 +65 @@
             break;
         }
-
     } while (*++argv);