mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-09-06 08:16:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix exclusion of long file names when extracting from pax format archives.

Browse Source 
* src/list.c (read_and): Call decode_header before attempting
name_match.
(list_archive): Remove call to decode_header.

* src/compare.c (diff_archive): Remove call to decode_header.
* src/extract.c (extract_archive): Likewise.

* test/exclude06.at: New test case.
* tests/testsuite.at: Include exclude06.at.
* tests/Makefile.am (TESTSUITE_AT): Add exclude06.at.
This commit is contained in:
Sergey Poznyakoff
2010-06-28 16:56:54 +03:00
parent 80a6ef7d94
commit 9c194c9942
6 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compare.c
-1
View File
@@ -452,7 +452,6 @@ diff_archive (void)
{
set_next_block_after (current_header);
decode_header (current_header, &current_stat_info, &current_format, 1);
/* Print the block from current_header and current_stat_info. */
src/extract.c
+1 -1
View File
@@ -1278,7 +1278,7 @@ extract_archive (void)
priv_set_remove_linkdir ();
set_next_block_after (current_header);
decode_header (current_header, &current_stat_info, &current_format, 1);
if (!current_stat_info.file_name[0]
|| (interactive_option
&& !confirm ("extract", current_stat_info.file_name)))
src/list.c
+2 -5
View File
@@ -90,7 +90,8 @@ read_and (void (*do_something) (void))
/* Valid header. We should decode next field (mode) first.
Ensure incoming names are null terminated. */
decode_header (current_header, &current_stat_info,
&current_format, 1);
if (! name_match (current_stat_info.file_name)
|| (NEWER_OPTION_INITIALIZED (newer_mtime_option)
/* FIXME: We get mtime now, and again later; this causes
@@ -116,8 +117,6 @@ read_and (void (*do_something) (void))
quotearg_colon (current_stat_info.file_name)));
/* Fall through. */
default:
decode_header (current_header,
&current_stat_info, &current_format, 0);
skip_member ();
continue;
}
@@ -210,8 +209,6 @@ list_archive (void)
off_t block_ordinal = current_block_ordinal ();
/* Print the header block. */
decode_header (current_header, &current_stat_info, &current_format, 0);
if (verbose_option)
print_header (&current_stat_info, current_header, block_ordinal);