From: Lionel Sambuc <lionel@minix3.org>
Date: Wed, 16 Jul 2014 15:45:58 +0000 (+0200)
Subject: bin/mv: Temporary fix
X-Git-Tag: v3.3.0~133
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=c8d179ff56a90eca32ec970eb0ee38ec52381841;p=minix.git

bin/mv: Temporary fix

The current MInix cp commands doesn't support the option mv expects
to be able to give to it. This patch can be reverted as soon as cp
has been imported.

Change-Id: If4d805726b7bfe4cd9aa2d9603c388b1df467050
---

diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index ebdf9d43c..0899bd4ce 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -347,7 +347,12 @@ 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);
 	}