diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-11-14 09:53:52 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-11-14 09:53:52 +0100 |
commit | 66620fa62691271d777d11c562f894c65cd4f094 (patch) | |
tree | b4a46a3a62db3555836619c01e904472c0c385c1 /archival/bbunzip.c | |
parent | 73225b6d6e14f63e048fd95b504a2d909684699f (diff) | |
download | busybox-w32-66620fa62691271d777d11c562f894c65cd4f094.tar.gz busybox-w32-66620fa62691271d777d11c562f894c65cd4f094.tar.bz2 busybox-w32-66620fa62691271d777d11c562f894c65cd4f094.zip |
archival/*: move "kbuild:" snippets into .c files
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/bbunzip.c')
-rw-r--r-- | archival/bbunzip.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index 3735e3282..f2d796e67 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c | |||
@@ -7,6 +7,9 @@ | |||
7 | #include "libbb.h" | 7 | #include "libbb.h" |
8 | #include "bb_archive.h" | 8 | #include "bb_archive.h" |
9 | 9 | ||
10 | /* lzop_main() uses bbunpack(), need this: */ | ||
11 | //kbuild:lib-$(CONFIG_LZOP) += bbunzip.o | ||
12 | |||
10 | /* Note: must be kept in sync with archival/lzop.c */ | 13 | /* Note: must be kept in sync with archival/lzop.c */ |
11 | enum { | 14 | enum { |
12 | OPT_STDOUT = 1 << 0, | 15 | OPT_STDOUT = 1 << 0, |
@@ -205,7 +208,6 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext) | |||
205 | * | 208 | * |
206 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 209 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
207 | */ | 210 | */ |
208 | |||
209 | //usage:#define uncompress_trivial_usage | 211 | //usage:#define uncompress_trivial_usage |
210 | //usage: "[-cf] [FILE]..." | 212 | //usage: "[-cf] [FILE]..." |
211 | //usage:#define uncompress_full_usage "\n\n" | 213 | //usage:#define uncompress_full_usage "\n\n" |
@@ -213,6 +215,7 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext) | |||
213 | //usage: "\n -c Write to stdout" | 215 | //usage: "\n -c Write to stdout" |
214 | //usage: "\n -f Overwrite" | 216 | //usage: "\n -f Overwrite" |
215 | 217 | ||
218 | //kbuild:lib-$(CONFIG_UNCOMPRESS) += bbunzip.o | ||
216 | #if ENABLE_UNCOMPRESS | 219 | #if ENABLE_UNCOMPRESS |
217 | static | 220 | static |
218 | IF_DESKTOP(long long) int FAST_FUNC unpack_uncompress(transformer_aux_data_t *aux) | 221 | IF_DESKTOP(long long) int FAST_FUNC unpack_uncompress(transformer_aux_data_t *aux) |
@@ -257,7 +260,6 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) | |||
257 | * See the license_msg below and the file COPYING for the software license. | 260 | * See the license_msg below and the file COPYING for the software license. |
258 | * See the file algorithm.doc for the compression algorithms and file formats. | 261 | * See the file algorithm.doc for the compression algorithms and file formats. |
259 | */ | 262 | */ |
260 | |||
261 | //usage:#define gunzip_trivial_usage | 263 | //usage:#define gunzip_trivial_usage |
262 | //usage: "[-cft] [FILE]..." | 264 | //usage: "[-cft] [FILE]..." |
263 | //usage:#define gunzip_full_usage "\n\n" | 265 | //usage:#define gunzip_full_usage "\n\n" |
@@ -278,6 +280,8 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) | |||
278 | //usage:#define zcat_full_usage "\n\n" | 280 | //usage:#define zcat_full_usage "\n\n" |
279 | //usage: "Decompress to stdout" | 281 | //usage: "Decompress to stdout" |
280 | 282 | ||
283 | //kbuild:lib-$(CONFIG_GZIP) += bbunzip.o | ||
284 | //kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o | ||
281 | #if ENABLE_GUNZIP | 285 | #if ENABLE_GUNZIP |
282 | static | 286 | static |
283 | char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UNUSED_PARAM) | 287 | char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UNUSED_PARAM) |
@@ -356,8 +360,11 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv) | |||
356 | //usage: "[FILE]..." | 360 | //usage: "[FILE]..." |
357 | //usage:#define bzcat_full_usage "\n\n" | 361 | //usage:#define bzcat_full_usage "\n\n" |
358 | //usage: "Decompress to stdout" | 362 | //usage: "Decompress to stdout" |
363 | |||
359 | //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) | 364 | //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) |
360 | //applet:IF_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat)) | 365 | //applet:IF_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat)) |
366 | //kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o | ||
367 | //kbuild:lib-$(CONFIG_BUNZIP2) += bbunzip.o | ||
361 | #if ENABLE_BUNZIP2 | 368 | #if ENABLE_BUNZIP2 |
362 | static | 369 | static |
363 | IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_aux_data_t *aux) | 370 | IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_aux_data_t *aux) |
@@ -385,7 +392,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) | |||
385 | * | 392 | * |
386 | * Licensed under GPLv2, see file LICENSE in this source tree. | 393 | * Licensed under GPLv2, see file LICENSE in this source tree. |
387 | */ | 394 | */ |
388 | |||
389 | //usage:#define unlzma_trivial_usage | 395 | //usage:#define unlzma_trivial_usage |
390 | //usage: "[-cf] [FILE]..." | 396 | //usage: "[-cf] [FILE]..." |
391 | //usage:#define unlzma_full_usage "\n\n" | 397 | //usage:#define unlzma_full_usage "\n\n" |
@@ -426,6 +432,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) | |||
426 | //usage:#define xzcat_full_usage "\n\n" | 432 | //usage:#define xzcat_full_usage "\n\n" |
427 | //usage: "Decompress to stdout" | 433 | //usage: "Decompress to stdout" |
428 | 434 | ||
435 | //kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o | ||
429 | #if ENABLE_UNLZMA | 436 | #if ENABLE_UNLZMA |
430 | static | 437 | static |
431 | IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_aux_data_t *aux) | 438 | IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_aux_data_t *aux) |
@@ -451,6 +458,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv) | |||
451 | #endif | 458 | #endif |
452 | 459 | ||
453 | 460 | ||
461 | //kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o | ||
454 | #if ENABLE_UNXZ | 462 | #if ENABLE_UNXZ |
455 | static | 463 | static |
456 | IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(transformer_aux_data_t *aux) | 464 | IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(transformer_aux_data_t *aux) |