root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Command line tool fixes

This commit is contained in:
Lasse Collin 2008-09-02 19:33:32 +03:00
parent bab0590504
commit 9c75b089b4
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lzma/process.c
View File

@ -194,6 +194,7 @@ single(thread_data *t)
uint8_t in_buf[BUFSIZ]; uint8_t in_buf[BUFSIZ];
uint8_t out_buf[BUFSIZ]; uint8_t out_buf[BUFSIZ];
lzma_action action = LZMA_RUN; lzma_action action = LZMA_RUN;
lzma_ret ret;
bool success = false; bool success = false;
t->strm.avail_in = 0; t->strm.avail_in = 0;
@ -212,7 +213,7 @@ single(thread_data *t)
action = LZMA_FINISH; action = LZMA_FINISH;
} }
const lzma_ret ret = lzma_code(&t->strm, action); ret = lzma_code(&t->strm, action);
if ((t->strm.avail_out == 0 || ret != LZMA_OK) if ((t->strm.avail_out == 0 || ret != LZMA_OK)
&& opt_mode != MODE_TEST) { && opt_mode != MODE_TEST) {
@ -225,17 +226,21 @@ single(thread_data *t)
} }
if (ret != LZMA_OK) { if (ret != LZMA_OK) {
if (ret == LZMA_STREAM_END) { // Check that there is no trailing garbage. This is
// FIXME !!! This doesn't work when decoding // needed for LZMA_Alone and raw streams.
// LZMA_Alone files, because LZMA_Alone decoder if (ret == LZMA_STREAM_END && (t->strm.avail_in != 0
// doesn't wait for LZMA_FINISH. || (!t->pair->src_eof && io_read(
assert(t->pair->src_eof); t->pair, in_buf, 1) != 0)))
success = true; ret = LZMA_DATA_ERROR;
} else {
if (ret != LZMA_STREAM_END) {
errmsg(V_ERROR, "%s: %s", t->pair->src_name, errmsg(V_ERROR, "%s: %s", t->pair->src_name,
str_strm_error(ret)); str_strm_error(ret));
break;
} }
assert(t->pair->src_eof);
success = true;
break; break;
} }
} }