diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-11-14 09:54:24 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-11-14 09:54:24 +0100 |
commit | 36184a487d20d4ae168c2ae247dd064b1e9f4f64 (patch) | |
tree | fa372b1332342106eb4f1ccdbf504dd1b86d129c /archival/bbunzip.c | |
parent | 66620fa62691271d777d11c562f894c65cd4f094 (diff) | |
download | busybox-w32-36184a487d20d4ae168c2ae247dd064b1e9f4f64.tar.gz busybox-w32-36184a487d20d4ae168c2ae247dd064b1e9f4f64.tar.bz2 busybox-w32-36184a487d20d4ae168c2ae247dd064b1e9f4f64.zip |
archival/*: move "applet:" 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 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index f2d796e67..d34f56885 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c | |||
@@ -215,6 +215,7 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext) | |||
215 | //usage: "\n -c Write to stdout" | 215 | //usage: "\n -c Write to stdout" |
216 | //usage: "\n -f Overwrite" | 216 | //usage: "\n -f Overwrite" |
217 | 217 | ||
218 | //applet:IF_UNCOMPRESS(APPLET(uncompress, BB_DIR_BIN, BB_SUID_DROP)) | ||
218 | //kbuild:lib-$(CONFIG_UNCOMPRESS) += bbunzip.o | 219 | //kbuild:lib-$(CONFIG_UNCOMPRESS) += bbunzip.o |
219 | #if ENABLE_UNCOMPRESS | 220 | #if ENABLE_UNCOMPRESS |
220 | static | 221 | static |
@@ -256,9 +257,6 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) | |||
256 | * Portions of the lzw code are derived from the public domain 'compress' | 257 | * Portions of the lzw code are derived from the public domain 'compress' |
257 | * written by Spencer Thomas, Joe Orost, James Woods, Jim McKie, Steve Davies, | 258 | * written by Spencer Thomas, Joe Orost, James Woods, Jim McKie, Steve Davies, |
258 | * Ken Turkowski, Dave Mack and Peter Jannesen. | 259 | * Ken Turkowski, Dave Mack and Peter Jannesen. |
259 | * | ||
260 | * See the license_msg below and the file COPYING for the software license. | ||
261 | * See the file algorithm.doc for the compression algorithms and file formats. | ||
262 | */ | 260 | */ |
263 | //usage:#define gunzip_trivial_usage | 261 | //usage:#define gunzip_trivial_usage |
264 | //usage: "[-cft] [FILE]..." | 262 | //usage: "[-cft] [FILE]..." |
@@ -280,6 +278,8 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) | |||
280 | //usage:#define zcat_full_usage "\n\n" | 278 | //usage:#define zcat_full_usage "\n\n" |
281 | //usage: "Decompress to stdout" | 279 | //usage: "Decompress to stdout" |
282 | 280 | ||
281 | //applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP)) | ||
282 | //applet:IF_GUNZIP(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat)) | ||
283 | //kbuild:lib-$(CONFIG_GZIP) += bbunzip.o | 283 | //kbuild:lib-$(CONFIG_GZIP) += bbunzip.o |
284 | //kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o | 284 | //kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o |
285 | #if ENABLE_GUNZIP | 285 | #if ENABLE_GUNZIP |
@@ -432,6 +432,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) | |||
432 | //usage:#define xzcat_full_usage "\n\n" | 432 | //usage:#define xzcat_full_usage "\n\n" |
433 | //usage: "Decompress to stdout" | 433 | //usage: "Decompress to stdout" |
434 | 434 | ||
435 | //applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
435 | //kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o | 436 | //kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o |
436 | #if ENABLE_UNLZMA | 437 | #if ENABLE_UNLZMA |
437 | static | 438 | static |
@@ -458,6 +459,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv) | |||
458 | #endif | 459 | #endif |
459 | 460 | ||
460 | 461 | ||
462 | //applet:IF_UNXZ(APPLET(unxz, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
461 | //kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o | 463 | //kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o |
462 | #if ENABLE_UNXZ | 464 | #if ENABLE_UNXZ |
463 | static | 465 | static |