svn commit: trunk/busybox: coreutils

[vda at busybox.net]

Author: vda
Date: 2008-04-11 03:54:37 -0700 (Fri, 11 Apr 2008)
New Revision: 21705

Log:
build system: use POSIX options only for cp
cp: improve comment



Modified:
   trunk/busybox/Makefile.custom
   trunk/busybox/coreutils/cp.c


Changeset:
Modified: trunk/busybox/Makefile.custom
===================================================================
--- trunk/busybox/Makefile.custom	2008-04-11 10:29:46 UTC (rev 21704)
+++ trunk/busybox/Makefile.custom	2008-04-11 10:54:37 UTC (rev 21705)
@@ -47,10 +47,11 @@
 endif
 
 # Not very elegant: copies testsuite to objdir...
+# (cp -pPR is POSIX-compliant (cp -dpR or cp -a would not be))
 .PHONY: check
 .PHONY: test
 check test: busybox busybox.links
-	test -d $(objtree)/testsuite || cp -a $(srctree)/testsuite $(objtree)
+	test -d $(objtree)/testsuite || cp -pPR $(srctree)/testsuite $(objtree)
 	bindir=$(objtree) srcdir=$(srctree)/testsuite \
 	$(SHELL) -c "cd $(objtree)/testsuite && $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)"
 
@@ -58,7 +59,7 @@
 release: distclean
 	cd ..; \
 	rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \
-	cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
+	cp -pPR busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
 	find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
 		-name .svn \
 		-print \

Modified: trunk/busybox/coreutils/cp.c
===================================================================
--- trunk/busybox/coreutils/cp.c	2008-04-11 10:29:46 UTC (rev 21704)
+++ trunk/busybox/coreutils/cp.c	2008-04-11 10:54:37 UTC (rev 21705)
@@ -44,7 +44,7 @@
 	// Soft- and hardlinking don't mix
 	// -P and -d are the same (-P is POSIX, -d is GNU)
 	// -r and -R are the same
-	// -R (and therefore -r) switches on -d (coreutils does this)
+	// -R (and therefore -r) turns on -d (coreutils does this)
 	// -a = -pdR
 	opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR";
 	flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPHL");