From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 4 Jul 2017 14:23:36 +0000 (+0200)
Subject: bzcat: compile bunzip2_main() if BZCAT.
X-Git-Tag: 1_27_1~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e916d48e5a3a033469d34f5646b8c12963975d99;p=oweals%2Fbusybox.git

bzcat: compile bunzip2_main() if BZCAT.

Currently, BZCAT (and BUNZIP2) selects FEATURE_BZIP2_DECOMPRESS,
thus, "#if ENABLE_FEATURE_BZIP2_DECOMPRESS" around bunzip2_main()
is sufficient. But let's robustify it.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index f7a7ab354..b3b85b5d9 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -448,7 +448,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                APPLET_ODDNAME:name   main     location        suid_type     help
 //applet:IF_BZCAT(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat))
-#if ENABLE_FEATURE_BZIP2_DECOMPRESS || ENABLE_BUNZIP2
+#if ENABLE_FEATURE_BZIP2_DECOMPRESS || ENABLE_BUNZIP2 || ENABLE_BZCAT
 int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 {