diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common.h | 5 | ||||
| -rw-r--r-- | src/delete.c | 4 | ||||
| -rw-r--r-- | src/extract.c | 2 | ||||
| -rw-r--r-- | src/list.c | 22 | ||||
| -rw-r--r-- | src/sparse.c | 6 | ||||
| -rw-r--r-- | src/update.c | 5 |
6 files changed, 29 insertions, 15 deletions
diff --git a/src/common.h b/src/common.h index 24166524..259655f9 100644 --- a/src/common.h +++ b/src/common.h @@ -623,8 +623,9 @@ enum read_header read_header (union block **return_block, struct tar_stat_info *info, enum read_header_mode m); enum read_header tar_checksum (union block *header, bool silent); -void skip_file (off_t size); +void skim_file (off_t size, bool must_copy); void skip_member (void); +void skim_member (bool must_copy); /* Module misc.c. */ @@ -928,7 +929,7 @@ bool sparse_fixup_header (struct tar_stat_info *st); enum dump_status sparse_dump_file (int, struct tar_stat_info *st); enum dump_status sparse_extract_file (int fd, struct tar_stat_info *st, off_t *size); -enum dump_status sparse_skip_file (struct tar_stat_info *st); +enum dump_status sparse_skim_file (struct tar_stat_info *st, bool must_copy); bool sparse_diff_file (int, struct tar_stat_info *st); /* Module utf8.c */ 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; diff --git a/src/extract.c b/src/extract.c index 7696d5e4..78de47f5 100644 --- a/src/extract.c +++ b/src/extract.c @@ -1320,7 +1320,7 @@ extract_file (char *file_name, int typeflag) } } - skip_file (size); + skim_file (size, false); mv_end (); @@ -416,7 +416,7 @@ read_header (union block **return_block, struct tar_stat_info *info, size_t next_long_name_blocks = 0; size_t next_long_link_blocks = 0; enum read_header status = HEADER_SUCCESS; - + while (1) { header = find_next_block (); @@ -1391,15 +1391,17 @@ print_for_mkdir (char *dirname, int length, mode_t mode) } } -/* Skip over SIZE bytes of data in blocks in the archive. */ +/* Skip over SIZE bytes of data in blocks in the archive. + This may involve copying the data. + If MUST_COPY, always copy instead of skipping. */ void -skip_file (off_t size) +skim_file (off_t size, bool must_copy) { union block *x; /* FIXME: Make sure mv_begin_read is always called before it */ - if (seekable_archive) + if (seekable_archive && !must_copy) { off_t nblk = seek_archive (size); if (nblk >= 0) @@ -1427,6 +1429,14 @@ skip_file (off_t size) void skip_member (void) { + skim_member (false); +} + +/* Skip the current member in the archive. + If MUST_COPY, always copy instead of skipping. */ +void +skim_member (bool must_copy) +{ if (!current_stat_info.skipped) { char save_typeflag = current_header->header.typeflag; @@ -1435,9 +1445,9 @@ skip_member (void) mv_begin_read (¤t_stat_info); if (current_stat_info.is_sparse) - sparse_skip_file (¤t_stat_info); + sparse_skim_file (¤t_stat_info, must_copy); else if (save_typeflag != DIRTYPE) - skip_file (current_stat_info.stat.st_size); + skim_file (current_stat_info.stat.st_size, must_copy); mv_end (); } diff --git a/src/sparse.c b/src/sparse.c index 0b9f250f..767793b0 100644 --- a/src/sparse.c +++ b/src/sparse.c @@ -586,7 +586,7 @@ sparse_extract_file (int fd, struct tar_stat_info *st, off_t *size) } enum dump_status -sparse_skip_file (struct tar_stat_info *st) +sparse_skim_file (struct tar_stat_info *st, bool must_copy) { bool rc = true; struct tar_sparse_file file; @@ -598,7 +598,7 @@ sparse_skip_file (struct tar_stat_info *st) file.fd = -1; rc = tar_sparse_decode_header (&file); - skip_file (file.stat_info->archive_file_size - file.dumped_size); + skim_file (file.stat_info->archive_file_size - file.dumped_size, must_copy); return (tar_sparse_done (&file) && rc) ? dump_status_ok : dump_status_short; } @@ -721,7 +721,7 @@ sparse_diff_file (int fd, struct tar_stat_info *st) } if (!rc) - skip_file (file.stat_info->archive_file_size - file.dumped_size); + skim_file (file.stat_info->archive_file_size - file.dumped_size, false); mv_end (); tar_sparse_done (&file); diff --git a/src/update.c b/src/update.c index eece0365..5424e2ce 100644 --- a/src/update.c +++ b/src/update.c @@ -42,6 +42,8 @@ bool time_to_start_writing; first part of the record. */ char *output_start; +static bool acting_as_filter; + /* Catenate file FILE_NAME to the archive without creating a header for it. It had better be a tar file or the archive is screwed. */ static void @@ -110,6 +112,7 @@ update_archive (void) name_gather (); open_archive (ACCESS_UPDATE); + acting_as_filter = strcmp (archive_name_array[0], "-") == 0; xheader_forbid_global (); while (!found_end) @@ -166,7 +169,7 @@ update_archive (void) } } - skip_member (); + skim_member (acting_as_filter); break; } |