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

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

@@ -22 +22 @@
 //usage:#define mv_full_usage "\n\n"
 //usage:       "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n"
-//usage:     "\nOptions:"
 //usage:     "\n    -f  Don't prompt before overwriting"
 //usage:     "\n    -i  Interactive, prompt before overwrite"
@@ -35 +34 @@
     "force\0"       No_argument "f"
     "no-clobber\0"  No_argument "n"
+    "verbose\0"     No_argument "v"
     ;
 #endif
 
-#define OPT_FILEUTILS_FORCE       1
-#define OPT_FILEUTILS_INTERACTIVE 2
-#define OPT_FILEUTILS_NOCLOBBER   4
+#define OPT_FORCE       (1 << 0)
+#define OPT_INTERACTIVE (1 << 1)
+#define OPT_NOCLOBBER   (1 << 2)
 
 int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -58 +58 @@
     /* Need at least two arguments.
      * If more than one of -f, -i, -n is specified , only the final one
-     * takes effect (it unsets previous options). */
+     * takes effect (it unsets previous options).
+     * -v is accepted but ignored.
+     */
     opt_complementary = "-2:f-in:i-fn:n-fi";
-    flags = getopt32(argv, "fin");
+    flags = getopt32(argv, "finv");
     argc -= optind;
     argv += optind;
@@ -86 +88 @@
  DO_MOVE:
         if (dest_exists) {
-            if (flags & OPT_FILEUTILS_NOCLOBBER)
+            if (flags & OPT_NOCLOBBER)
                 goto RET_0;
-            if (!(flags & OPT_FILEUTILS_FORCE)
+            if (!(flags & OPT_FORCE)
              && ((access(dest, W_OK) < 0 && isatty(0))
-                || (flags & OPT_FILEUTILS_INTERACTIVE))
+                || (flags & OPT_INTERACTIVE))
             ) {
                 if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) {