Fix the effect of --transform over hard link targets without the --absolute-names

* src/create.c (file_count_links): Apply safer_name_suffix to the
hard link name prior to transforming it.
* tests/xform03.at: New test case.
* tests/Makefile.am: Add xform03.at
* tests/testsuite.at: Likewise.
This commit is contained in:
Sergey Poznyakoff
2017-09-30 10:04:02 +03:00
parent 228d83ed24
commit 1e6d2c0488
4 changed files with 45 additions and 1 deletions

View File

@@ -1534,7 +1534,8 @@ file_count_links (struct tar_stat_info *st)
char *linkname = NULL;
struct link *lp;
assign_string (&linkname, st->orig_file_name);
assign_string (&linkname, safer_name_suffix (st->orig_file_name, true,
absolute_names_option));
transform_name (&linkname, XFORM_LINK);
lp = xmalloc (offsetof (struct link, name)

View File

@@ -241,6 +241,7 @@ TESTSUITE_AT = \
xform-h.at\
xform01.at\
xform02.at\
xform03.at\
star/gtarfail.at\
star/gtarfail2.at\
star/multi-fail.at\

View File

@@ -259,6 +259,7 @@ AT_BANNER([Transforms])
m4_include([xform-h.at])
m4_include([xform01.at])
m4_include([xform02.at])
m4_include([xform03.at])
AT_BANNER([Exclude])
m4_include([exclude.at])

41
tests/xform03.at Normal file
View File

@@ -0,0 +1,41 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
# Copyright 2017 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
# GNU tar 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 of the License, or
# (at your option) any later version.
#
# GNU tar 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([transforming hard link targets])
AT_KEYWORDS([transform xform link])
AT_TAR_CHECK([
mkdir d
mkdir d/a
genfile --file d/a/b
dir=$(pwd|sed s,^/,,)/d
tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b
mkdir t
tar -C t -xf a.tar
find t -type f
],
[0],
[t/dir/c/b
],
[tar: Removing leading `/' from member names
tar: Removing leading `/' from hard link targets
])
AT_CLEANUP