diff options
author | Yann Collet <yann.collet.73@gmail.com> | 2015-04-13 19:03:51 (GMT) |
---|---|---|
committer | Yann Collet <yann.collet.73@gmail.com> | 2015-04-13 19:03:51 (GMT) |
commit | ccba7a0a29f00728e5fa87855d9e56ec86d3c5be (patch) | |
tree | 2b47e0a8ddac4d2866b7462c78adb8a4f427c675 /programs/lz4cli.c | |
parent | bc28fc1a0df8de9e9ec847430dae5873dac7a4d5 (diff) | |
parent | 7f2f1fcd5541976e79026ba00465f54b41ae29c2 (diff) | |
download | lz4-ccba7a0a29f00728e5fa87855d9e56ec86d3c5be.zip lz4-ccba7a0a29f00728e5fa87855d9e56ec86d3c5be.tar.gz lz4-ccba7a0a29f00728e5fa87855d9e56ec86d3c5be.tar.bz2 |
Merge pull request #86 from KyleJHarper/origin/r129/multiple_inputs_patch
Origin/r129/multiple inputs patch
Diffstat (limited to 'programs/lz4cli.c')
-rw-r--r-- | programs/lz4cli.c | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/programs/lz4cli.c b/programs/lz4cli.c index 7ed0f30..ffc54c0 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -265,7 +265,8 @@ int main(int argc, char** argv) forceStdout=0, forceCompress=0, main_pause=0, - multiple_inputs=0; + multiple_inputs=0, + multiple_rv=0; const char* input_filename=0; const char* output_filename=0; char* dynNameSpace=0; @@ -524,26 +525,33 @@ int main(int argc, char** argv) /* IO Stream/File */ LZ4IO_setNotificationLevel(displayLevel); - if (decode) DEFAULT_DECOMPRESSOR(input_filename, output_filename); + if (decode) + { + if (multiple_inputs) + multiple_rv = LZ4IO_decompressMultipleFilenames(inFileNames, ifnIdx, LZ4_EXTENSION); + else + DEFAULT_DECOMPRESSOR(input_filename, output_filename); + } else { - /* compression is default action */ - if (legacy_format) - { - DISPLAYLEVEL(3, "! Generating compressed LZ4 using Legacy format (deprecated) ! \n"); - LZ4IO_compressFilename_Legacy(input_filename, output_filename, cLevel); - } + /* compression is default action */ + if (legacy_format) + { + DISPLAYLEVEL(3, "! Generating compressed LZ4 using Legacy format (deprecated) ! \n"); + LZ4IO_compressFilename_Legacy(input_filename, output_filename, cLevel); + } + else + { + if (multiple_inputs) + multiple_rv = LZ4IO_compressMultipleFilenames(inFileNames, ifnIdx, LZ4_EXTENSION, cLevel); else - { - if (multiple_inputs) - LZ4IO_compressMultipleFilenames(inFileNames, ifnIdx, LZ4_EXTENSION, cLevel); - else - DEFAULT_COMPRESSOR(input_filename, output_filename, cLevel); - } + DEFAULT_COMPRESSOR(input_filename, output_filename, cLevel); + } } if (main_pause) waitEnter(); free(dynNameSpace); free((void*)inFileNames); + if (multiple_rv != 0) return multiple_rv; return 0; } |