This bug was introduced by the recent lseek-related changes. * src/delete.c (delete_archive_members): * src/update.c (update_archive): Copy the member if acting as a filter, rather than lseeking over it, which is possible if stdin is a regular file. * src/list.c (skim_file, skim_member): * src/sparse.c (sparse_skim_file): New functions, for copying when a filter. * src/list.c (skip_file): Remove; replaced with skim_file. All callers changed. (skip_member): Reimplement in terms of skim_member. * src/sparse.c (sparse_skip_file): Remove; replaced with sparse_skim_file. All callers changed. * src/update.c (acting_as_filter): New static var. (update_archive): Set it; this is like delete.c. * tests/delete01.at (deleting a member after a big one): * tests/delete02.at (deleting a member from stdin archive): Also test filter case.
47 lines
1.2 KiB
Plaintext
47 lines
1.2 KiB
Plaintext
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
|
|
|
# Test suite for GNU tar.
|
|
# Copyright 2004-2022 Free Software Foundation, Inc.
|
|
|
|
# This file is part of GNU tar.
|
|
|
|
# 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/>.
|
|
|
|
# Deleting a member with the archive from stdin was not working correctly.
|
|
|
|
AT_SETUP([deleting a member from stdin archive])
|
|
AT_KEYWORDS([delete delete02])
|
|
|
|
AT_TAR_CHECK([
|
|
genfile -l 3073 -p zeros --file 1
|
|
cp 1 2
|
|
cp 2 3
|
|
tar cf archive 1 2 3
|
|
tar tf archive
|
|
cat archive | tar f - --delete 2 > archive2
|
|
echo separator
|
|
tar tf archive2
|
|
tar f - --delete 2 < archive > archive3
|
|
cmp archive2 archive3],
|
|
[0],
|
|
[1
|
|
2
|
|
3
|
|
separator
|
|
1
|
|
3
|
|
])
|
|
|
|
AT_CLEANUP
|