X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fupdate.c;h=e34718fbaece1d72e6c0ed4a61badb647db81423;hb=a6f11d40927e062799d4992af753c0642835eaaf;hp=6cf527497dd7efc326c57f838223289d2a312532;hpb=e6d8e9279f96aea82cf45faf24c6f3b792e7aae0;p=chaz%2Ftar

diff --git a/src/update.c b/src/update.c
index 6cf5274..e34718f 100644
--- a/src/update.c
+++ b/src/update.c
@@ -1,5 +1,5 @@
 /* Update a tar archive.
-   Copyright 1988, 1992, 1994, 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright 1988, 92, 94, 96, 97, 99, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -21,6 +21,7 @@
    they're on raw tape or something like that, it'll probably lose...  */
 
 #include "system.h"
+#include <quotearg.h>
 #include "common.h"
 
 /* FIXME: This module should not directly handle the following variable,
@@ -50,12 +51,12 @@ append_file (char *path)
 
   if (handle < 0)
     {
-      ERROR ((0, errno, _("Cannot open file %s"), path));
+      open_error (path);
       return;
     }
 
   if (fstat (handle, &stat_data) != 0)
-    ERROR ((0, errno, "%s", path));
+    stat_error (path);
   else
     {
       off_t bytes_left = stat_data.st_size;
@@ -77,14 +78,12 @@ append_file (char *path)
 
 	  status = safe_read (handle, start->buffer, buffer_size);
 	  if (status < 0)
-	    FATAL_ERROR ((0, errno,
-			  _("Read error at byte %s reading %lu bytes in file %s"),
-			  STRINGIFY_BIGINT (stat_data.st_size - bytes_left,
-					    buf),
-			  (unsigned long) buffer_size, path));
+	    read_fatal_details (path, stat_data.st_size - bytes_left,
+				buffer_size);
 	  if (status == 0)
-	    FATAL_ERROR ((0, 0, _("%s: File shrunk by %s bytes, (yark!)"),
-			  path, STRINGIFY_BIGINT (bytes_left, buf)));
+	    FATAL_ERROR ((0, 0, _("%s: File shrank by %s bytes"),
+			  quotearg_colon (path),
+			  STRINGIFY_BIGINT (bytes_left, buf)));
 
 	  bytes_left -= status;
 
@@ -92,7 +91,8 @@ append_file (char *path)
 	}
     }
 
-  close (handle);
+  if (close (handle) != 0)
+    close_error (path);
 }
 
 /*-----------------------------------------------------------------------.
@@ -192,7 +192,7 @@ update_archive (void)
 	if (subcommand_option == CAT_SUBCOMMAND)
 	  append_file (path);
 	else
-	  dump_file (path, (dev_t) 0, 1);
+	  dump_file (path, 1, (dev_t) 0);
       }
   }