*** empty log message ***

old/fileutils/ChangeLog

@@ -2,6 +2,17 @@
 
 	* Version 4.0.36.
 
+	* src/copy.c (copy_internal): Add a comment.
+	Set *copy_into_self in the new code that detects that.
+	Make diagnostic more consistent: s/won't/will not/.
+	[move_mode, copy_into_self]: Give a diagnstic here, now that
+	we have the top_level_* globals.  Remove the corresponding diagnostic
+	from mv.c.
+	Add a FIXME comment.
+	* src/mv.c (do_move): Remove diagnostic, now that copy.c issues it.
+	Set `fail' to nonzero in the primary `if (copy_into_self)' block
+	rather than in its own tiny one below.
+
 	* src/copy.c (copy_internal): Don't allow cp (or mv, when working
 	across a partition boundary) to overwrite a non-directory with a
 	directory.  Reported by Michael J. Croghan.
@@ -14,6 +25,16 @@
 	* src/copy.c (top_level_src_path, top_level_dst_path): New globals.
 	(copy_internal): Use them.
 	(copy): Set them.
+	* src/cp-hash.c [struct entry] (node): Describe how it's used,
+	now that we've overloaded it, in order to detect and diagnose
+	the copying-directory-into-self problem.
+	(new_file): Remove global.
+	(htab): Declare global to be static.
+	(remember_created): Insert file name instead of dummy pointer, so
+	that copy.c can use the just-created directory name to detect
+	the copying-directory-into-self problem.
+	* tests/cp/into-self: New test for the above.
+	* tests/cp/Makefile.am (TESTS): Add into-self.
 
 2001-01-07  Jim Meyering  <meyering@lucent.com>