svn commit: trunk/busybox: applets coreutils include testsuite/cp

[vda at busybox.net]

Author: vda
Date: 2008-04-27 15:06:24 -0700 (Sun, 27 Apr 2008)
New Revision: 21879

Log:
cp: fix "cp -RL" to create regular files even if src is a symlink



Added:
   trunk/busybox/testsuite/cp/cp-RHL-does_not_preserve-links

Modified:
   trunk/busybox/applets/install.sh
   trunk/busybox/coreutils/cp.c
   trunk/busybox/include/libbb.h


Changeset:
Modified: trunk/busybox/applets/install.sh
===================================================================
--- trunk/busybox/applets/install.sh	2008-04-27 20:58:43 UTC (rev 21878)
+++ trunk/busybox/applets/install.sh	2008-04-27 22:06:24 UTC (rev 21879)
@@ -37,7 +37,7 @@
 	for i in $DO_INSTALL_LIBS; do
 		rm -f $prefix/$libdir/$i || exit 1
 		if [ -f $i ]; then
-			cp -a $i $prefix/$libdir/ || exit 1
+			cp -pPR $i $prefix/$libdir/ || exit 1
 			chmod 0644 $prefix/$libdir/$i || exit 1
 		fi
 	done

Modified: trunk/busybox/coreutils/cp.c
===================================================================
--- trunk/busybox/coreutils/cp.c	2008-04-27 20:58:43 UTC (rev 21878)
+++ trunk/busybox/coreutils/cp.c	2008-04-27 22:06:24 UTC (rev 21879)
@@ -37,25 +37,27 @@
 		OPT_r = 1 << (sizeof(FILEUTILS_CP_OPTSTR)),
 		OPT_P = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+1),
 		OPT_H = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2),
-		OPT_L = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+3),
 	};
 
 	// Need at least two arguments
-	// Soft- and hardlinking don't mix
+	// Soft- and hardlinking doesn't mix
 	// -P and -d are the same (-P is POSIX, -d is GNU)
 	// -r and -R are the same
 	// -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");
+	opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR:HL";
+	flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPH");
 	argc -= optind;
 	argv += optind;
-	flags ^= FILEUTILS_DEREFERENCE;		/* The sense of this flag was reversed. */
-	/* Default behavior of cp is to dereference, so we don't have to do
-	 * anything special when we are given -L.
-	 * The behavior of -H is *almost* like -L, but not quite, so let's
-	 * just ignore it too for fun.
-	if (flags & OPT_L) ...
+	flags ^= FILEUTILS_DEREFERENCE; /* the sense of this flag was reversed */
+	/* coreutils 6.9 compat:
+	 * by default, "cp" derefs symlinks (creates regular dest files),
+	 * but "cp -R" does not. We switch off deref if -r or -R (see above).
+	 * However, "cp -RL" must still deref symlinks: */
+	if (flags & FILEUTILS_DEREF_SOFTLINK) /* -L */
+		flags |= FILEUTILS_DEREFERENCE;
+	/* The behavior of -H is *almost* like -L, but not quite, so let's
+	 * just ignore it too for fun. TODO.
 	if (flags & OPT_H) ... // deref command-line params only
 	*/
 

Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h	2008-04-27 20:58:43 UTC (rev 21878)
+++ trunk/busybox/include/libbb.h	2008-04-27 22:06:24 UTC (rev 21879)
@@ -231,12 +231,13 @@
 	FILEUTILS_INTERACTIVE = 0x10,
 	FILEUTILS_MAKE_HARDLINK = 0x20,
 	FILEUTILS_MAKE_SOFTLINK = 0x40,
+	FILEUTILS_DEREF_SOFTLINK = 0x80,
 #if ENABLE_SELINUX
-	FILEUTILS_PRESERVE_SECURITY_CONTEXT = 0x80,
-	FILEUTILS_SET_SECURITY_CONTEXT = 0x100
+	FILEUTILS_PRESERVE_SECURITY_CONTEXT = 0x100,
+	FILEUTILS_SET_SECURITY_CONTEXT = 0x200
 #endif
 };
-#define FILEUTILS_CP_OPTSTR "pdRfils" USE_SELINUX("c")
+#define FILEUTILS_CP_OPTSTR "pdRfilsL" USE_SELINUX("c")
 extern int remove_file(const char *path, int flags);
 /* NB: without FILEUTILS_RECUR in flags, it will basically "cat"
  * the source, not copy (unless "source" is a directory).

Added: trunk/busybox/testsuite/cp/cp-RHL-does_not_preserve-links
===================================================================
--- trunk/busybox/testsuite/cp/cp-RHL-does_not_preserve-links	                        (rev 0)
+++ trunk/busybox/testsuite/cp/cp-RHL-does_not_preserve-links	2008-04-27 22:06:24 UTC (rev 21879)
@@ -0,0 +1,6 @@
+mkdir a
+>a/file
+ln -s file a/link
+busybox cp -RHL a b
+test ! -L b/link
+#sh </dev/tty >/dev/tty 2>&1