diff options
| author | Denys Vlasenko | 2013-02-28 18:04:22 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2013-02-28 18:05:01 +0100 |
| commit | f2d8478e560fd77b45dbea7993d6219a5b635b2e (patch) | |
| tree | 8c0d3717cd31dec3eef2c478fd70f049ade5ec86 | |
| parent | 577235dee826eed86d76b0d4ef866297a20ecd55 (diff) | |
| download | busybox-f2d8478e560fd77b45dbea7993d6219a5b635b2e.zip busybox-f2d8478e560fd77b45dbea7993d6219a5b635b2e.tar.gz | |
fix error message on failure to oen /dev/null; fix zcat's help text
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | archival/bbunzip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index 94d8a81..46f99cf 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c @@ -68,7 +68,7 @@ int FAST_FUNC bbunpack(char **argv, if (option_mask32 & (OPT_STDOUT|OPT_TEST)) { if (option_mask32 & OPT_TEST) if (open_to_or_warn(STDOUT_FILENO, bb_dev_null, O_WRONLY, 0)) - goto err; + xfunc_die(); filename = NULL; } @@ -93,7 +93,7 @@ int FAST_FUNC bbunpack(char **argv, } /* Check that the input is sane */ - if (isatty(STDIN_FILENO) && (option_mask32 & OPT_FORCE) == 0) { + if (!(option_mask32 & OPT_FORCE) && isatty(STDIN_FILENO)) { bb_error_msg_and_die("compressed data not read from terminal, " "use -f to force it"); } @@ -241,7 +241,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) //usage: "-rw-rw-r-- 1 andersen andersen 1761280 Apr 14 17:47 /tmp/BusyBox-0.43.tar\n" //usage: //usage:#define zcat_trivial_usage -//usage: "FILE" +//usage: "[FILE]..." //usage:#define zcat_full_usage "\n\n" //usage: "Decompress to stdout" @@ -316,7 +316,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv) //usage: "\n -c Write to stdout" //usage: "\n -f Force" //usage:#define bzcat_trivial_usage -//usage: "FILE" +//usage: "[FILE]..." //usage:#define bzcat_full_usage "\n\n" //usage: "Decompress to stdout" //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) @@ -365,7 +365,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) //usage: "\n -f Force" //usage: //usage:#define lzcat_trivial_usage -//usage: "FILE" +//usage: "[FILE]..." //usage:#define lzcat_full_usage "\n\n" //usage: "Decompress to stdout" //usage: @@ -385,7 +385,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) //usage: "\n -f Force" //usage: //usage:#define xzcat_trivial_usage -//usage: "FILE" +//usage: "[FILE]..." //usage:#define xzcat_full_usage "\n\n" //usage: "Decompress to stdout" |