From: Jim Meyering <jim@meyering.net>
Date: Sun, 10 Mar 2002 08:26:48 +0000 (+0000)
Subject: (copy_reg): Use a more concise diagnostic for
X-Git-Tag: FILEUTILS-4_1_7~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d4eeae035540918788a372f64e31ccbbdaacef9;p=thirdparty%2Fcoreutils.git

(copy_reg): Use a more concise diagnostic for
reporting replaced files.  This avoids a bug in the code,
which mishandled ino_t wider than long.
---

diff --git a/src/copy.c b/src/copy.c
index 4da2b2190b..6ce0a2bc4c 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -235,15 +235,8 @@ copy_reg (const char *src_path, const char *dst_path,
   if (! SAME_INODE (*src_sb, src_open_sb))
     {
       error (EXIT_FAILURE, 0,
-	     _("ERROR: the source file %s initially had device/inode\n\
-numbers %lu/%lu, but now (after opening it), the numbers\n\
-are %lu/%lu.  That means that while this program was running,\n\
-the file was replaced with another one.  Skipping this file."),
-	     quote (src_path),
-	     (unsigned long)(src_sb->st_dev),
-	     (unsigned long)(src_sb->st_ino),
-	     (unsigned long)(src_open_sb.st_dev),
-	     (unsigned long)(src_open_sb.st_ino));
+	     _("skipping file %s, as it was replaced while being copied"),
+	     quote (src_path));
       return_val = -1;
       goto close_src_desc;
     }