Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/rmdir.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/rmdir.c (modified) (4 diffs)

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

@@ -11 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
 
+//usage:#define rmdir_trivial_usage
+//usage:       "[OPTIONS] DIRECTORY..."
+//usage:#define rmdir_full_usage "\n\n"
+//usage:       "Remove DIRECTORY if it is empty\n"
+//usage:    IF_FEATURE_RMDIR_LONG_OPTIONS(
+//usage:     "\n    -p|--parents    Include parents"
+//usage:     "\n    --ignore-fail-on-non-empty"
+//usage:    )
+//usage:    IF_NOT_FEATURE_RMDIR_LONG_OPTIONS(
+//usage:     "\n    -p  Include parents"
+//usage:    )
+//usage:
+//usage:#define rmdir_example_usage
+//usage:       "# rmdir /tmp/foo\n"
+
 #include "libbb.h"
 
@@ -16 +31 @@
 
 
-#define PARENTS 0x01
-#define IGNORE_NON_EMPTY 0x02
+#define PARENTS          (1 << 0)
+//efine VERBOSE          (1 << 1) //accepted but ignored
+#define IGNORE_NON_EMPTY (1 << 2)
 
 int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -29 +45 @@
     static const char rmdir_longopts[] ALIGN1 =
         "parents\0"                  No_argument "p"
+        "verbose\0"                  No_argument "v"
         /* Debian etch: many packages fail to be purged or installed
          * because they desperately want this option: */
@@ -35 +52 @@
     applet_long_options = rmdir_longopts;
 #endif
-    flags = getopt32(argv, "p");
+    flags = getopt32(argv, "pv");
     argv += optind;