mirror of
https://git.savannah.gnu.org/git/tar.git
synced 2026-09-29 19:35:33 +00:00
Make sure name matching occurs before name transformation.
The commit 9c194c99 altered that order.
* src/list.c (transform_stat_info): New function. Split off from
decode_header.
(read_and): Call transform_stat_info right before do_something,
and after deciding if we should proceed with this member name,
so that name matching occurs before name transformation.
* tests/extrac17.at: New file.
* tests/Makefile.am (TESTSUITE_AT): Add extrac17.at
* tests/testsuite.at: Include extrac17.at.
This commit is contained in:
@@ -83,6 +83,7 @@ TESTSUITE_AT = \
|
||||
extrac14.at\
|
||||
extrac15.at\
|
||||
extrac16.at\
|
||||
extrac17.at\
|
||||
filerem01.at\
|
||||
filerem02.at\
|
||||
gzip.at\
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
#
|
||||
# Test suite for GNU tar.
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
AT_SETUP([name matching/transformation ordering])
|
||||
AT_KEYWORDS([extract extrac17])
|
||||
|
||||
# Description: Tar 1.24 changed the ordering of name matching and
|
||||
# name transformation so that the former saw already transformed
|
||||
# file names (see commit 9c194c99 and exclude06.at). This reverted
|
||||
# ordering made it impossible to match file names in certain cases.
|
||||
# In particular, the testcase below would not extract anything.
|
||||
#
|
||||
# Reported-by: "Gabor Z. Papp" <gzp@papp.hu>
|
||||
# References: <x6r5fd9jye@gzp>, <20101026175126.29028@Pirx.gnu.org.ua>
|
||||
# http://lists.gnu.org/archive/html/bug-tar/2010-10/msg00047.html
|
||||
|
||||
AT_TAR_CHECK([
|
||||
mkdir dir dir/subdir1 dir/subdir2 out
|
||||
genfile --file dir/subdir1/file1
|
||||
genfile --file dir/subdir2/file2
|
||||
|
||||
tar cf dir.tar dir
|
||||
|
||||
tar -x -v -f dir.tar -C out --strip-components=2 dir/subdir1/
|
||||
],
|
||||
[0],
|
||||
[dir/subdir1/file1
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -155,6 +155,7 @@ m4_include([extrac13.at])
|
||||
m4_include([extrac14.at])
|
||||
m4_include([extrac15.at])
|
||||
m4_include([extrac16.at])
|
||||
m4_include([extrac17.at])
|
||||
|
||||
m4_include([label01.at])
|
||||
m4_include([label02.at])
|
||||
|
||||
Reference in New Issue
Block a user