X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=5ee323fc67bffc91fe1e8441283574756c242a3b;hb=a19097f3e6bbfbbd56a92d3e1a66ebb9149c91fa;hp=b59efb2808c41af4b5a21343d60070aa7ba57e37;hpb=4dcebd965545a7a8ab3e0d6d4e0fdcd5f767d399;p=chaz%2Ftar

diff --git a/src/buffer.c b/src/buffer.c
index b59efb2..5ee323f 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,5 +1,5 @@
 /* Buffer management for tar.
-   Copyright 1988, 92, 93, 94, 96, 97, 99, 2000 Free Software Foundation, Inc.
+   Copyright 1988,92,93,94,96,97,99,2000, 2001 Free Software Foundation, Inc.
    Written by John Gilmore, on 1985-08-25.
 
    This program is free software; you can redistribute it and/or modify it
@@ -19,10 +19,6 @@
 #include "system.h"
 
 #include <signal.h>
-#include <time.h>
-#ifndef time
-time_t time ();
-#endif
 
 #if MSDOS
 # include <process.h>
@@ -448,7 +444,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 +459,7 @@ child_open_for_compress (void)
 	waitpid_error (use_compress_program_option);
 	break;
       }
-  
+
   if (WIFSIGNALED (wait_status))
     {
       kill (child_pid, WTERMSIG (wait_status));
@@ -584,17 +580,8 @@ child_open_for_uncompress (void)
       while (maximum)
 	{
 	  count = maximum < BLOCKSIZE ? maximum : BLOCKSIZE;
-	  status = full_write (STDOUT_FILENO, cursor, count);
-	  if (status < 0)
+	  if (full_write (STDOUT_FILENO, cursor, count) != count)
 	    write_error (use_compress_program_option);
-
-	  if (status != count)
-	    {
-	      ERROR ((0, 0, _("Write to compression program short %lu bytes"),
-		      (unsigned long) (count - status)));
-	      count = status;
-	    }
-
 	  cursor += count;
 	  maximum -= count;
 	}
@@ -613,7 +600,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 +624,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;
 
@@ -893,7 +883,7 @@ flush_write (void)
 	    }
 
 	  cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
-	  while (*cursor == '/')
+	  while (ISSLASH (*cursor))
 	    cursor++;
 
 	  assign_string (&real_s_name, cursor);
@@ -957,7 +947,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;
@@ -990,7 +980,7 @@ flush_write (void)
 	{
 	  char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
 
-	  while (*cursor == '/')
+	  while (ISSLASH (*cursor))
 	    cursor++;
 
 	  assign_string (&real_s_name, cursor);
@@ -1067,7 +1057,7 @@ flush_read (void)
 	{
 	  char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
 
-	  while (*cursor == '/')
+	  while (ISSLASH (*cursor))
 	    cursor++;
 
 	  assign_string (&real_s_name, cursor);
@@ -1162,7 +1152,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 +1185,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 +1194,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 +1371,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 +1423,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)