diff options
author | Jim Meyering <jim@meyering.net> | 2002-03-10 08:26:48 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2002-03-10 08:26:48 +0000 |
commit | 0d4eeae035540918788a372f64e31ccbbdaacef9 (patch) | |
tree | 40c1d84ad4264bbc889f6a751206112bf72b3ad5 /src | |
parent | c4f4cfbf11f47cfd84f0e953ecf8d7771d3ebe33 (diff) | |
download | coreutils-0d4eeae035540918788a372f64e31ccbbdaacef9.tar.xz |
(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.
Diffstat (limited to 'src')
-rw-r--r-- | src/copy.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/copy.c b/src/copy.c index 4da2b2190..6ce0a2bc4 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; } |