Include fnmatch.h.

[chaz/tar] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index b59efb2808c41af4b5a21343d60070aa7ba57e37..0dcea17db794d6117b90d45bdf27588c4a70557a 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -448,7 +448,7 @@ child_open_for_compress (void)
 
       status = write_archive_buffer ();
       if (status != record_size)
-       archive_write_error (status);
+       archive_write_error (status);
     }
 
 #if 0
@@ -463,7 +463,7 @@ child_open_for_compress (void)
        waitpid_error (use_compress_program_option);
        break;
       }
-  
+
   if (WIFSIGNALED (wait_status))
     {
       kill (child_pid, WTERMSIG (wait_status));
@@ -613,7 +613,7 @@ child_open_for_uncompress (void)
        waitpid_error (use_compress_program_option);
        break;
       }
-  
+
   if (WIFSIGNALED (wait_status))
     {
       kill (child_pid, WTERMSIG (wait_status));
@@ -637,6 +637,9 @@ check_label_pattern (union block *label)
   char *string;
   int result;
 
+  if (! memchr (label->header.name, '\0', sizeof label->header.name))
+    return 0;
+
   if (fnmatch (volume_label_option, label->header.name, 0) == 0)
     return 1;
 
@@ -957,7 +960,7 @@ flush_write (void)
       strcpy (record_start->header.name, real_s_name);
       record_start->header.typeflag = GNUTYPE_MULTIVOL;
       OFF_TO_CHARS (real_s_sizeleft, record_start->header.size);
-      OFF_TO_CHARS (real_s_totsize - real_s_sizeleft, 
+      OFF_TO_CHARS (real_s_totsize - real_s_sizeleft,
                    record_start->oldgnu_header.offset);
       tmp = verbose_option;
       verbose_option = 0;
@@ -1162,7 +1165,7 @@ flush_read (void)
              char totsizebuf[UINTMAX_STRSIZE_BOUND];
              char s1buf[UINTMAX_STRSIZE_BOUND];
              char s2buf[UINTMAX_STRSIZE_BOUND];
-             
+
              WARN ((0, 0, _("%s is the wrong size (%s != %s + %s)"),
                     quote (cursor->header.name),
                     STRINGIFY_BIGINT (save_totsize, totsizebuf),
@@ -1195,7 +1198,8 @@ flush_read (void)
   more = record_start->buffer + status;
   left = record_size - status;
 
-  while (left % BLOCKSIZE != 0)
+  while (left % BLOCKSIZE != 0
+        || (left && status && read_full_records_option))
     {
       if (status)
        while ((status = rmtread (archive, more, left)) < 0)
@@ -1203,15 +1207,16 @@ flush_read (void)
 
       if (status == 0)
        {
-         ERROR ((0, 0, _("%d garbage bytes ignored at end of archive"),
-                 (int) ((record_size - left) % BLOCKSIZE)));
+         if (left % BLOCKSIZE != 0)
+           ERROR ((0, 0, _("%d garbage bytes ignored at end of archive"),
+                   (int) ((record_size - left) % BLOCKSIZE)));
          break;
        }
 
       if (! read_full_records_option)
        FATAL_ERROR ((0, 0, _("Unaligned block (%lu bytes) in archive"),
                      (unsigned long) (record_size - left)));
-         
+
       /* User warned us about this.  Fix up.  */
 
       left -= status;
@@ -1379,7 +1384,10 @@ init_volume_number (void)
 
   if (file)
     {
-      fscanf (file, "%d", &global_volno);
+      if (fscanf (file, "%d", &global_volno) != 1
+         || global_volno < 0)
+       FATAL_ERROR ((0, 0, _("%s: contains invalid volume number"),
+                     quotearg_colon (volno_file_option)));
       if (ferror (file))
        read_error (volno_file_option);
       if (fclose (file) != 0)
@@ -1428,6 +1436,8 @@ new_volume (enum access_mode access)
     close_warn (*archive_name_cursor);
 
   global_volno++;
+  if (global_volno < 0)
+    FATAL_ERROR ((0, 0, _("Volume number overflow")));
   volno++;
   archive_name_cursor++;
   if (archive_name_cursor == archive_name_array + archive_names)