From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Thu, 7 Apr 2005 17:27:07 +0000 (+0000)
Subject: Assign orig_file_name
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=2d34da98d52db1a915c10376b0405d7219e297c0;p=chaz%2Ftar

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 bf2c76b..cee0b55 100644
--- 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 0657fcf..16a6970 100644
--- 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);