From: Jim Meyering <jim@meyering.net>
Date: Thu, 27 Feb 1997 05:49:44 +0000 (+0000)
Subject: (re_protect): When there is any potential for ambiguity in a diagnostic,
X-Git-Tag: SH-UTILS-1_16a~200
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94cab3643225cbbab8006635d4e5a0f0d9180c4b;p=thirdparty%2Fcoreutils.git

(re_protect): When there is any potential for ambiguity in a diagnostic,
give explanatory diagnostic in addition to file name.
---

diff --git a/src/cp.c b/src/cp.c
index a8668f7709..027fe16259 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -241,7 +241,7 @@ re_protect (const char *const_dst_path, int src_offset,
 
 	  if (utime (dst_path, &utb))
 	    {
-	      error (0, errno, "%s", dst_path);
+	      error (0, errno, _("preserving times for %s"), dst_path);
 	      return 1;
 	    }
 
@@ -250,7 +250,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 || myeuid == 0))
 	    {
-	      error (0, errno, "%s", dst_path);
+	      error (0, errno, _("preserving ownership for %s"), dst_path);
 	      return 1;
 	    }
 	}
@@ -259,7 +259,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, "%s", dst_path);
+	      error (0, errno, _("preserving permissions for %s"), dst_path);
 	      return 1;
 	    }
 	}