mirror of
https://git.savannah.gnu.org/git/tar.git
synced 2026-09-26 01:54:14 +00:00
Fix extraction from concatenated incremental archives with renamed directories.
Complements 15c02c2b.
* src/extract.c (delayed_set_stat): Change type of file_name.
(delay_set_stat): Allocate file_name member.
(free_delayed_set_stat): Free file_name.
(fixup_delayed_set_stat): New function.
(rename_directory): Call fixup_delayed_set_stat on success.
* tests/incr11.at: New testcase.
* tests/incr10.at: Improve description.
* tests/Makefile.am: Add incr11.at
* tests/testsuite.at: Add incr11.at
This commit is contained in:
@@ -118,6 +118,7 @@ TESTSUITE_AT = \
|
||||
incr08.at\
|
||||
incr09.at\
|
||||
incr10.at\
|
||||
incr11.at\
|
||||
indexfile.at\
|
||||
ignfail.at\
|
||||
iotty.at\
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
# 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_SETUP([concatenated incremental archives (deletes)])
|
||||
AT_KEYWORDS([incremental concat cat incr10])
|
||||
|
||||
# Description: Extraction from concatenated incremental archives
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
# 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/>.
|
||||
|
||||
# Description: Extraction from concatenated incremental archives
|
||||
# produced spurious error messages when trying to set file ownership
|
||||
# and permissions on renamed directories
|
||||
# Reported by: Alex Efros <powerman@powerman.name>
|
||||
# References: <20151129094003.GD18347@home.power>
|
||||
# http://lists.gnu.org/archive/html/bug-tar/2015-11/msg00033.html
|
||||
|
||||
AT_SETUP([concatenated incremental archives (renames)])
|
||||
AT_KEYWORDS([incremental concat cat incr11])
|
||||
|
||||
AT_TAR_CHECK([
|
||||
AT_SORT_PREREQ
|
||||
AT_TAR_MKHIER([data/dir],[file])
|
||||
decho Level 0
|
||||
tar -cvf full.tar -g snap -C data .
|
||||
decho Level 1
|
||||
mv data/dir data/dir2
|
||||
tar -cvf incr.tar -g snap -C data .
|
||||
decho Concat
|
||||
cp full.tar full2.tar
|
||||
tar -A -f full2.tar incr.tar
|
||||
decho Extract
|
||||
mkdir out
|
||||
tar -xvf full2.tar -g /dev/null -C out
|
||||
decho List
|
||||
find out | sort
|
||||
],
|
||||
[0],
|
||||
[Level 0
|
||||
./
|
||||
./dir/
|
||||
./dir/file
|
||||
Level 1
|
||||
./
|
||||
./dir2/
|
||||
Concat
|
||||
Extract
|
||||
./
|
||||
./dir/
|
||||
./dir/file
|
||||
./
|
||||
./dir2/
|
||||
List
|
||||
out
|
||||
out/dir2
|
||||
out/dir2/file
|
||||
],
|
||||
[Level 0
|
||||
tar: .: Directory is new
|
||||
tar: ./dir: Directory is new
|
||||
Level 1
|
||||
tar: ./dir2: Directory has been renamed from './dir'
|
||||
Concat
|
||||
Extract
|
||||
List
|
||||
],[],[],[gnu])
|
||||
|
||||
AT_CLEANUP
|
||||
@@ -305,6 +305,7 @@ m4_include([incr07.at])
|
||||
m4_include([incr08.at])
|
||||
m4_include([incr09.at])
|
||||
m4_include([incr10.at])
|
||||
m4_include([incr11.at])
|
||||
|
||||
AT_BANNER([Files removed while archiving])
|
||||
m4_include([filerem01.at])
|
||||
|
||||
Reference in New Issue
Block a user