Archives/pixz
2
0
Fork 0
mirror of https://github.com/vasi/pixz synced 2024-10-30 15:21:41 +00:00
Code Issues Projects Releases Wiki Activity

More file-index skipping fixes

Browse Source 
Don't detect file-index on multi-stream files, that usage is not supported.

Handle multi-stream files correctly when using heuristic skipping.
This commit is contained in:
Dave Vasilevsky 2012-11-10 00:00:35 -05:00
parent 14f5644bd8
commit 267e538c5e
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common.c
View File

@ -120,6 +120,9 @@ static lzma_vli find_file_index(void **bdatap) {
lzma_vli loc = lzma_index_uncompressed_size(gIndex) - 1;
if (lzma_index_iter_locate(&iter, loc))
die("Can't locate file index block");
if (iter.stream.number != 1)
return 0; // Too many streams for one file index
void *bdata = decode_file_index_start(iter.block.compressed_file_offset,
iter.stream.flags->check);

26
read.c
View File

@ -106,7 +106,6 @@ void pixz_read(bool verify, size_t nspecs, char **specs) {
debug("want: %s", w->name);
#endif
bool first = true;
pipeline_create(block_create, block_free,
gIndex ? read_thread : read_thread_noindex, decode_thread);
if (verify && gFileIndexOffset) {
@ -155,27 +154,30 @@ void pixz_read(bool verify, size_t nspecs, char **specs) {
if (w && w->name)
die("File %s missing in archive", w->name);
tar_write_last(); // write whatever's left
first = false;
}
if (!gExplicitFiles) {
bool tar = false;
bool all_sized = true;
bool skipping = false;
/* Heuristics for detecting pixz file index:
* - Input must be streaming (otherwise read_thread does this)
* - Data must look tar-like
* - Must have all sized blocks, followed by unsized file index */
bool start = !gIndex && verify,
tar = false, all_sized = true, skipping = false;
pipeline_item_t *pi;
while ((pi = pipeline_merged())) {
io_block_t *ib = (io_block_t*)(pi->data);
if (first) {
tar = taste_tar(ib);
first = false;
}
if (skipping && ib->btype != BLOCK_CONTINUATION) {
die("File index heuristic failed, retry with -t flag");
fprintf(stderr,
"Warning: File index heuristic failed, use -t flag.\n");
skipping = false;
}
if (verify && !skipping && !first && tar && all_sized
if (!skipping && tar && !start && all_sized
&& ib->btype == BLOCK_UNSIZED && taste_file_index(ib))
skipping = true;
if (start) {
tar = taste_tar(ib);
start = false;
}
if (ib->btype != BLOCK_SIZED)
all_sized = false;
@ -541,7 +543,7 @@ static void read_thread(void) {
offset += bsize;
ib->uoffset = iter.block.uncompressed_file_offset;
ib->check = iter.stream.flags->check;
ib->btype = BLOCK_SIZED;
ib->btype = BLOCK_SIZED; // Indexed blocks always sized
pipeline_split(pi);
}