X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=3687977013c1294853fffa31006b94a3746d2858;hb=db2d3f23443eceea499b7e6c23f646fe2a1247e2;hp=47e1be6cd0db10bd1847e0ffbf3ff7188bebc0f9;hpb=ab3b31cfef3e33696596f459da5130256b5ec60f;p=chaz%2Ftar

diff --git a/src/buffer.c b/src/buffer.c
index 47e1be6..3687977 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -182,7 +182,6 @@ enum compress_type
 check_compressed_archive ()
 {
   struct zip_magic *p;
-  size_t status;
   bool sfr, srp;
 
   /* Prepare global data needed for find_next_block: */
@@ -205,10 +204,7 @@ check_compressed_archive ()
 
   for (p = magic + 1; p < magic + NMAGIC; p++)
     if (memcmp (record_start->buffer, p->magic, p->length) == 0)
-      {
-	hit_eof = false; /* It might have been set by find_next_block */
-	return p->type;
-      }
+      return p->type;
   
   return ct_none;
 }
@@ -219,25 +215,29 @@ check_compressed_archive ()
 int
 open_compressed_archive ()
 {
-  enum compress_type type;
-
   archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
 		     MODE_RW, rsh_command_option);
   if (archive == -1)
     return archive;
 
-  type = check_compressed_archive ();
+  if (!multi_volume_option) 
+    {
+      enum compress_type type = check_compressed_archive ();
   
-  if (type == ct_none)
-    return archive;
+      if (type == ct_none)
+	return archive;
 
-  /* FD is not needed any more */
-  rmtclose (archive);
-  
-  /* Open compressed archive */
-  use_compress_program_option = compress_program (type);
-  child_pid = sys_child_open_for_uncompress ();
-  read_full_records = reading_from_pipe = true;
+      /* FD is not needed any more */
+      rmtclose (archive);
+
+      hit_eof = false; /* It might have been set by find_next_block in
+			  check_compressed_archive */
+
+      /* Open compressed archive */
+      use_compress_program_option = compress_program (type);
+      child_pid = sys_child_open_for_uncompress ();
+      read_full_records = reading_from_pipe = true;
+    }
   
   records_read = 0;
   record_end = record_start; /* set up for 1st record = # 0 */
@@ -761,7 +761,10 @@ short_read (size_t status)
 	    {
 	      char buf[UINTMAX_STRSIZE_BOUND];
 
-	      WARN((0, 0, _("Read %s bytes from %s"),
+	      WARN((0, 0,
+		    ngettext ("Read %s byte from %s",
+			      "Read %s bytes from %s",
+			      record_size - left),
 		    STRINGIFY_BIGINT (record_size - left, buf),
 		    *archive_name_cursor));
 	    }
@@ -1175,7 +1178,8 @@ new_volume (enum access_mode mode)
 	  if (volno_file_option)
 	    closeout_volume_number ();
 	  if (system (info_script_option) != 0)
-	    FATAL_ERROR ((0, 0, _("`%s' command failed"), info_script_option));
+	    FATAL_ERROR ((0, 0, _("%s command failed"),
+			  quote (info_script_option)));
 	}
       else
 	while (1)