7a5a3708cb
The regression was introduced by 8f390db9. This patch implements additional
option --skip-old-files, which silently skips members which would cause
writing over existing files, and restores --keep-old-files to its traditional
behavior.
* NEWS: Update.
* configure.ac: Update.
* doc/tar.texi: Document the changes.
* src/common.h (SKIP_OLD_FILES): New old_files mode.
* src/extract.c (maybe_recoverable): Restore KEEP_OLD_FILES behavior.
Handle SKIP_OLD_FILES.
* src/tar.c: New option --skip-old-files.
* tests/extrac18.at: New file.
* tests/extrac19.at: New file.
* tests/Makefile.am: Add new test cases.
* tests/testsuite.at: Likewise.
61 lines
1.7 KiB
Plaintext
61 lines
1.7 KiB
Plaintext
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
|
#
|
|
# Test suite for GNU tar.
|
|
# Copyright (C) 2011 Free Software Foundation, Inc.
|
|
#
|
|
# This program 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, or (at your option)
|
|
# any later version.
|
|
#
|
|
# This program 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: Check the functionality of the --keep-old-files option.
|
|
# It should report an error and cause tar to exit with status 2.
|
|
#
|
|
# There was a regression in versions 1.23 to 1.26 inclusive, where
|
|
# this option silently skipped such files.
|
|
# Reported by: Doug McLaren <dougmc@frenzied.us>,
|
|
# Gary Partis <gary@partis.co.uk>,
|
|
# Jim Meyering <jim@meyering.net>
|
|
#
|
|
# References: <20111117045433.GA8245@algol.frenzied.us>,
|
|
# <4F3D824717847C4487F77228F83329A3514CBB@server.Partis.local>,
|
|
# <87wrar6zzz.fsf@rho.meyering.net>
|
|
|
|
AT_SETUP([keep-old-files])
|
|
AT_KEYWORDS([extract extrac18 old-files keep-old-files])
|
|
|
|
AT_TAR_CHECK([
|
|
mkdir dir
|
|
cd dir
|
|
echo 'Old file a' > a
|
|
echo 'Old file b' > b
|
|
|
|
tar cf ../archive .
|
|
|
|
rm b
|
|
echo 'File a' > a
|
|
|
|
tar -x -k -f ../archive
|
|
echo status=$?
|
|
|
|
cat a
|
|
],
|
|
[0],
|
|
[status=2
|
|
File a
|
|
],
|
|
[tar: ./a: Cannot open: File exists
|
|
tar: Exiting with failure status due to previous errors
|
|
])
|
|
|
|
AT_CLEANUP
|
|
|