Archives/pixz
2
0
Fork 0
mirror of https://github.com/vasi/pixz synced 2024-11-18 15:26:46 +00:00
Code Issues Projects Releases Wiki Activity

Detect file index even when giant blocks are present earlier

Browse Source
This commit is contained in:
Dave Vasilevsky 2013-01-26 18:09:47 -05:00
parent aa5206b42b
commit fb8bc15f43
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
read.c
View File

@ -78,7 +78,7 @@ static void rbuf_dispatch(void);
static bool read_header(lzma_check *check); static bool read_header(lzma_check *check);
static bool read_block(bool force_stream, lzma_check check); static bool read_block(bool force_stream, lzma_check check);
static void read_streaming(lzma_block *block); static void read_streaming(lzma_block *block, block_type sized);
static void read_index(void); static void read_index(void);
static void read_footer(void); static void read_footer(void);
@ -178,7 +178,7 @@ void pixz_read(bool verify, size_t nspecs, char **specs) {
tar = taste_tar(ib); tar = taste_tar(ib);
start = false; start = false;
} }
if (ib->btype != BLOCK_SIZED) if (ib->btype == BLOCK_UNSIZED)
all_sized = false; all_sized = false;
if (!skipping) if (!skipping)
@ -379,10 +379,9 @@ static bool read_block(bool force_stream, lzma_check check) {
die("Error decoding block header"); die("Error decoding block header");
size_t comp = block.compressed_size, outsize = block.uncompressed_size; size_t comp = block.compressed_size, outsize = block.uncompressed_size;
if (force_stream || comp == LZMA_VLI_UNKNOWN bool sized = (comp != LZMA_VLI_UNKNOWN && outsize != LZMA_VLI_UNKNOWN);
|| outsize == LZMA_VLI_UNKNOWN if (force_stream || !sized || outsize > MAXSPLITSIZE) {
|| outsize > MAXSPLITSIZE) { read_streaming(&block, sized ? BLOCK_SIZED : BLOCK_UNSIZED);
read_streaming(&block);
} else { } else {
block_capacity(gRbuf, 0, outsize); block_capacity(gRbuf, 0, outsize);
gRbuf->outsize = outsize; gRbuf->outsize = outsize;
@ -396,7 +395,7 @@ static bool read_block(bool force_stream, lzma_check check) {
return true; return true;
} }
static void read_streaming(lzma_block *block) { static void read_streaming(lzma_block *block, block_type sized) {
lzma_stream stream = LZMA_STREAM_INIT; lzma_stream stream = LZMA_STREAM_INIT;
if (lzma_block_decoder(&stream, block) != LZMA_OK) if (lzma_block_decoder(&stream, block) != LZMA_OK)
die("Error initializing streaming block decode"); die("Error initializing streaming block decode");
@ -420,7 +419,7 @@ static void read_streaming(lzma_block *block) {
} }
queue_pop(gPipelineStartQ, (void**)&pi); queue_pop(gPipelineStartQ, (void**)&pi);
ib = (io_block_t*)pi->data; ib = (io_block_t*)pi->data;
ib->btype = (first ? BLOCK_UNSIZED : BLOCK_CONTINUATION); ib->btype = (first ? sized : BLOCK_CONTINUATION);
block_capacity(ib, 0, STREAMSIZE); block_capacity(ib, 0, STREAMSIZE);
stream.next_out = ib->output; stream.next_out = ib->output;
stream.avail_out = ib->outcap; stream.avail_out = ib->outcap;