(dump_regular_file): Correctly pad archive members that shrunk during archiving....

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index b1ca4e5c14891009e23faff4a81089a0bd2ffba4..2247de9b206106b24d610ca3281b19382d34137f 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -713,7 +713,7 @@ extract_file (char *file_name, int typeflag)
       {
        if (multi_volume_option)
          {
-           assign_string (&save_name, current_stat_info.file_name);
+           assign_string (&save_name, current_stat_info.orig_file_name);
            save_totsize = current_stat_info.stat.st_size;
            save_sizeleft = size;
          }
@@ -981,8 +981,6 @@ typedef int (*tar_extractor_t) (char *file_name, int typeflag);
 
 \f
 
-#define EXTRACT_OVER_PIPE (to_stdout_option || to_command_option)
-
 /* Prepare to extract a file. Find extractor function.
    Return zero if extraction should not proceed.  */
 
@@ -1074,7 +1072,7 @@ prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun)
 
     default:
       WARN ((0, 0,
-            _("%s: Unknown file type '%c', extracted as normal file"),
+            _("%s: Unknown file type `%c', extracted as normal file"),
             quotearg_colon (file_name), typeflag));
       *fun = extract_file;
     }
@@ -1149,7 +1147,7 @@ extract_archive (void)
 
   /* Take a safety backup of a previously existing file.  */
 
-  if (backup_option && ! EXTRACT_OVER_PIPE)
+  if (backup_option)
     if (!maybe_backup_file (file_name, 0))
       {
        int e = errno;