* src/copy.c (copy_internal, same_file_ok): Adjust comments not

to mention the now-removed cp_options.xstat member.

diff --git a/ChangeLog b/ChangeLog
index 9075a7644e16f7135af39a572a34573175a6ac44..0230753554ee2070d4f83e6da3f9dac999f1a963 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-17  Jim Meyering  <jim@meyering.net>
 
+       * src/copy.c (copy_internal, same_file_ok): Adjust comments not
+       to mention the now-removed cp_options.xstat member.
+
        * Makefile.maint (patch-check): Adapt to work now that the patch
        modifies more than one file in src/.
 

diff --git a/src/copy.c b/src/copy.c
index 3bd29e2855ddd996c7ec90bd841491b1e36b553e..0a3f9e504f723c4b49f84adf203358c80acb71c6 100644 (file)
--- a/src/copy.c
+++ b/src/copy.c
@@ -590,8 +590,8 @@ same_file_ok (char const *src_name, struct stat const *src_sb,
       same_link = same;
 
       /* If both the source and destination files are symlinks (and we'll
-        know this here IFF preserving symlinks (aka xstat == lstat),
-        then it's ok -- as long as they are distinct.  */
+        know this here IFF preserving symlinks), then it's ok -- as long
+        as they are distinct.  */
       if (S_ISLNK (src_sb->st_mode) && S_ISLNK (dst_sb->st_mode))
        return ! same_name (src_name, dst_name);
 
@@ -1424,7 +1424,7 @@ copy_internal (char const *src_name, char const *dst_name,
       if (errno != EXDEV)
        {
          /* There are many ways this can happen due to a race condition.
-            When something happens between the initial xstat and the
+            When something happens between the initial XSTAT and the
             subsequent rename, we can get many different types of errors.
             For example, if the destination is initially a non-directory
             or non-existent, but it is created as a directory, the rename