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

diff --git a/src/update.c b/src/update.c
index 67e7149..5363ece 100644
--- a/src/update.c
+++ b/src/update.c
@@ -1,5 +1,7 @@
 /* Update a tar archive.
-   Copyright 1988, 1992, 1994, 1996, 1997, 1999 Free Software Foundation, Inc.
+
+   Copyright (C) 1988, 1992, 1994, 1996, 1997, 1999, 2000, 2001, 2003
+   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 +40,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)
 {
@@ -95,12 +94,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)
 {
@@ -112,11 +108,12 @@ update_archive (void)
 
   while (!found_end)
     {
-      enum read_header status = read_header ();
+      enum read_header status = read_header (false);
 
       switch (status)
 	{
 	case HEADER_STILL_UNREAD:
+	case HEADER_SUCCESS_EXTENDED:
 	  abort ();
 
 	case HEADER_SUCCESS:
@@ -124,21 +121,18 @@ update_archive (void)
 	    struct name *name;
 
 	    if (subcommand_option == UPDATE_SUBCOMMAND
-		&& (name = name_scan (current_file_name), name))
+		&& (name = name_scan (current_stat_info.file_name), name))
 	      {
 		struct stat s;
 		enum archive_format unused;
 
-		decode_header (current_header, &current_stat, &unused, 0);
+		decode_header (current_header, &current_stat_info, &unused, 0);
 		chdir_do (name->change_dir);
-		if (deref_stat (dereference_option, current_file_name, &s) == 0
-		    && s.st_mtime <= current_stat.st_mtime)
-		  add_avoided_name (current_file_name);
+		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);
 	      }
-	    set_next_block_after (current_header);
-	    if (current_header->oldgnu_header.isextended)
-	      skip_extended_headers ();
-	    skip_file (current_stat.st_size);
+	    skip_member ();
 	    break;
 	  }
 
@@ -168,6 +162,7 @@ update_archive (void)
 	      break;
 
 	    case HEADER_END_OF_FILE:
+	    case HEADER_SUCCESS_EXTENDED:
 	      abort ();
 	    }
 	  break;