From 9c194c9942b651befe1fa65ba9023fba9e50169f Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Mon, 28 Jun 2010 16:56:54 +0300 Subject: [PATCH] Fix exclusion of long file names when extracting from pax format archives. * 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. --- src/compare.c | 1 - src/extract.c | 2 +- src/list.c | 7 ++----- tests/Makefile.am | 1 + tests/exclude06.at | 47 ++++++++++++++++++++++++++++++++++++++++++++++ tests/testsuite.at | 1 + 6 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 tests/exclude06.at diff --git a/src/compare.c b/src/compare.c index f4e92da..437ffb3 100644 --- a/src/compare.c +++ b/src/compare.c @@ -452,7 +452,6 @@ diff_archive (void) { set_next_block_after (current_header); - decode_header (current_header, ¤t_stat_info, ¤t_format, 1); /* Print the block from current_header and current_stat_info. */ diff --git a/src/extract.c b/src/extract.c index c3a99e0..0f0d03f 100644 --- a/src/extract.c +++ b/src/extract.c @@ -1278,7 +1278,7 @@ extract_archive (void) priv_set_remove_linkdir (); set_next_block_after (current_header); - decode_header (current_header, ¤t_stat_info, ¤t_format, 1); + if (!current_stat_info.file_name[0] || (interactive_option && !confirm ("extract", current_stat_info.file_name))) diff --git a/src/list.c b/src/list.c index dad725a..74df761 100644 --- a/src/list.c +++ b/src/list.c @@ -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, ¤t_stat_info, + ¤t_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, - ¤t_stat_info, ¤t_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, ¤t_stat_info, ¤t_format, 0); if (verbose_option) print_header (¤t_stat_info, current_header, block_ordinal); diff --git a/tests/Makefile.am b/tests/Makefile.am index 31811b0..97a678d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -66,6 +66,7 @@ TESTSUITE_AT = \ exclude03.at\ exclude04.at\ exclude05.at\ + exclude06.at\ extrac01.at\ extrac02.at\ extrac03.at\ diff --git a/tests/exclude06.at b/tests/exclude06.at new file mode 100644 index 0000000..f7ab141 --- /dev/null +++ b/tests/exclude06.at @@ -0,0 +1,47 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- +# Copyright (C) 2010 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Tar 1.23 would fail to exclude names longer that 100 characters from +# pax format archives. +# +# Reported-by: Matthew Peterson +# References: +# http://lists.gnu.org/archive/html/help-tar/2010-06/msg00000.html + +AT_SETUP([exclude: long files in pax archives]) +AT_KEYWORDS([exclude exclude06]) + +m4_define([test_base_dir],[one/two/three/four/five/six/seven/eight/nine/ten/eleven/twelve/thirteen/fourteen/fifteen/sixteen/seventeen]) + +AT_TAR_CHECK([ +AT_TAR_MKHIER(test_base_dir) +genfile --length 20 -f test_base_dir[/1.txt] +genfile --length 20 -f test_base_dir[/1.c] + +tar cf archive.tar test_base_dir +mkdir out +tar -C out -xf archive.tar --exclude='*.txt' +find out -type f +], +[0], +[[out/]test_base_dir[/1.c] +], +[], +[], +[], +[pax]) + +AT_CLEANUP diff --git a/tests/testsuite.at b/tests/testsuite.at index 9205d52..2661904 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -130,6 +130,7 @@ m4_include([exclude02.at]) m4_include([exclude03.at]) m4_include([exclude04.at]) m4_include([exclude05.at]) +m4_include([exclude06.at]) m4_include([delete01.at]) m4_include([delete02.at]) -- 2.44.0