changeset 16272:8e1f4b31c39f

copy-file: Use 'quote' module consistently. * lib/copy-file.c (copy_file_preserving): Use quote().
author Bruno Haible <bruno@clisp.org>
date Wed, 11 Jan 2012 02:11:34 +0100
parents a9b070c205b2
children d50152d6b5d2
files ChangeLog lib/copy-file.c
diffstat 2 files changed, 17 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-01-10  Bruno Haible  <bruno@clisp.org>
 
+	copy-file: Use 'quote' module consistently.
+	* lib/copy-file.c (copy_file_preserving): Use quote().
+
 	copy-file: Refactor.
 	* lib/copy-file.c: Include quote.h.
 	(copy_file_preserving): Call qcopy_acl instead of copy_acl. Emit error
--- a/lib/copy-file.c
+++ b/lib/copy-file.c
@@ -65,36 +65,39 @@
 
   src_fd = open (src_filename, O_RDONLY | O_BINARY);
   if (src_fd < 0 || fstat (src_fd, &statbuf) < 0)
-    error (EXIT_FAILURE, errno, _("error while opening \"%s\" for reading"),
-           src_filename);
+    error (EXIT_FAILURE, errno, _("error while opening %s for reading"),
+           quote (src_filename));
 
   mode = statbuf.st_mode & 07777;
 
   dest_fd = open (dest_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0600);
   if (dest_fd < 0)
-    error (EXIT_FAILURE, errno, _("cannot open backup file \"%s\" for writing"),
-           dest_filename);
+    error (EXIT_FAILURE, errno, _("cannot open backup file %s for writing"),
+           quote (dest_filename));
 
   /* Copy the file contents.  */
   for (;;)
     {
       size_t n_read = safe_read (src_fd, buf, IO_SIZE);
       if (n_read == SAFE_READ_ERROR)
-        error (EXIT_FAILURE, errno, _("error reading \"%s\""), src_filename);
+        error (EXIT_FAILURE, errno, _("error reading %s"),
+               quote (src_filename));
       if (n_read == 0)
         break;
 
       if (full_write (dest_fd, buf, n_read) < n_read)
-        error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
+        error (EXIT_FAILURE, errno, _("error writing %s"),
+               quote (est_filename));
     }
 
   free (buf);
 
 #if !USE_ACL
   if (close (dest_fd) < 0)
-    error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
+    error (EXIT_FAILURE, errno, _("error writing %s"), quote (dest_filename));
   if (close (src_fd) < 0)
-    error (EXIT_FAILURE, errno, _("error after reading \"%s\""), src_filename);
+    error (EXIT_FAILURE, errno, _("error after reading %s"),
+           quote (src_filename));
 #endif
 
   /* Preserve the access and modification times.  */
@@ -137,8 +140,9 @@
 
 #if USE_ACL
   if (close (dest_fd) < 0)
-    error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
+    error (EXIT_FAILURE, errno, _("error writing %s"), quote (dest_filename));
   if (close (src_fd) < 0)
-    error (EXIT_FAILURE, errno, _("error after reading \"%s\""), src_filename);
+    error (EXIT_FAILURE, errno, _("error after reading %s"),
+           quote (src_filename));
 #endif
 }