lineedit: do not hang on error, but return error indicator.

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

diff --git a/coreutils/mv.c b/coreutils/mv.c
index d8dc6c06b8dcea0ee24941f27b95310d5349543a..7f49d5babd5f043c8d2ce140d797a09bed2d5f6e 100644 (file)
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  * 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.
  */
 
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
@@ -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) 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;
@@ -61,7 +54,7 @@ int mv_main(int argc, char **argv)
                        return EXIT_FAILURE;
                }
 
-               if (!(dest_exists & 2)) {
+               if (!(dest_exists & 2)) { /* last is not a directory */
                        dest = last;
                        goto DO_MOVE;
                }
@@ -75,7 +68,8 @@ int mv_main(int argc, char **argv)
                }
 
  DO_MOVE:
-               if (dest_exists && !(flags & OPT_FILEUTILS_FORCE)
+               if (dest_exists
+                && !(flags & OPT_FILEUTILS_FORCE)
                 && ((access(dest, W_OK) < 0 && isatty(0))
                    || (flags & OPT_FILEUTILS_INTERACTIVE))
                ) {
@@ -91,10 +85,13 @@ int mv_main(int argc, char **argv)
                        int source_exists;
 
                        if (errno != EXDEV
-                        || (source_exists = cp_mv_stat(*argv, &source_stat)) < 1
+                        || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1
                        ) {
-                               bb_perror_msg("cannot rename '%s'", *argv);
+                               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) {
                                                if (source_exists != 3) {
@@ -108,10 +105,13 @@ int mv_main(int argc, char **argv)
                                                }
                                        }
                                        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;