From: Lionel Sambuc <lionel@minix3.org>
Date: Mon, 28 Jul 2014 11:53:23 +0000 (+0200)
Subject: Revert "bin/mv: Temporary fix"
X-Git-Tag: v3.3.0~91
X-Git-Url: http://zhaoyanbai.com/repos/cppcheck.log?a=commitdiff_plain;h=428aa25dc636f005b18b5f599f7c99f1e36b9b5e;p=minix.git

Revert "bin/mv: Temporary fix"

This is no longer required as /bin/cp has been imported.

This reverts commit e3257d3ff741480d640cefe2507a77e65322f40d.
---

diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 0899bd4ce..ebdf9d43c 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -347,12 +347,7 @@ copy(char *from, char *to)
 	int status;
 
 	if ((pid = vfork()) == 0) {
-#if defined(__minix)
-		/* LSC: This is required as long as we have not imported cp */
-		execl(_PATH_CP, "cp", vflg ?  "-Rpv" :  "-Rp", "--", from, to, NULL);
-#else
 		execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", "--", from, to, NULL);
-#endif /* defined(__minix) */
 		warn("%s", _PATH_CP);
 		_exit(1);
 	}