Merge pull request #152 from dcolascione/dev

Improve lz4 command line error message when dealing with console IO

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;