From: Rob Landley <rob@landley.net>
Date: Wed, 20 Jul 2005 00:45:40 +0000 (-0000)
Subject: If /tmp and /home were different partitions, then "mv /tmp/file /home/file"
X-Git-Tag: 1_1_0~900
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3c12ff7c894d930b1c431954f645087724017995;p=oweals%2Fbusybox.git

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.
---

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) {