rpm2cpio: handle bz2 too; code shrink

[oweals/busybox.git] / coreutils / mv.c

diff --git a/coreutils/mv.c b/coreutils/mv.c
index 553bb6ecb641beea3b754bfdf451039cb5580b6f..be10b030a1ea037ca2c846dc66eddcbb9736ae6a 100644 (file)
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -13,10 +13,6 @@
  * Size reduction and improved error checking.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <getopt.h> /* struct option */
 #include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
@@ -30,16 +26,13 @@ static const char mv_longopts[] ALIGN1 =
 #define OPT_FILEUTILS_FORCE       1
 #define OPT_FILEUTILS_INTERACTIVE 2
 
-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)
 {
        struct stat dest_stat;
        const char *last;
        const char *dest;
-       unsigned long flags;
+       unsigned flags;
        int dest_exists;
        int status = 0;
        int copy_flag = 0;
@@ -47,39 +40,39 @@ int mv_main(int argc, char **argv)
 #if ENABLE_FEATURE_MV_LONG_OPTIONS
        applet_long_options = mv_longopts;
 #endif
-       opt_complementary = "f-i:i-f";
+       // Need at least two arguments
+       // -f unsets -i, -i unsets -f
+       opt_complementary = "-2:f-i:i-f";
        flags = getopt32(argv, "fi");
-       if (optind + 2 > argc) {
-               bb_show_usage();
-       }
-
-       last = argv[argc - 1];
+       argc -= optind;
        argv += optind;
+       last = argv[argc - 1];
 
-       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;
                }
        }
 
        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) {
                        goto RET_1;
                }
 
-DO_MOVE:
-
-               if (dest_exists && !(flags & OPT_FILEUTILS_FORCE) &&
-                       ((access(dest, W_OK) < 0 && isatty(0)) ||
-                       (flags & OPT_FILEUTILS_INTERACTIVE))) {
+ 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! */
                        }
@@ -91,10 +84,14 @@ DO_MOVE:
                        struct stat source_stat;
                        int source_exists;
 
-                       if (errno != EXDEV ||
-                               (source_exists = cp_mv_stat(*argv, &source_stat)) < 1) {
+                       if (errno != EXDEV
+                        || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1
+                       ) {
                                bb_perror_msg("cannot rename '%s'", *argv);
                        } else {
+                               static const char fmt[] ALIGN1 =
+                                       "cannot overwrite %sdirectory with %sdirectory";
+
                                if (dest_exists) {
                                        if (dest_exists == 3) {
                                                if (source_exists != 3) {
@@ -112,19 +109,23 @@ DO_MOVE:
                                                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);
                }