X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fupdate.c;h=5f315703ea82c7938d5409f4ba6aaafe8451580c;hb=2f04b655d8f42123af3080d71b446494d68494cb;hp=0f0ebc0e6d996e9e973e0ce5dedd4cb17ee3a232;hpb=a78ab36e1e4d7dccedaf7d1fcbaca6bb6ec0eed6;p=chaz%2Ftar

diff --git a/src/update.c b/src/update.c
index 0f0ebc0..5f31570 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
@@ -38,11 +38,8 @@ int time_to_start_writing;
    first part of the record.  */
 char *output_start;
 
-/*------------------------------------------------------------------------.
-| Catenate file PATH to the archive without creating a header for it.  It |
-| had better be a tar file or the archive is screwed.			  |
-`------------------------------------------------------------------------*/
-
+/* Catenate file PATH to the archive without creating a header for it.
+   It had better be a tar file or the archive is screwed.  */
 static void
 append_file (char *path)
 {
@@ -78,16 +75,10 @@ append_file (char *path)
 
 	  status = safe_read (handle, start->buffer, buffer_size);
 	  if (status < 0)
-	    {
-	      int e = errno;
-	      FATAL_ERROR ((0, e,
-			    _("Read error at byte %s reading %lu bytes in file %s"),
-			    STRINGIFY_BIGINT (stat_data.st_size - bytes_left,
-					      buf),
-			    (unsigned long) buffer_size, quote (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!)"),
+	    FATAL_ERROR ((0, 0, _("%s: File shrank by %s bytes"),
 			  quotearg_colon (path),
 			  STRINGIFY_BIGINT (bytes_left, buf)));
 
@@ -101,12 +92,9 @@ append_file (char *path)
     close_error (path);
 }
 
-/*-----------------------------------------------------------------------.
-| Implement the 'r' (add files to end of archive), and 'u' (add files to |
-| end of archive if they arent there, or are more up to date than the	 |
-| version in the archive.) commands.					 |
-`-----------------------------------------------------------------------*/
-
+/* Implement the 'r' (add files to end of archive), and 'u' (add files
+   to end of archive if they aren't there, or are more up to date than
+   the version in the archive) commands.  */
 void
 update_archive (void)
 {
@@ -141,10 +129,7 @@ update_archive (void)
 		    && s.st_mtime <= current_stat.st_mtime)
 		  add_avoided_name (current_file_name);
 	      }
-	    set_next_block_after (current_header);
-	    if (current_header->oldgnu_header.isextended)
-	      skip_extended_headers ();
-	    skip_file (current_stat.st_size);
+	    skip_member ();
 	    break;
 	  }