Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/rmdir.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/rmdir.c (modified) (3 diffs)

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

@@ -32 +32 @@
 
 #define PARENTS          (1 << 0)
-//efine VERBOSE          (1 << 1) //accepted but ignored
+#define VERBOSE          ((1 << 1) * ENABLE_FEATURE_VERBOSE)
 #define IGNORE_NON_EMPTY (1 << 2)
 
@@ -45 +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: */
         "ignore-fail-on-non-empty\0" No_argument "\xff"
+        IF_FEATURE_VERBOSE(
+        "verbose\0"                  No_argument "v"
+        )
         ;
     applet_long_options = rmdir_longopts;
@@ -63 +65 @@
 
         while (1) {
+            if (flags & VERBOSE) {
+                printf("rmdir: removing directory, '%s'\n", path);
+            }
+
             if (rmdir(path) < 0) {
 #if ENABLE_FEATURE_RMDIR_LONG_OPTIONS