Use relative addressing in deferred unlinks.
* src/common.h (tar_dirname): New function. * src/misc.c (normalize_filename_x): Make extern. (tar_dirname): New function. (tar_getcwd): Take into account absoulte pathnames. * src/unlink.c (deferred_unlink) <dir_idx>: New member; keeps the value of chdir_current at the moment of structure allocation. (flush_deferred_unlinks): Use chdir_do and relative addressing. (queue_deferred_unlink): Initialize dir_idx. * tests/Makefile.am: Add new tests. * tests/testsuite.at: Add new tests. * tests/remfiles06.at: Fix description. * tests/remfiles07.at: Fix description. * tests/remfiles08.at: New test case.
This commit is contained in:
@@ -166,6 +166,7 @@ TESTSUITE_AT = \
|
||||
remfiles05.at\
|
||||
remfiles06.at\
|
||||
remfiles07.at\
|
||||
remfiles08.at\
|
||||
same-order01.at\
|
||||
same-order02.at\
|
||||
shortfile.at\
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
# References: <20130924145657.GM32256@shire.ontko.com>,
|
||||
# http://lists.gnu.org/archive/html/bug-tar/2013-09/msg00045.html
|
||||
|
||||
AT_SETUP([incremental with two -C])
|
||||
AT_KEYWORDS([incremental create remove-files remfiles06])
|
||||
AT_SETUP([remove with two -C])
|
||||
AT_KEYWORDS([remove-files remfiles06])
|
||||
|
||||
AT_TAR_CHECK([
|
||||
AT_SORT_PREREQ
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
# Reported by: Nathan Stratton Treadway <nathanst@ontko.com>
|
||||
# References: <20130924185129.GO32256@shire.ontko.com>
|
||||
|
||||
AT_SETUP([incremental with -C to absolute path])
|
||||
AT_KEYWORDS([incremental create remove-files remfiles07])
|
||||
AT_SETUP([remove with -C to absolute path])
|
||||
AT_KEYWORDS([create remove-files remfiles07])
|
||||
|
||||
AT_TAR_CHECK([
|
||||
AT_SORT_PREREQ
|
||||
|
||||
48
tests/remfiles08.at
Normal file
48
tests/remfiles08.at
Normal file
@@ -0,0 +1,48 @@
|
||||
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
# Test suite for GNU tar.
|
||||
# Copyright 2013 Free Software Foundation, Inc.
|
||||
#
|
||||
# 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/>.
|
||||
|
||||
# Description: See remfiles06.at
|
||||
# Reported by: Nathan Stratton Treadway <nathanst@ontko.com>
|
||||
# References: <20130926050634.GW32256@shire.ontko.com>
|
||||
|
||||
AT_SETUP([remove with -C to absolute and relative paths])
|
||||
AT_KEYWORDS([incremental create remove-files remfiles08])
|
||||
|
||||
AT_TAR_CHECK([
|
||||
mkdir foo
|
||||
mkdir bar
|
||||
echo foo/foo_file > foo/foo_file
|
||||
echo bar/bar_file > bar/bar_file
|
||||
decho A
|
||||
tar -cvf foo.tar --remove-files -C `pwd`/foo . -C ../bar .
|
||||
decho B
|
||||
],
|
||||
[0],
|
||||
[A
|
||||
./
|
||||
./foo_file
|
||||
./
|
||||
./bar_file
|
||||
B
|
||||
.
|
||||
./foo.tar
|
||||
],
|
||||
[A
|
||||
B
|
||||
],[],[],[gnu])
|
||||
|
||||
AT_CLEANUP
|
||||
@@ -382,6 +382,7 @@ m4_include([remfiles04.at])
|
||||
m4_include([remfiles05.at])
|
||||
m4_include([remfiles06.at])
|
||||
m4_include([remfiles07.at])
|
||||
m4_include([remfiles08.at])
|
||||
|
||||
AT_BANNER([Extended attributes])
|
||||
m4_include([xattr01.at])
|
||||
|
||||
Reference in New Issue
Block a user