Archives
/
pixz
mirror of https://github.com/vasi/pixz
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set uoffset even when streaming

Browse Source
pull/16/head
Dave Vasilevsky 12 years ago
parent fb8bc15f43
commit 61d6353e07
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File

17
read.c
Unescape Escape View File

@ -77,8 +77,8 @@ static void rbuf_consume(size_t bytes);
static void rbuf_dispatch(void); 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, off_t uoffset);
static void read_streaming(lzma_block *block, block_type sized); static void read_streaming(lzma_block *block, block_type sized, off_t uoffset);
static void read_index(void); static void read_index(void);
static void read_footer(void); static void read_footer(void);
@ -361,7 +361,7 @@ static bool read_header(lzma_check *check) {
return true; return true;
} }
static bool read_block(bool force_stream, lzma_check check) { static bool read_block(bool force_stream, lzma_check check, off_t uoffset) {
lzma_filter filters[LZMA_FILTERS_MAX + 1]; lzma_filter filters[LZMA_FILTERS_MAX + 1];
lzma_block block = { .filters = filters, .check = check, .version = 0 }; lzma_block block = { .filters = filters, .check = check, .version = 0 };
@ -381,7 +381,7 @@ static bool read_block(bool force_stream, lzma_check check) {
size_t comp = block.compressed_size, outsize = block.uncompressed_size; size_t comp = block.compressed_size, outsize = block.uncompressed_size;
bool sized = (comp != LZMA_VLI_UNKNOWN && outsize != LZMA_VLI_UNKNOWN); bool sized = (comp != LZMA_VLI_UNKNOWN && outsize != LZMA_VLI_UNKNOWN);
if (force_stream || !sized || outsize > MAXSPLITSIZE) { if (force_stream || !sized || outsize > MAXSPLITSIZE) {
read_streaming(&block, sized ? BLOCK_SIZED : BLOCK_UNSIZED); read_streaming(&block, sized ? BLOCK_SIZED : BLOCK_UNSIZED, uoffset);
} else { } else {
block_capacity(gRbuf, 0, outsize); block_capacity(gRbuf, 0, outsize);
gRbuf->outsize = outsize; gRbuf->outsize = outsize;
@ -395,7 +395,7 @@ static bool read_block(bool force_stream, lzma_check check) {
return true; return true;
} }
static void read_streaming(lzma_block *block, block_type sized) { static void read_streaming(lzma_block *block, block_type sized, off_t uoffset) {
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");
@ -414,6 +414,8 @@ static void read_streaming(lzma_block *block, block_type sized) {
if (stream.avail_out == 0) { if (stream.avail_out == 0) {
if (ib) { if (ib) {
ib->outsize = ib->outcap; ib->outsize = ib->outcap;
ib->uoffset = uoffset;
uoffset += ib->outsize;
pipeline_dispatch(pi, gPipelineMergeQ); pipeline_dispatch(pi, gPipelineMergeQ);
first = false; first = false;
} }
@ -483,7 +485,7 @@ static void read_thread_noindex(void) {
lzma_check check = LZMA_CHECK_NONE; lzma_check check = LZMA_CHECK_NONE;
while (read_header(&check)) { while (read_header(&check)) {
empty = false; empty = false;
while (read_block(false, check)) while (read_block(false, check, 0))
; // pass ; // pass
read_index(); read_index();
read_footer(); read_footer();
@ -527,7 +529,8 @@ static void read_thread(void) {
if (iter.block.uncompressed_size > MAXSPLITSIZE) { // must stream if (iter.block.uncompressed_size > MAXSPLITSIZE) { // must stream
if (gRbuf) if (gRbuf)
rbuf_consume(gRbuf->insize); // clear rbuf_consume(gRbuf->insize); // clear
read_block(true, iter.stream.flags->check); read_block(true, iter.stream.flags->check,
iter.block.uncompressed_file_offset);
} else { } else {
// Get a block to work with // Get a block to work with
pipeline_item_t *pi; pipeline_item_t *pi;

Write Preview
Loading…
Cancel
Save