X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=1e6e1bf32817bf47612235087b041dca5ebd2b96;hb=c8764440d9cb0187fcbabe26e7f6191c0148178e;hp=5c6412fbf63ac63e2a8823f1026c10ebd6dabd9d;hpb=76bbb5710fe1f3a5b9500eebf9b6746fb7d458fe;p=chaz%2Ftar

diff --git a/src/buffer.c b/src/buffer.c
index 5c6412f..1e6e1bf 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -216,28 +216,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);
+      /* FD is not needed any more */
+      rmtclose (archive);
 
-  hit_eof = false; /* It might have been set by find_next_block in
-		      check_compressed_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;
+      /* 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 +762,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 +1179,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)