emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bzcat,zcat: simplify code if gunzip/bunzip2 is not selected

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-20 16:25:03 +02:00
parent eae12688c9
commit ebe3c35d00
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archival/bbunzip.c
View File

@ -398,7 +398,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
* Normally, "zcat" is just "gunzip -c". * Normally, "zcat" is just "gunzip -c".
* But if seamless magic is enabled, then we are much more clever. * But if seamless magic is enabled, then we are much more clever.
*/ */
if (ENABLE_ZCAT && applet_name[1] == 'c') if (ENABLE_ZCAT && (!ENABLE_GUNZIP || applet_name[1] == 'c'))
option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC; option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC;
return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL); return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL);
@ -454,7 +454,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
{ {
getopt32(argv, "cfkvqdt"); getopt32(argv, "cfkvqdt");
argv += optind; argv += optind;
if (ENABLE_BZCAT && applet_name[2] == 'c') /* bzcat */ if (ENABLE_BZCAT && (!ENABLE_BUNZIP2 || applet_name[2] == 'c')) /* bzcat */
option_mask32 |= OPT_STDOUT; option_mask32 |= OPT_STDOUT;
return bbunpack(argv, unpack_bz2_stream, make_new_name_generic, "bz2"); return bbunpack(argv, unpack_bz2_stream, make_new_name_generic, "bz2");