rename FEATURE_LZMA_ALIAS to just LZMA

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/archival/Config.in b/archival/Config.in
index 428398377647417c14eaadf708bb79b33ad5b635..028fce32fd815ff41e399ab9241953832ab7656f 100644 (file)
--- 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 f6bf337a39fa05ae3cfb0a7db51163ad63a18c6a..178dc63be95f0d4e98665fd0c0d8d86a7bfde279 100644 (file)
--- 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 4d8ba0a6bbc197f83ca3c6957b6b0788b9f2ed19..a171c54490d2c1364d65a3b96bb7bcf285c6736f 100644 (file)
--- 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 13f0b73a2d30a9a47cee9b266aa7021200b35ccf..3aa980cdcd8098f62f7b715caf160389e80816e0 100644 (file)
--- 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" \