diff options
| author | Jim Meyering <jim@meyering.net> | 2002-06-21 12:10:02 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2002-06-21 12:10:02 +0000 |
| commit | 071b36fd9068a202a0e55910e02cc0410df21d0b (patch) | |
| tree | e06ae60d4b97fc4eab4cb2500c8c5f4ac3fa0f33 /src | |
| parent | d7313803f0c137a83787ea1166c30f9bf84de1d1 (diff) | |
| download | coreutils-071b36fd9068a202a0e55910e02cc0410df21d0b.tar.xz | |
Change all `preserving ...' diagnostics to
`failed to preserve ...' to make the failure clearer.
Diffstat (limited to 'src')
| -rw-r--r-- | src/copy.c | 9 | ||||
| -rw-r--r-- | src/cp.c | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/copy.c b/src/copy.c index 8df19ce9e..ed71e5eb2 100644 --- a/src/copy.c +++ b/src/copy.c @@ -1444,7 +1444,8 @@ copy_internal (const char *src_path, const char *dst_path, # if HAVE_LCHOWN if (DO_CHOWN (lchown, dst_path, src_sb.st_uid, src_sb.st_gid)) { - error (0, errno, _("preserving ownership for %s"), dst_path); + error (0, errno, _("failed to preserve ownership for %s"), + dst_path); goto un_backup; } # else @@ -1506,7 +1507,8 @@ copy_internal (const char *src_path, const char *dst_path, ran_chown = 1; if (DO_CHOWN (chown, dst_path, src_sb.st_uid, src_sb.st_gid)) { - error (0, errno, _("preserving ownership for %s"), quote (dst_path)); + error (0, errno, _("failed to preserve ownership for %s"), + quote (dst_path)); if (x->require_preserve) return 1; } @@ -1517,7 +1519,8 @@ copy_internal (const char *src_path, const char *dst_path, { file_t file = getdport (dst_path); if (file_chauthor (file, src_sb.st_author)) - error (0, errno, _("preserving authorship for %s"), quote (dst_path)); + error (0, errno, _("failed to preserve authorship for %s"), + quote (dst_path)); mach_port_deallocate (mach_task_self (), file); } #endif @@ -322,7 +322,8 @@ re_protect (const char *const_dst_path, int src_offset, if (utime (dst_path, &utb)) { - error (0, errno, _("preserving times for %s"), quote (dst_path)); + error (0, errno, _("failed to preserve times for %s"), + quote (dst_path)); return 1; } } @@ -335,7 +336,7 @@ re_protect (const char *const_dst_path, int src_offset, if (chown (dst_path, src_sb.st_uid, src_sb.st_gid) && ((errno != EPERM && errno != EINVAL) || myeuid == 0)) { - error (0, errno, _("preserving ownership for %s"), + error (0, errno, _("failed to preserve ownership for %s"), quote (dst_path)); return 1; } @@ -345,7 +346,7 @@ re_protect (const char *const_dst_path, int src_offset, { if (chmod (dst_path, src_sb.st_mode & x->umask_kill)) { - error (0, errno, _("preserving permissions for %s"), + error (0, errno, _("failed to preserve permissions for %s"), quote (dst_path)); return 1; } |