diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2022-09-03 18:22:34 -0500 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-09-03 18:23:11 -0500 |
| commit | bc277c7069cdebb6a6140326636555267b142e0e (patch) | |
| tree | 73707e333fa7d181ad86f1fa2d97fac6e1031811 /tests | |
| parent | f8e14746d2ca72804a4520c059d7bf65ca00c5ac (diff) | |
| download | tar-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 'tests')
| -rw-r--r-- | tests/delete01.at | 4 | ||||
| -rw-r--r-- | tests/delete02.at | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/delete01.at b/tests/delete01.at index f323975e..251b5497 100644 --- a/tests/delete01.at +++ b/tests/delete01.at @@ -27,8 +27,10 @@ AT_TAR_CHECK([ genfile -l 50000 --file file1 genfile -l 1024 --file file2 tar cf archive file1 file2 +tar -f - --delete file2 <archive >archout +tar tf archout tar f archive --delete file2 -tar tf archive], +cmp archive archout], [0], [file1 ]) diff --git a/tests/delete02.at b/tests/delete02.at index 694c85d7..a21cd6d4 100644 --- a/tests/delete02.at +++ b/tests/delete02.at @@ -31,7 +31,9 @@ tar cf archive 1 2 3 tar tf archive cat archive | tar f - --delete 2 > archive2 echo separator -tar tf archive2], +tar tf archive2 +tar f - --delete 2 < archive > archive3 +cmp archive2 archive3], [0], [1 2 |