If /tmp and /home were different partitions, then "mv /tmp/file /home/file"

would delete /home/file even if /tmp/file didn't exist.

This fixes that, although the logic of both mv and cp is a bit tangled and
should probably be untangled.


git-svn-id: svn://busybox.net/trunk/busybox@10868 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 3 insertions, 3 deletions

diff --git a/coreutils/mv.c b/coreutils/mv.c
index 4f08dedc0..e1c4529ad 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -99,10 +99,10 @@ DO_MOVE:
                         struct stat source_stat;
                         int source_exists;
 
-                        if (errno != EXDEV) {
+                        if (errno != EXDEV ||
+                                (source_exists = cp_mv_stat(*argv, &source_stat)) < 1) {
                                 bb_perror_msg("unable to rename `%s'", *argv);
-                        }
-                        else if ((source_exists = cp_mv_stat(*argv, &source_stat)) >= 0) {
+                        } else {
                                 if (dest_exists) {
                                         if (dest_exists == 3) {
                                                 if (source_exists != 3) {