merge with 3.8.3

2 files changed, 28 insertions, 7 deletions

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index b74560f97..4ededb20e 100644
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,4 +1,21 @@
-Wed Aug 25 21:40:00 EDT 1993
+Thu Aug 26 22:26:09 1993  Jim Meyering  (meyering@comco.com)
+
+	* ls.c (print_long_format, print_file_name_and_frills): Cast inode
+	number to unsigned long and print it with %lu to avoid warnings from
+	gcc -Wformat because the size and type of ino_t are system dependent.
+
+	* cp.c (do_copy): Plug a memory leak with --parents.
+
+	* ln.c (main): Like mv and cp, convert `ln x y/' to ln x y/x
+	when a is not a directory.
+	[PATH_BASENAME_CONCAT]: New macro.
+	(do_link): Use it here, too.
+
+	* ls.c (sort_files): Add `default: abort();' clause to switch stmts.
+
+	* cp.c (do_copy): Don't remove trailing slashes from source.
+
+Wed Aug 25 21:40:00 1993  Jim Meyering  (meyering@comco.com)
 
 	* cp.c: Add --parents as synonym for --path.  Change --path to
 	--parents in comments.  --path is deprecated.
@@ -16,13 +33,12 @@ Fri Aug 13 17:19:52 1993  Jim Meyering  (meyering@comco.com)
         (is_real_dir): New function.
         (movefile): In addition to when dest is a directory, if dest has
         a trailing `/' and source is not a directory, presume the target
-        is dest/`basename source`.  This converts `mv a b/' to `mv a b/a'
-	when a is not a directory -- so the command will fail when a is a
-	non-directory and (b doesn't exist or b isn't a directory or a
-	symlink to a directory).
+        is dest/`basename source`.  This converts `mv x y/' to `mv x y/x'
+	when x is not a directory.  This change means that the command
+	`mv any file/' will now fail rather than performing the move.
 
-	* ls.c (do_copy): Similarly, convert `cp a b/' to cp a b/a when
-	a is not a directory.
+	* cp.c (do_copy): Similarly, convert `cp x y/' to cp x y/x when
+	x is not a directory.
 
 Wed Aug  4 17:43:18 1993  Jim Meyering  (meyering@comco.com)
 
diff --git a/old/fileutils/NEWS b/old/fileutils/NEWS
index 16246d08f..e4121a4d9 100644
--- a/old/fileutils/NEWS
+++ b/old/fileutils/NEWS
@@ -2,6 +2,11 @@ Major changes in release 3.9:
 * ls and cp can handle mount points on more systems
 * cp, mkdir, and rmdir long option --path renamed to --parents;  --path
   will still work for a while
+* cp, ln, and mv convert `cp A B/' to cp A B/A when A is not a directory.
+  This change affects only the two-argument form of the commands.  It makes
+  such commands fail when the target has a trailing slash but is not a
+  directory or symlink to a directory and the source is not a directory.
+  They used to succeed, ignoring the implicitly contradictory trailing slash.
 
 Major changes in release 3.8:
 * install isn't as likely to produce spurious errors