From: Jim Meyering <jim@meyering.net>
Date: Sat, 2 Mar 2002 17:15:42 +0000 (+0000)
Subject: (main): Revert change of 2001-12-29.  With this change,
X-Git-Tag: FILEUTILS-4_1_6~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a5c83d8d53223c7b0e494175ee5e44b2ed555c3;p=thirdparty%2Fcoreutils.git

(main): Revert change of 2001-12-29.  With this change,
cp -r once again preserves symlinks.
(usage): Document the original (now-restored) behavior.
---

diff --git a/src/cp.c b/src/cp.c
index fa5dcc805f..d2cedcface 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -199,7 +199,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -P                           same as `--no-dereference'\n\
 "), stdout);
       fputs (_("\
-  -r                           copy recursively, non-directories as files\n\
+  -r                           copy recursively, non-directories as files,\n\
+                                 but do preserve symbolic links\n\
                                  WARNING: use -R instead when you might copy\n\
                                  special files like FIFOs or /dev/zero\n\
       --remove-destination     remove each existing destination file before\n\
@@ -947,7 +948,6 @@ main (int argc, char **argv)
 	case 'r':
 	  x.recursive = 1;
 	  x.copy_as_regular = 1;
-	  x.dereference = DEREF_ALWAYS;
 	  if (seen_option_a)
 	    seen_option_a_then_r = true;
 	  break;