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.

diff --git a/src/create.c b/src/create.c
index bb720f7c90e3d7bce63fe07b061924596ae42b8d..35bcf5b0c878f1adff2bcd69c4dc0b416800c42c 100644 (file)
--- a/src/create.c
+++ b/src/create.c
@@ -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)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 43cc88f49d81e2bc24fc1358f63100d7ada264fd..be21efafdbf81eb5542e2e63e27abbf84e3afb28 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -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\

diff --git a/tests/testsuite.at b/tests/testsuite.at
index a2ee717dcc354c0105ce7d2895810185c76e1d5c..7682a03e7435ad12d0f51f84d32b0f0279f6c8fb 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -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])

diff --git a/tests/xform03.at b/tests/xform03.at
new file mode 100644 (file)
index 0000000..47f52f1
--- /dev/null
+++ b/tests/xform03.at
@@ -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
+