aboutsummaryrefslogtreecommitdiff
path: root/archival/bbunzip.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-03-24 11:55:30 +0000
committerRon Yorston <rmy@pobox.com>2021-03-24 12:43:15 +0000
commit355a7a6c1e9626b7afe8758a6095f3cf275c52e1 (patch)
tree6dab679c15b049cab97212e0b43077132eec1fbe /archival/bbunzip.c
parent71ecc8033e6989996057b32577e71148fd544596 (diff)
parent889425812b5cda8b3394d73253cbde7355fb1115 (diff)
downloadbusybox-w32-w32_1_26_2.tar.gz
busybox-w32-w32_1_26_2.tar.bz2
busybox-w32-w32_1_26_2.zip
Merge tag '1_26_2' into w32_1_26_2w32_1_26_2
Diffstat (limited to 'archival/bbunzip.c')
-rw-r--r--archival/bbunzip.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index e1eec6d4b..343aec9bd 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -9,6 +9,12 @@
9 9
10/* lzop_main() uses bbunpack(), need this: */ 10/* lzop_main() uses bbunpack(), need this: */
11//kbuild:lib-$(CONFIG_LZOP) += bbunzip.o 11//kbuild:lib-$(CONFIG_LZOP) += bbunzip.o
12//kbuild:lib-$(CONFIG_LZOPCAT) += bbunzip.o
13//kbuild:lib-$(CONFIG_UNLZOP) += bbunzip.o
14/* bzip2_main() too: */
15//kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o
16/* gzip_main() too: */
17//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o
12 18
13/* Note: must be kept in sync with archival/lzop.c */ 19/* Note: must be kept in sync with archival/lzop.c */
14enum { 20enum {
@@ -192,7 +198,10 @@ int FAST_FUNC bbunpack(char **argv,
192 return exitcode; 198 return exitcode;
193} 199}
194 200
195#if ENABLE_UNCOMPRESS || ENABLE_BUNZIP2 || ENABLE_UNLZMA || ENABLE_UNXZ 201#if ENABLE_UNCOMPRESS \
202 || ENABLE_BUNZIP2 || ENABLE_BZCAT \
203 || ENABLE_UNLZMA || ENABLE_LZCAT || ENABLE_LZMA \
204 || ENABLE_UNXZ || ENABLE_XZCAT || ENABLE_XZ
196static 205static
197char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext) 206char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
198{ 207{