(name_next): If file names are given both in the

[chaz/tar] / src / update.c

diff --git a/src/update.c b/src/update.c
index 05c68f3e317838ade05e3cd045059244e4ea10e6..f4a1a9de55e660ad2c08d71b8359c74b32146a92 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -1,5 +1,5 @@
 /* Update a tar archive.
-   Copyright (C) 1988, 1992, 1994, 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1988, 1992, 1994, 1996, 1997, 1999 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
@@ -30,7 +30,7 @@ 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 = 0;
+int 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
@@ -72,8 +72,7 @@ append_file (char *path)
              buffer_size = bytes_left;
              status = buffer_size % BLOCKSIZE;
              if (status)
-               memset (start->buffer + bytes_left, 0,
-                       (size_t) (BLOCKSIZE - status));
+               memset (start->buffer + bytes_left, 0, BLOCKSIZE - status);
            }
 
          status = safe_read (handle, start->buffer, buffer_size);
@@ -109,8 +108,6 @@ update_archive (void)
   int found_end = 0;
 
   name_gather ();
-  if (subcommand_option == UPDATE_SUBCOMMAND)
-    name_expand ();
   open_archive (ACCESS_UPDATE);
 
   while (!found_end)
@@ -129,14 +126,14 @@ update_archive (void)
            if (subcommand_option == UPDATE_SUBCOMMAND
                && (name = name_scan (current_file_name), name))
              {
-               struct stat stat_data;
+               struct stat s;
                enum archive_format unused;
 
                decode_header (current_header, &current_stat, &unused, 0);
-               if (stat (current_file_name, &stat_data) < 0)
-                 ERROR ((0, errno, _("Cannot stat %s"), current_file_name));
-               else if (current_stat.st_mtime >= stat_data.st_mtime)
-                 name->found = 1;
+               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);
              }
            set_next_block_after (current_header);
            if (current_header->oldgnu_header.isextended)
@@ -195,7 +192,7 @@ update_archive (void)
        if (subcommand_option == CAT_SUBCOMMAND)
          append_file (path);
        else
-         dump_file (path, (dev_t) -1, 1);
+         dump_file (path, 1, (dev_t) 0);
       }
   }