Fix extraction from concatenated incremental archives.

* src/common.h (remove_delayed_set_stat): New proto.
* src/extract.c (free_delayed_set_stat)
(remove_delayed_set_stat): New function.
(apply_nonancestor_delayed_set_stat): Use free_delayed_set_stat.
* src/misc.c (safer_rmdir): Remove delayed_set_stat entry
corresponding to the removed directory.
* tests/incr10.at: New test case.
* tests/Makefile.am: Add new test.
* tests/testsuite.at: Likewise.
This commit is contained in:
Sergey Poznyakoff
2015-04-16 13:02:10 +03:00
parent 0c4aa85e6c
commit 15c02c2b9d
6 changed files with 107 additions and 6 deletions

View File

@@ -116,6 +116,7 @@ TESTSUITE_AT = \
incr07.at\
incr08.at\
incr09.at\
incr10.at\
indexfile.at\
ignfail.at\
iotty.at\

64
tests/incr10.at Normal file
View File

@@ -0,0 +1,64 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
# Copyright 2015 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/>.
AT_SETUP([concatenated incremental archives])
AT_KEYWORDS([incremental concat cat incr10])
# Description: Extraction from concatenated incremental archives
# produced spurious error messages when trying to set file ownership
# and permissions on deleted directories.
# Reported by: Alex Efros <powerman@powerman.name>
# References: <20150411224008.GO24600@home.power>
# http://lists.gnu.org/archive/html/bug-tar/2015-04/msg00003.html
AT_TAR_CHECK([
mkdir in
mkdir in/dir
decho Level 0
tar -cvf 1.tar -g snap -C in .
rmdir in/dir
decho Level 1
tar -cvf 2.tar -g snap -C in .
cp 1.tar full.tar
decho Concat
tar -A 2.tar -f full.tar -g /dev/null
decho Extract
mkdir out
tar -xvf full.tar -g /dev/null -C out
],
[0],
[Level 0
./
./dir/
Level 1
./
Concat
Extract
./
./dir/
./
tar: Deleting './dir'
],
[Level 0
tar: .: Directory is new
tar: ./dir: Directory is new
Level 1
Concat
Extract
],[],[],[gnu])
AT_CLEANUP

View File

@@ -303,6 +303,7 @@ m4_include([incr06.at])
m4_include([incr07.at])
m4_include([incr08.at])
m4_include([incr09.at])
m4_include([incr10.at])
AT_BANNER([Files removed while archiving])
m4_include([filerem01.at])