(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 98211eeeec63bf237585f93839babc7811265c9f..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
@@ -45,52 +45,50 @@ char *output_start;
 static void
 append_file (char *path)
 {
-  int handle;
+  int handle = open (path, O_RDONLY | O_BINARY);
   struct stat stat_data;
-  off_t bytes_left;
 
-  if (stat (path, &stat_data) != 0
-      || (handle = open (path, O_RDONLY | O_BINARY), handle < 0))
+  if (handle < 0)
     {
       ERROR ((0, errno, _("Cannot open file %s"), path));
       return;
     }
 
-  bytes_left = stat_data.st_size;
-
-  while (bytes_left > 0)
+  if (fstat (handle, &stat_data) != 0)
+    ERROR ((0, errno, "%s", path));
+  else
     {
-      union block *start = find_next_block ();
-      size_t buffer_size = available_space_after (start);
-      ssize_t status;
-
-      if (bytes_left < buffer_size)
-       {
-         buffer_size = bytes_left;
-         status = buffer_size % BLOCKSIZE;
-         if (status)
-           memset (start->buffer + bytes_left, 0,
-                   (size_t) (BLOCKSIZE - status));
-       }
+      off_t bytes_left = stat_data.st_size;
 
-      status = full_read (handle, start->buffer, buffer_size);
-      if (status < 0)
+      while (bytes_left > 0)
        {
+         union block *start = find_next_block ();
+         size_t buffer_size = available_space_after (start);
+         ssize_t status;
          char buf[UINTMAX_STRSIZE_BOUND];
-         FATAL_ERROR ((0, errno,
-                       _("Read error at byte %s reading %lu bytes in file %s"),
-                       STRINGIFY_BIGINT (stat_data.st_size - bytes_left, buf),
-                       (unsigned long) buffer_size, path));
-       }
-      bytes_left -= status;
 
-      set_next_block_after (start + (status - 1) / BLOCKSIZE);
+         if (bytes_left < buffer_size)
+           {
+             buffer_size = bytes_left;
+             status = buffer_size % BLOCKSIZE;
+             if (status)
+               memset (start->buffer + bytes_left, 0, BLOCKSIZE - status);
+           }
+
+         status = safe_read (handle, start->buffer, buffer_size);
+         if (status < 0)
+           FATAL_ERROR ((0, errno,
+                         _("Read error at byte %s reading %lu bytes in file %s"),
+                         STRINGIFY_BIGINT (stat_data.st_size - bytes_left,
+                                           buf),
+                         (unsigned long) buffer_size, path));
+         if (status == 0)
+           FATAL_ERROR ((0, 0, _("%s: File shrunk by %s bytes, (yark!)"),
+                         path, STRINGIFY_BIGINT (bytes_left, buf)));
 
-      if (status != buffer_size)
-       {
-         char buf[UINTMAX_STRSIZE_BOUND];
-         FATAL_ERROR ((0, 0, _("%s: File shrunk by %s bytes, (yark!)"),
-                       path, STRINGIFY_BIGINT (bytes_left, buf)));
+         bytes_left -= status;
+
+         set_next_block_after (start + (status - 1) / BLOCKSIZE);
        }
     }
 
@@ -110,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)
@@ -130,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)
@@ -189,12 +185,14 @@ update_archive (void)
 
     while (path = name_from_list (), path)
       {
+       if (excluded_name (path))
+         continue;
        if (interactive_option && !confirm ("add", path))
          continue;
        if (subcommand_option == CAT_SUBCOMMAND)
          append_file (path);
        else
-         dump_file (path, (dev_t) -1, 1);
+         dump_file (path, 1, (dev_t) 0);
       }
   }