mirror of
https://git.savannah.gnu.org/git/tar.git
synced 2026-09-06 00:06:54 +00:00
Fix bugs in handling the --remove-files option.
Make sure the files are deleted only if they were succesfully stored to the archive. * src/exit.c: New file. * src/unlink.c: New file. * src/Makefile.am (tar_SOURCES): Add exit.c and unlink.c. * src/common.h: Include progname.h (program_name): Remove global. (records_written): New extern. (queue_deferred_unlink, finish_deferred_unlinks): New prototypes. (fatal_exit_hook): New extern. * src/create.c (create_archive): Call finish_deferred_unlinks. (dump_hard_link, dump_file0): Don't actually unlink the file, queue it to deferred_unlinks instead. * src/delete.c (records_written): Remove extern: declared in common.h. * src/extract.c (extract_archive): Set fatal_exit_hook. (fatal_exit, xalloc_die): Move to exit.c * src/system.c (sys_wait_for_child): Exit immediately if the child dies or exits with a non-zero status. (sys_child_open_for_compress) (sys_child_open_for_uncompress): Use set_program_name, instead of setting program_name directly. * src/tar.c (main): Use set_program_name, instead of setting program_name directly. * tests/Makefile.am (TESTSUITE_AT): Add remfiles01.at and remfiles02.at. * tests/testsuite.at: Likewise. * tests/gzip.at: Reflect the above changes.
This commit is contained in:
@@ -113,6 +113,8 @@ TESTSUITE_AT = \
|
||||
rename03.at\
|
||||
rename04.at\
|
||||
rename05.at\
|
||||
remfiles01.at\
|
||||
remfiles02.at\
|
||||
same-order01.at\
|
||||
same-order02.at\
|
||||
shortfile.at\
|
||||
|
||||
+3
-4
@@ -1,7 +1,7 @@
|
||||
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
|
||||
# Test suite for GNU tar.
|
||||
# Copyright (C) 2004, 2007 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2004, 2007, 2009 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
|
||||
@@ -28,14 +28,13 @@ unset TAR_OPTIONS
|
||||
AT_CHECK([
|
||||
AT_GZIP_PREREQ
|
||||
tar xfvz /dev/null
|
||||
test $? = 2 || exit 1
|
||||
],
|
||||
[0],
|
||||
[2],
|
||||
[],
|
||||
[
|
||||
gzip: stdin: unexpected end of file
|
||||
tar: Child returned status 1
|
||||
tar: Exiting with failure status due to previous errors
|
||||
tar: Error is not recoverable: exiting now
|
||||
],
|
||||
[],[])
|
||||
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
|
||||
# Test suite for GNU tar.
|
||||
# Copyright (C) 2009 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, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
# 02110-1301, USA.
|
||||
|
||||
# Description: When called with --create --remove-files and a compression
|
||||
# options tar (v. <= 1.22.90) would remove files even if it had failed
|
||||
# to store them in the archive.
|
||||
#
|
||||
# References: <77cb99c00910020940k6ce15da4wb564d2418ec52cfb@mail.gmail.com>
|
||||
# http://lists.gnu.org/archive/html/bug-tar/2009-10/msg00005.html
|
||||
|
||||
AT_SETUP([remove-files with compression])
|
||||
AT_KEYWORDS([create remove-files remfiles01 gzip])
|
||||
|
||||
unset TAR_OPTIONS
|
||||
AT_CHECK([
|
||||
AT_GZIP_PREREQ
|
||||
AT_SORT_PREREQ
|
||||
|
||||
mkdir dir
|
||||
cd dir
|
||||
genfile --file a --length 0
|
||||
chmod 0 a
|
||||
genfile --file b
|
||||
mkdir c
|
||||
|
||||
tar -c -f a -z --remove-files b c
|
||||
|
||||
find . | sort
|
||||
],
|
||||
[0],
|
||||
[.
|
||||
./a
|
||||
./b
|
||||
./c
|
||||
],
|
||||
[tar (child): a: Cannot open: Permission denied
|
||||
tar (child): Error is not recoverable: exiting now
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
@@ -0,0 +1,58 @@
|
||||
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
|
||||
# Test suite for GNU tar.
|
||||
# Copyright (C) 2009 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, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
# 02110-1301, USA.
|
||||
|
||||
# Description: When called with --create --remove-files and a compression
|
||||
# options tar (v. <= 1.22.90) would remove files even if it had failed
|
||||
# to store them in the archive.
|
||||
#
|
||||
# References: <77cb99c00910020940k6ce15da4wb564d2418ec52cfb@mail.gmail.com>
|
||||
# http://lists.gnu.org/archive/html/bug-tar/2009-10/msg00005.html
|
||||
|
||||
AT_SETUP([remove-files with compression: grand-child])
|
||||
AT_KEYWORDS([create remove-files remfiles02 gzip])
|
||||
|
||||
unset TAR_OPTIONS
|
||||
AT_CHECK([
|
||||
AT_GZIP_PREREQ
|
||||
AT_SORT_PREREQ
|
||||
|
||||
mkdir dir
|
||||
cd dir
|
||||
mkdir a
|
||||
genfile --file b
|
||||
mkdir c
|
||||
|
||||
tar -c -f a -z --remove-files b c
|
||||
|
||||
find . | sort
|
||||
],
|
||||
[0],
|
||||
[.
|
||||
./a
|
||||
./b
|
||||
./c
|
||||
],
|
||||
[tar (child): a: Cannot open: Is a directory
|
||||
tar (child): Error is not recoverable: exiting now
|
||||
tar: Child returned status 2
|
||||
tar: Error is not recoverable: exiting now
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
@@ -218,6 +218,9 @@ m4_include([shortupd.at])
|
||||
m4_include([truncate.at])
|
||||
m4_include([grow.at])
|
||||
|
||||
m4_include([remfiles01.at])
|
||||
m4_include([remfiles02.at])
|
||||
|
||||
m4_include([star/gtarfail.at])
|
||||
m4_include([star/gtarfail2.at])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user