e04c867a2
Denys Vlasenko
2010-05-30
Subject
rename FEATURE_LZMA_ALIAS to just LZMA
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/Config.in+1 -1
| @@ -327,7 +327,7 @@ config FEATURE_LZMA_FAST | |
| This option reduces decompression time by about 25% at the cost of | |
| a 1K bigger binary. | |
| - | config FEATURE_LZMA_ALIAS |
| + | config LZMA |
| bool "Provide lzma alias which supports only unpacking" | |
| default n | |
| depends on UNLZMA | |
archival/bbunzip.c+2 -2
| @@ -333,8 +333,8 @@ IF_DESKTOP(long long) int unpack_unlzma(unpack_info_t *info UNUSED_PARAM) | |
| int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | |
| int unlzma_main(int argc UNUSED_PARAM, char **argv) | |
| { | |
| - | IF_FEATURE_LZMA_ALIAS(int opts =) getopt32(argv, "cfvdt"); |
| - | # if ENABLE_FEATURE_LZMA_ALIAS |
| + | IF_LZMA(int opts =) getopt32(argv, "cfvdt"); |
| + | # if ENABLE_LZMA |
| /* lzma without -d or -t? */ | |
| if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) | |
| bb_show_usage(); | |
include/applets.h+1 -1
| @@ -254,7 +254,7 @@ IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, m | |
| 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_FEATURE_LZMA_ALIAS(APPLET_ODDNAME(lzma, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzma)) |
| + | 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)) | |
include/usage.h+8 -8
| @@ -194,14 +194,6 @@ | |
| "\n stp BRIDGE [1/yes/on|0/no/off] STP on/off" \ | |
| ) \ | |
| - | #define bunzip2_trivial_usage \ |
| - | "[OPTIONS] [FILE]..." |
| - | #define bunzip2_full_usage "\n\n" \ |
| - | "Decompress FILEs (or stdin)\n" \ |
| - | "\nOptions:" \ |
| - | "\n -c Write to stdout" \ |
| - | "\n -f Force" \ |
| - | |
| #define bzip2_trivial_usage \ | |
| "[OPTIONS] [FILE]..." | |
| #define bzip2_full_usage "\n\n" \ | |
| @@ -242,6 +234,14 @@ | |
| "\n -v Verbose" \ | |
| "\n -F Don't store or verify checksum" \ | |
| + | #define bunzip2_trivial_usage \ |
| + | "[OPTIONS] [FILE]..." |
| + | #define bunzip2_full_usage "\n\n" \ |
| + | "Decompress FILEs (or stdin)\n" \ |
| + | "\nOptions:" \ |
| + | "\n -c Write to stdout" \ |
| + | "\n -f Force" \ |
| + | |
| #define bzcat_trivial_usage \ | |
| "FILE" | |
| #define bzcat_full_usage "\n\n" \ | |