(time_to_start_writing): Changed data type.

[chaz/tar] / src / update.c

diff --git a/src/update.c b/src/update.c
index 11e86c5d8b436618ed77511fce42a63d79c6f7c0..f98dbb0493235a1988e655aaa898e69cd2bdbe5d 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
@@ -32,8 +32,10 @@ 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;
+   re-writing the current record (which has been changed).
+   FIXME: Either eliminate it or move it to common.h. 
+*/
+bool 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
@@ -80,7 +82,10 @@ append_file (char *path)
            read_fatal_details (path, stat_data.st_size - bytes_left,
                                buffer_size);
          if (status == 0)
-           FATAL_ERROR ((0, 0, _("%s: File shrank by %s bytes"),
+           FATAL_ERROR ((0, 0,
+                         ngettext ("%s: File shrank by %s byte",
+                                   "%s: File shrank by %s bytes",
+                                   bytes_left),
                          quotearg_colon (path),
                          STRINGIFY_BIGINT (bytes_left, buf)));
 
@@ -108,11 +113,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:
@@ -161,6 +167,7 @@ update_archive (void)
              break;
 
            case HEADER_END_OF_FILE:
+           case HEADER_SUCCESS_EXTENDED:
              abort ();
            }
          break;
@@ -170,7 +177,7 @@ update_archive (void)
     }
 
   reset_eof ();
-  time_to_start_writing = 1;
+  time_to_start_writing = true;
   output_start = current_block->buffer;
 
   {