X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fupdate.c;h=d4145d0421096cc3679ce2b5ee2d9f7f697e9221;hb=ee6aa2bea8b4a011cf071b4264a49f85783de511;hp=5363ece48d934911d6d10a7394c89d5ac1a73f01;hpb=df06a57b8c62f0268950454fe84f3e2b23534919;p=chaz%2Ftar

diff --git a/src/update.c b/src/update.c
index 5363ece..d4145d0 100644
--- a/src/update.c
+++ b/src/update.c
@@ -32,8 +32,10 @@ extern union block *current_block;
 
 /* We've hit the end of the old stuff, and its time to start writing new
    stuff to the tape.  This involves seeking back one record and
-   re-writing the current record (which has been changed).  */
-int time_to_start_writing;
+   re-writing the current record (which has been changed).
+   FIXME: Either eliminate it or move it to common.h. 
+*/
+bool time_to_start_writing;
 
 /* Pointer to where we started to write in the first record we write out.
    This is used if we can't backspace the output and have to null out the
@@ -80,7 +82,10 @@ append_file (char *path)
 	    read_fatal_details (path, stat_data.st_size - bytes_left,
 				buffer_size);
 	  if (status == 0)
-	    FATAL_ERROR ((0, 0, _("%s: File shrank by %s bytes"),
+	    FATAL_ERROR ((0, 0,
+			  ngettext ("%s: File shrank by %s byte",
+				    "%s: File shrank by %s bytes",
+				    bytes_left),
 			  quotearg_colon (path),
 			  STRINGIFY_BIGINT (bytes_left, buf)));
 
@@ -105,7 +110,8 @@ update_archive (void)
 
   name_gather ();
   open_archive (ACCESS_UPDATE);
-
+  xheader_write_global ();
+  
   while (!found_end)
     {
       enum read_header status = read_header (false);
@@ -121,14 +127,15 @@ update_archive (void)
 	    struct name *name;
 
 	    if (subcommand_option == UPDATE_SUBCOMMAND
-		&& (name = name_scan (current_stat_info.file_name), name))
+		&& (name = name_scan (current_stat_info.file_name)) != NULL)
 	      {
 		struct stat s;
 		enum archive_format unused;
 
 		decode_header (current_header, &current_stat_info, &unused, 0);
 		chdir_do (name->change_dir);
-		if (deref_stat (dereference_option, current_stat_info.file_name, &s) == 0
+		if (deref_stat (dereference_option,
+				current_stat_info.file_name, &s) == 0
 		    && s.st_mtime <= current_stat_info.stat.st_mtime)
 		  add_avoided_name (current_stat_info.file_name);
 	      }
@@ -172,13 +179,13 @@ update_archive (void)
     }
 
   reset_eof ();
-  time_to_start_writing = 1;
+  time_to_start_writing = true;
   output_start = current_block->buffer;
 
   {
     char *path;
 
-    while (path = name_from_list (), path)
+    while ((path = name_from_list ()) != NULL)
       {
 	if (excluded_name (path))
 	  continue;