ac2168730
Denys Vlasenko
2013-11-14
Subject
archival/*: move "applet:" snippets into .c files, part 2
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/bbunzip.c+4 -0
| @@ -433,6 +433,8 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) | |
| //usage: "Decompress to stdout" | |
| //applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| + | //applet:IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzcat)) |
| + | //applet:IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma)) |
| //kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o | |
| #if ENABLE_UNLZMA | |
| static | |
| @@ -460,6 +462,8 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv) | |
| //applet:IF_UNXZ(APPLET(unxz, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| + | //applet:IF_UNXZ(APPLET_ODDNAME(xzcat, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xzcat)) |
| + | //applet:IF_XZ(APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz)) |
| //kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o | |
| #if ENABLE_UNXZ | |
| static | |
archival/lzop.c+3 -1
| @@ -25,7 +25,9 @@ | |
| "Minimalized" for busybox by Alain Knaff | |
| */ | |
| - | //applet:IF_UNZIP(APPLET(unzip, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| + | //applet:IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP)) |
| + | //applet:IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat)) |
| + | //applet:IF_LZOP(APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop)) |
| //kbuild:lib-$(CONFIG_LZOP) += lzop.o | |
| //usage:#define lzop_trivial_usage | |
archival/unzip.c+1 -0
| @@ -17,6 +17,7 @@ | |
| * Zip64 + other methods | |
| */ | |
| + | //applet:IF_UNZIP(APPLET(unzip, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| //kbuild:lib-$(CONFIG_UNZIP) += unzip.o | |
| //usage:#define unzip_trivial_usage | |
include/applets.src.h+0 -7
| @@ -225,10 +225,6 @@ IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls)) | |
| IF_LSATTR(APPLET(lsattr, BB_DIR_BIN, BB_SUID_DROP)) | |
| IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| - | IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzcat)) |
| - | IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma)) |
| - | IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP)) |
| - | IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat)) |
| IF_MAKEDEVS(APPLET(makedevs, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP)) | |
| IF_MAN(APPLET(man, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| @@ -379,7 +375,6 @@ IF_UNAME(APPLET(uname, BB_DIR_BIN, BB_SUID_DROP)) | |
| IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand)) | |
| IF_UNIQ(APPLET(uniq, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_UNIX2DOS(APPLET_NOEXEC(unix2dos, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, unix2dos)) | |
| - | IF_LZOP(APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop)) |
| IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_USLEEP(APPLET_NOFORK(usleep, usleep, BB_DIR_BIN, BB_SUID_DROP, usleep)) | |
| IF_UUDECODE(APPLET(uudecode, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| @@ -394,8 +389,6 @@ IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_WHOAMI(APPLET_NOFORK(whoami, whoami, BB_DIR_USR_BIN, BB_SUID_DROP, whoami)) | |
| - | IF_UNXZ(APPLET_ODDNAME(xzcat, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xzcat)) |
| - | IF_XZ(APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz)) |
| IF_YES(APPLET_NOFORK(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes)) | |
| IF_ZCIP(APPLET(zcip, BB_DIR_SBIN, BB_SUID_DROP)) | |