Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/mv.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/mv.c (modified) (4 diffs)

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

@@ -34 +34 @@
     "force\0"       No_argument "f"
     "no-clobber\0"  No_argument "n"
+    IF_FEATURE_VERBOSE(
     "verbose\0"     No_argument "v"
+    )
     ;
 #endif
@@ -41 +43 @@
 #define OPT_INTERACTIVE (1 << 1)
 #define OPT_NOCLOBBER   (1 << 2)
+#define OPT_VERBOSE     ((1 << 3) * ENABLE_FEATURE_VERBOSE)
+
 
 int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -59 +63 @@
      * If more than one of -f, -i, -n is specified , only the final one
      * takes effect (it unsets previous options).
-     * -v is accepted but ignored.
      */
     opt_complementary = "-2:f-in:i-fn:n-fi";
@@ -149 +152 @@
         }
  RET_0:
+        if (flags & OPT_VERBOSE) {
+            printf("'%s' -> '%s'\n", *argv, dest);
+        }
         if (dest != last) {
             free((void *) dest);