Update copyright year.

[chaz/tar] / src / update.c

diff --git a/src/update.c b/src/update.c
index 4002844ffad64594876f728f2837e219ce735495..e34718fbaece1d72e6c0ed4a61badb647db81423 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, 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
@@ -21,6 +21,7 @@
    they're on raw tape or something like that, it'll probably lose...  */
 
 #include "system.h"
+#include <quotearg.h>
 #include "common.h"
 
 /* FIXME: This module should not directly handle the following variable,
@@ -50,12 +51,12 @@ append_file (char *path)
 
   if (handle < 0)
     {
-      ERROR ((0, errno, _("Cannot open file %s"), path));
+      open_error (path);
       return;
     }
 
   if (fstat (handle, &stat_data) != 0)
-    ERROR ((0, errno, "%s", path));
+    stat_error (path);
   else
     {
       off_t bytes_left = stat_data.st_size;
@@ -77,14 +78,12 @@ append_file (char *path)
 
          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));
+           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!)"),
-                         path, STRINGIFY_BIGINT (bytes_left, buf)));
+           FATAL_ERROR ((0, 0, _("%s: File shrank by %s bytes"),
+                         quotearg_colon (path),
+                         STRINGIFY_BIGINT (bytes_left, buf)));
 
          bytes_left -= status;
 
@@ -92,7 +91,8 @@ append_file (char *path)
        }
     }
 
-  close (handle);
+  if (close (handle) != 0)
+    close_error (path);
 }
 
 /*-----------------------------------------------------------------------.
@@ -108,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)
@@ -128,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)
@@ -194,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);
       }
   }