summaryrefslogtreecommitdiff
path: root/src/delete.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2022-09-03 18:22:34 -0500
committerPaul Eggert <eggert@cs.ucla.edu>2022-09-03 18:23:11 -0500
commitbc277c7069cdebb6a6140326636555267b142e0e (patch)
tree73707e333fa7d181ad86f1fa2d97fac6e1031811 /src/delete.c
parentf8e14746d2ca72804a4520c059d7bf65ca00c5ac (diff)
downloadtar-bc277c7069cdebb6a6140326636555267b142e0e.tar.gz
Fix data loss when acting as filter
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.
Diffstat (limited to 'src/delete.c')
-rw-r--r--src/delete.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/delete.c b/src/delete.c
index 3bee5c65..dd6bc213 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -183,13 +183,13 @@ delete_archive_members (void)
case HEADER_SUCCESS:
if ((name = name_scan (current_stat_info.file_name)) == NULL)
{
- skip_member ();
+ skim_member (acting_as_filter);
break;
}
name->found_count++;
if (!ISFOUND (name))
{
- skip_member ();
+ skim_member (acting_as_filter);
break;
}
FALLTHROUGH;