emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename FEATURE_LZMA_ALIAS to just LZMA

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-05-30 03:33:50 +02:00
parent 8bcaa6a4e9
commit e04c867a21
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archival/Config.in
View File

@ -327,7 +327,7 @@ config FEATURE_LZMA_FAST
This option reduces decompression time by about 25% at the cost of This option reduces decompression time by about 25% at the cost of
a 1K bigger binary. a 1K bigger binary.
config FEATURE_LZMA_ALIAS config LZMA
bool "Provide lzma alias which supports only unpacking" bool "Provide lzma alias which supports only unpacking"
default n default n
depends on UNLZMA depends on UNLZMA

4
archival/bbunzip.c
View File

@ -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, char **argv) MAIN_EXTERNALLY_VISIBLE;
int unlzma_main(int argc UNUSED_PARAM, char **argv) int unlzma_main(int argc UNUSED_PARAM, char **argv)
{ {
IF_FEATURE_LZMA_ALIAS(int opts =) getopt32(argv, "cfvdt"); IF_LZMA(int opts =) getopt32(argv, "cfvdt");
# if ENABLE_FEATURE_LZMA_ALIAS # if ENABLE_LZMA
/* lzma without -d or -t? */ /* lzma without -d or -t? */
if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
bb_show_usage(); bb_show_usage();

2
include/applets.h
View File

@ -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_LSPCI(APPLET(lspci, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_LSUSB(APPLET(lsusb, _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_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(lzop, _BB_DIR_BIN, _BB_SUID_DROP))
IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzopcat)) 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_MAKEDEVS(APPLET(makedevs, _BB_DIR_SBIN, _BB_SUID_DROP))

16
include/usage.h
View File

@ -194,14 +194,6 @@
"\n stp BRIDGE [1/yes/on|0/no/off] STP on/off" \ "\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 \ #define bzip2_trivial_usage \
"[OPTIONS] [FILE]..." "[OPTIONS] [FILE]..."
#define bzip2_full_usage "\n\n" \ #define bzip2_full_usage "\n\n" \
@ -242,6 +234,14 @@
"\n -v Verbose" \ "\n -v Verbose" \
"\n -F Don't store or verify checksum" \ "\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 \ #define bzcat_trivial_usage \
"FILE" "FILE"
#define bzcat_full_usage "\n\n" \ #define bzcat_full_usage "\n\n" \