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

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

@@ -6 +6 @@
  * SELinux support by Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
- * 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.
  */
 
@@ -14 +14 @@
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <getopt.h> /* struct option */
 #include "libbb.h"
 #include "libcoreutils/coreutils.h"
+
+//usage:#define mv_trivial_usage
+//usage:       "[-fin] SOURCE DEST\n"
+//usage:       "or: mv [-fin] SOURCE... DIRECTORY"
+//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"
+//usage:     "\n    -n  Don't overwrite an existing file"
+//usage:
+//usage:#define mv_example_usage
+//usage:       "$ mv /tmp/foo /bin/bar\n"
 
 #if ENABLE_FEATURE_MV_LONG_OPTIONS
@@ -25 +34 @@
     "interactive\0" No_argument "i"
     "force\0"       No_argument "f"
+    "no-clobber\0"  No_argument "n"
     ;
 #endif
@@ -30 +40 @@
 #define OPT_FILEUTILS_FORCE       1
 #define OPT_FILEUTILS_INTERACTIVE 2
+#define OPT_FILEUTILS_NOCLOBBER   4
 
-static const char fmt[] ALIGN1 =
-    "cannot overwrite %sdirectory with %sdirectory";
-
-int mv_main(int argc, char **argv);
+int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mv_main(int argc, char **argv)
 {
@@ -40 +48 @@
     const char *last;
     const char *dest;
-    unsigned long flags;
+    unsigned flags;
     int dest_exists;
     int status = 0;
@@ -48 +56 @@
     applet_long_options = mv_longopts;
 #endif
-    opt_complementary = "f-i:i-f";
-    flags = getopt32(argv, "fi");
-    if (optind + 2 > argc) {
-        bb_show_usage();
-    }
+    /* 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). */
+    opt_complementary = "-2:f-in:i-fn:n-fi";
+    flags = getopt32(argv, "fin");
+    argc -= optind;
+    argv += optind;
+    last = argv[argc - 1];
 
-    last = argv[argc - 1];
-    argv += optind;
-
-    if (optind + 2 == argc) {
+    if (argc == 2) {
         dest_exists = cp_mv_stat(last, &dest_stat);
         if (dest_exists < 0) {
-            return 1;
+            return EXIT_FAILURE;
         }
 
-        if (!(dest_exists & 2)) {
+        if (!(dest_exists & 2)) { /* last is not a directory */
             dest = last;
             goto DO_MOVE;
@@ -70 +78 @@
 
     do {
-        dest = concat_path_file(last, bb_get_last_path_component(*argv));
+        dest = concat_path_file(last, bb_get_last_path_component_strip(*argv));
         dest_exists = cp_mv_stat(dest, &dest_stat);
         if (dest_exists < 0) {
@@ -76 +84 @@
         }
 
-DO_MOVE:
-
-        if (dest_exists && !(flags & OPT_FILEUTILS_FORCE) &&
-            ((access(dest, W_OK) < 0 && isatty(0)) ||
-            (flags & OPT_FILEUTILS_INTERACTIVE))) {
-            if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) {
-                goto RET_1; /* Ouch! fprintf failed! */
-            }
-            if (!bb_ask_confirmation()) {
+ DO_MOVE:
+        if (dest_exists) {
+            if (flags & OPT_FILEUTILS_NOCLOBBER)
                 goto RET_0;
+            if (!(flags & OPT_FILEUTILS_FORCE)
+             && ((access(dest, W_OK) < 0 && isatty(0))
+                || (flags & OPT_FILEUTILS_INTERACTIVE))
+            ) {
+                if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) {
+                    goto RET_1;  /* Ouch! fprintf failed! */
+                }
+                if (!bb_ask_confirmation()) {
+                    goto RET_0;
+                }
             }
         }
+
         if (rename(*argv, dest) < 0) {
             struct stat source_stat;
             int source_exists;
 
-            if (errno != EXDEV ||
-                (source_exists = cp_mv_stat(*argv, &source_stat)) < 1) {
-                bb_perror_msg("cannot rename '%s'", *argv);
+            if (errno != EXDEV
+             || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1
+            ) {
+                bb_perror_msg("can't rename '%s'", *argv);
             } else {
+                static const char fmt[] ALIGN1 =
+                    "can't overwrite %sdirectory with %sdirectory";
+
                 if (dest_exists) {
                     if (dest_exists == 3) {
@@ -109 +126 @@
                     }
                     if (unlink(dest) < 0) {
-                        bb_perror_msg("cannot remove '%s'", dest);
+                        bb_perror_msg("can't remove '%s'", dest);
                         goto RET_1;
                     }
                 }
+                /* FILEUTILS_RECUR also prevents nasties like
+                 * "read from device and write contents to dst"
+                 * instead of "create same device node" */
                 copy_flag = FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS;
 #if ENABLE_SELINUX
                 copy_flag |= FILEUTILS_PRESERVE_SECURITY_CONTEXT;
 #endif
-                if ((copy_file(*argv, dest, copy_flag) >= 0) &&
-                    (remove_file(*argv, FILEUTILS_RECUR | FILEUTILS_FORCE) >= 0)) {
+                if ((copy_file(*argv, dest, copy_flag) >= 0)
+                 && (remove_file(*argv, FILEUTILS_RECUR | FILEUTILS_FORCE) >= 0)
+                ) {
                     goto RET_0;
                 }
             }
-RET_1:
+ RET_1:
             status = 1;
         }
-RET_0:
+ RET_0:
         if (dest != last) {
             free((void *) dest);