diff options
| author | gabrielstedman <gabriel.stedman@zynstra.com> | 2019-05-25 18:57:04 (GMT) |
|---|---|---|
| committer | gabrielstedman <gabriel.stedman@zynstra.com> | 2019-05-26 14:04:45 (GMT) |
| commit | 729eef61a12d381f436da180329dba74b9892aa4 (patch) | |
| tree | 98d4b0ae6322368f86b497628cd81c17ee353d23 | |
| parent | 2037af134623b85e14e3f4ef72d7457c4f6d69f3 (diff) | |
| download | lz4-729eef61a12d381f436da180329dba74b9892aa4.zip lz4-729eef61a12d381f436da180329dba74b9892aa4.tar.gz lz4-729eef61a12d381f436da180329dba74b9892aa4.tar.bz2 | |
Handle file not existing case #704
| -rw-r--r-- | programs/lz4cli.c | 13 | ||||
| -rw-r--r-- | tests/Makefile | 1 |
2 files changed, 11 insertions, 3 deletions
diff --git a/programs/lz4cli.c b/programs/lz4cli.c index c83b4cc..3619cd5 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -648,9 +648,16 @@ int main(int argc, const char** argv) DISPLAYLEVEL(1, "refusing to read from a console\n"); exit(1); } - /* if input==stdin and no output defined, stdout becomes default output */ - if (!strcmp(input_filename, stdinmark) && !output_filename) - output_filename = stdoutmark; + if (!strcmp(input_filename, stdinmark)) { + /* if input==stdin and no output defined, stdout becomes default output */ + if (!output_filename) output_filename = stdoutmark; + } + else{ + if (!recursive && !UTIL_isRegFile(input_filename)) { + DISPLAYLEVEL(1, "%s: is not a regular file \n", input_filename); + exit(1); + } + } /* No output filename ==> try to select one automatically (when possible) */ while ((!output_filename) && (multiple_inputs==0)) { diff --git a/tests/Makefile b/tests/Makefile index a38031a..65713ef 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -376,6 +376,7 @@ test-lz4-testmode: lz4 datagen @echo "\n ---- non-existing source ----" ! $(LZ4) file-does-not-exist ! $(LZ4) -f file-does-not-exist + ! $(LZ4) -t file-does-not-exist ! $(LZ4) -fm file1-dne file2-dne @$(RM) tmp-tlt tmp-tlt1 tmp-tlt2 tmp-tlt2.lz4 |