svn commit: trunk/busybox/coreutils

[vda at busybox.net]

Author: vda
Date: 2008-07-12 04:22:19 -0700 (Sat, 12 Jul 2008)
New Revision: 22815

Log:
mv: fix a case when we move dangling symlink



Modified:
   trunk/busybox/coreutils/mv.c


Changeset:
Modified: trunk/busybox/coreutils/mv.c
===================================================================
--- trunk/busybox/coreutils/mv.c	2008-07-12 10:28:41 UTC (rev 22814)
+++ trunk/busybox/coreutils/mv.c	2008-07-12 11:22:19 UTC (rev 22815)
@@ -26,16 +26,13 @@
 #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;
@@ -57,7 +54,7 @@
 			return EXIT_FAILURE;
 		}
 
-		if (!(dest_exists & 2)) {
+		if (!(dest_exists & 2)) { /* last is not a directory */
 			dest = last;
 			goto DO_MOVE;
 		}
@@ -88,10 +85,13 @@
 			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);
 			} else {
+				static const char fmt[] ALIGN1 =
+					"cannot overwrite %sdirectory with %sdirectory";
+
 				if (dest_exists) {
 					if (dest_exists == 3) {
 						if (source_exists != 3) {