summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2015-10-16 12:25:52 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2015-10-16 12:25:52 (GMT)
commit2df6025686ae6ce605fb7cf8b63a1d7ee4be0218 (patch)
tree3149a67720acb84163a2b060f903ae597f37da91
parent7d4575e5493251b568e05c2a91fca3442629ff72 (diff)
parent012ab2f5297bec68602ce1f4b5739beb5b99673e (diff)
downloadlz4-2df6025686ae6ce605fb7cf8b63a1d7ee4be0218.zip
lz4-2df6025686ae6ce605fb7cf8b63a1d7ee4be0218.tar.gz
lz4-2df6025686ae6ce605fb7cf8b63a1d7ee4be0218.tar.bz2
Merge branch 'dev' of github.com:Cyan4973/lz4 into dev
-rw-r--r--programs/lz4cli.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/programs/lz4cli.c b/programs/lz4cli.c
index 0b2ff0e..505191b 100644
--- a/programs/lz4cli.c
+++ b/programs/lz4cli.c
@@ -490,7 +490,11 @@ int main(int argc, char** argv)
if(!input_filename) { input_filename=stdinmark; }
/* Check if input is defined as console; trigger an error in this case */
- if (!strcmp(input_filename, stdinmark) && IS_CONSOLE(stdin) ) badusage();
+ if (!strcmp(input_filename, stdinmark) && IS_CONSOLE(stdin) )
+ {
+ DISPLAYLEVEL(1, "refusing to read from a console\n");
+ exit(1);
+ }
/* Check if benchmark is selected */
if (bench)
@@ -536,7 +540,11 @@ int main(int argc, char** argv)
}
/* Check if output is defined as console; trigger an error in this case */
- if (!strcmp(output_filename,stdoutmark) && IS_CONSOLE(stdout) && !forceStdout) badusage();
+ if (!strcmp(output_filename,stdoutmark) && IS_CONSOLE(stdout) && !forceStdout)
+ {
+ DISPLAYLEVEL(1, "refusing to write to console without -c\n");
+ exit(1);
+ }
/* Downgrade notification level in pure pipe mode (stdin + stdout) and multiple file mode */
if (!strcmp(input_filename, stdinmark) && !strcmp(output_filename,stdoutmark) && (displayLevel==2)) displayLevel=1;