aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archival/Config.in2
-rw-r--r--archival/bbunzip.c4
-rw-r--r--include/applets.h2
-rw-r--r--include/usage.h16
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
327 This option reduces decompression time by about 25% at the cost of 327 This option reduces decompression time by about 25% at the cost of
328 a 1K bigger binary. 328 a 1K bigger binary.
329 329
330config FEATURE_LZMA_ALIAS 330config LZMA
331 bool "Provide lzma alias which supports only unpacking" 331 bool "Provide lzma alias which supports only unpacking"
332 default n 332 default n
333 depends on UNLZMA 333 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)
333int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 333int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
334int unlzma_main(int argc UNUSED_PARAM, char **argv) 334int unlzma_main(int argc UNUSED_PARAM, char **argv)
335{ 335{
336 IF_FEATURE_LZMA_ALIAS(int opts =) getopt32(argv, "cfvdt"); 336 IF_LZMA(int opts =) getopt32(argv, "cfvdt");
337# if ENABLE_FEATURE_LZMA_ALIAS 337# if ENABLE_LZMA
338 /* lzma without -d or -t? */ 338 /* lzma without -d or -t? */
339 if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) 339 if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
340 bb_show_usage(); 340 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
254IF_LSPCI(APPLET(lspci, _BB_DIR_USR_BIN, _BB_SUID_DROP)) 254IF_LSPCI(APPLET(lspci, _BB_DIR_USR_BIN, _BB_SUID_DROP))
255IF_LSUSB(APPLET(lsusb, _BB_DIR_USR_BIN, _BB_SUID_DROP)) 255IF_LSUSB(APPLET(lsusb, _BB_DIR_USR_BIN, _BB_SUID_DROP))
256IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzcat)) 256IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzcat))
257IF_FEATURE_LZMA_ALIAS(APPLET_ODDNAME(lzma, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzma)) 257IF_LZMA(APPLET_ODDNAME(lzma, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzma))
258IF_LZOP(APPLET(lzop, _BB_DIR_BIN, _BB_SUID_DROP)) 258IF_LZOP(APPLET(lzop, _BB_DIR_BIN, _BB_SUID_DROP))
259IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzopcat)) 259IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzopcat))
260IF_MAKEDEVS(APPLET(makedevs, _BB_DIR_SBIN, _BB_SUID_DROP)) 260IF_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 @@
194 "\n stp BRIDGE [1/yes/on|0/no/off] STP on/off" \ 194 "\n stp BRIDGE [1/yes/on|0/no/off] STP on/off" \
195 ) \ 195 ) \
196 196
197#define bunzip2_trivial_usage \
198 "[OPTIONS] [FILE]..."
199#define bunzip2_full_usage "\n\n" \
200 "Decompress FILEs (or stdin)\n" \
201 "\nOptions:" \
202 "\n -c Write to stdout" \
203 "\n -f Force" \
204
205#define bzip2_trivial_usage \ 197#define bzip2_trivial_usage \
206 "[OPTIONS] [FILE]..." 198 "[OPTIONS] [FILE]..."
207#define bzip2_full_usage "\n\n" \ 199#define bzip2_full_usage "\n\n" \
@@ -242,6 +234,14 @@
242 "\n -v Verbose" \ 234 "\n -v Verbose" \
243 "\n -F Don't store or verify checksum" \ 235 "\n -F Don't store or verify checksum" \
244 236
237#define bunzip2_trivial_usage \
238 "[OPTIONS] [FILE]..."
239#define bunzip2_full_usage "\n\n" \
240 "Decompress FILEs (or stdin)\n" \
241 "\nOptions:" \
242 "\n -c Write to stdout" \
243 "\n -f Force" \
244
245#define bzcat_trivial_usage \ 245#define bzcat_trivial_usage \
246 "FILE" 246 "FILE"
247#define bzcat_full_usage "\n\n" \ 247#define bzcat_full_usage "\n\n" \