build system: use POSIX options only for cp

cp: improve comment

diff --git a/Makefile.custom b/Makefile.custom
index e4a616f65ab95719a9d46c1d86b8bbe29b982c9b..3334b31eb81c86ae6f3c2d8614b7b226e453bd48 100644 (file)
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -47,10 +47,11 @@ ifneq ($(strip $(DO_INSTALL_LIBS)),n)
 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 @@ check test: busybox busybox.links
 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 \

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 6cf1e21a1f59895fc52235bdd04925ebd27bb6e4..a4eea9498007fbc2f3f710fee0be7a39741862eb 100644 (file)
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -44,7 +44,7 @@ int cp_main(int argc, char **argv)
        // 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");