diff options
| -rw-r--r-- | archival/Config.in | 2 | ||||
| -rw-r--r-- | archival/bbunzip.c | 4 | ||||
| -rw-r--r-- | include/applets.h | 2 | ||||
| -rw-r--r-- | include/usage.h | 16 |
4 files changed, 12 insertions, 12 deletions
diff --git a/archival/Config.in b/archival/Config.in index 428398377..028fce32f 100644 --- a/archival/Config.in +++ b/archival/Config.in @@ -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 diff --git a/archival/bbunzip.c b/archival/bbunzip.c index f6bf337a3..178dc63be 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c @@ -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(); diff --git a/include/applets.h b/include/applets.h index 4d8ba0a6b..a171c5449 100644 --- a/include/applets.h +++ b/include/applets.h @@ -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)) diff --git a/include/usage.h b/include/usage.h index 13f0b73a2..3aa980cdc 100644 --- a/include/usage.h +++ b/include/usage.h @@ -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" \ |