Assign orig_file_name

to save_name uniformly over the program. This fixes matching
directory names at the start of an archive volume.

diff --git a/src/create.c b/src/create.c
index bf2c76b620f5210fdb369318282a1e9dca953eb3..cee0b55f36ce7e616e28f2c24c1c3a4ab94a87d1 100644 (file)
--- a/src/create.c
+++ b/src/create.c
@@ -859,7 +859,7 @@ dump_regular_file (int fd, struct tar_stat_info *st)
 
       if (multi_volume_option)
        {
-         assign_string (&save_name, st->file_name);
+         assign_string (&save_name, st->orig_file_name);
          save_sizeleft = size_left;
          save_totsize = st->stat.st_size;
        }

diff --git a/src/list.c b/src/list.c
index 0657fcff036492fd4f9367de5303e9e2b0dccc12..16a6970a58f618c1c16aeb0c5ccd2d6b0757134c 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -222,7 +222,7 @@ list_archive (void)
       set_next_block_after (current_header);
       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;
        }
       for (size = current_stat_info.stat.st_size; size > 0; size -= written)
@@ -258,7 +258,7 @@ list_archive (void)
     }
 
   if (multi_volume_option)
-    assign_string (&save_name, current_stat_info.file_name);
+    assign_string (&save_name, current_stat_info.orig_file_name);
 
   skip_member ();
 
@@ -1309,7 +1309,7 @@ skip_member (void)
   char save_typeflag = current_header->header.typeflag;
   set_next_block_after (current_header);
 
-  assign_string (&save_name, current_stat_info.file_name);
+  assign_string (&save_name, current_stat_info.orig_file_name);
 
   if (current_stat_info.is_sparse)
     sparse_skip_file (&current_stat_info);