(update_archive): Abort if HEADER_SUCCESS_EXTENDED occurs,

[chaz/tar] / src / update.c

diff --git a/src/update.c b/src/update.c
index 754d321fd4de7ea3ad0c06334fdfcb1d6747cd39..5363ece48d934911d6d10a7394c89d5ac1a73f01 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -1,7 +1,7 @@
 /* Update a tar archive.
 
-   Copyright (C) 1988, 1992, 1994, 1996, 1997, 1999, 2000, 2001 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
@@ -108,11 +108,12 @@ update_archive (void)
 
   while (!found_end)
     {
-      enum read_header status = read_header (0);
+      enum read_header status = read_header (false);
 
       switch (status)
        {
        case HEADER_STILL_UNREAD:
+       case HEADER_SUCCESS_EXTENDED:
          abort ();
 
        case HEADER_SUCCESS:
@@ -120,16 +121,16 @@ 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);
              }
            skip_member ();
            break;
@@ -161,6 +162,7 @@ update_archive (void)
              break;
 
            case HEADER_END_OF_FILE:
+           case HEADER_SUCCESS_EXTENDED:
              abort ();
            }
          break;