From 75d151e31d135ebab083307ded4e9b98970baa75 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 20 Jul 2017 23:28:00 +0200 Subject: [PATCH] libarchive: FEATURE_LZMA_FAST should be visible if FEATURE_SEAMLESS_LZMA While at it, tweak some config help texts. Signed-off-by: Denys Vlasenko --- archival/Config.src | 8 ++++++++ archival/ar.c | 2 -- archival/bbunzip.c | 19 +------------------ archival/lzop.c | 2 +- editors/awk.c | 2 +- editors/vi.c | 2 +- findutils/grep.c | 4 ++-- networking/ping.c | 2 +- 8 files changed, 15 insertions(+), 26 deletions(-) diff --git a/archival/Config.src b/archival/Config.src index 0c97f3d7c..4bb46f167 100644 --- a/archival/Config.src +++ b/archival/Config.src @@ -27,4 +27,12 @@ config FEATURE_SEAMLESS_Z INSERT +config FEATURE_LZMA_FAST + bool "Optimize lzma for speed" + default n + depends on UNLZMA || LZCAT || LZMA || FEATURE_SEAMLESS_LZMA + help + This option reduces decompression time by about 25% at the cost of + a 1K bigger binary. + endmenu diff --git a/archival/ar.c b/archival/ar.c index 969b6f2bc..8e4d81eeb 100644 --- a/archival/ar.c +++ b/archival/ar.c @@ -25,8 +25,6 @@ //config: extract contents from archives. In practice, it is used exclusively //config: for object module archives used by compilers. //config: -//config: On an x86 system, the ar applet adds about 1K. -//config: //config: Unless you have a specific application which requires ar, you should //config: probably say N here: most compilers come with their own ar utility. //config: diff --git a/archival/bbunzip.c b/archival/bbunzip.c index 94698d902..bf18a7485 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c @@ -501,20 +501,11 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) //config: is generally considerably better than that achieved by the bzip2 //config: compressors. //config: -//config: The BusyBox unlzma applet is limited to decompression only. -//config: On an x86 system, this applet adds about 4K. -//config: //config:config LZCAT //config: bool "lzcat (8.5 kb)" //config: default y //config: help -//config: unlzma is a compression utility using the Lempel-Ziv-Markov chain -//config: compression algorithm, and range coding. Compression -//config: is generally considerably better than that achieved by the bzip2 -//config: compressors. -//config: -//config: The BusyBox unlzma applet is limited to decompression only. -//config: On an x86 system, this applet adds about 4K. +//config: Alias to "unlzma -c". //config: //config:config LZMA //config: bool "lzma -d" @@ -522,14 +513,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) //config: help //config: Enable this option if you want commands like "lzma -d" to work. //config: IOW: you'll get lzma applet, but it will always require -d option. -//config: -//config:config FEATURE_LZMA_FAST -//config: bool "Optimize for speed" -//config: default n -//config: depends on UNLZMA || LZCAT || LZMA -//config: help -//config: This option reduces decompression time by about 25% at the cost of -//config: a 1K bigger binary. //applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP)) // APPLET_ODDNAME:name main location suid_type help diff --git a/archival/lzop.c b/archival/lzop.c index f1608e24b..967d4b74d 100644 --- a/archival/lzop.c +++ b/archival/lzop.c @@ -41,7 +41,7 @@ //config: bool "lzopcat (13 kb)" //config: default n # INCOMPAT: upstream lzop does not provide such tool //config: help -//config: Alias to "unlzop -c". +//config: Alias to "lzop -dc". //config: //config:config LZOP_COMPR_HIGH //config: bool "lzop compression levels 7,8,9 (not very useful)" diff --git a/editors/awk.c b/editors/awk.c index b836580d0..9d859b820 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -20,7 +20,7 @@ //config: depends on AWK //config: help //config: Enable math functions of the Awk programming language. -//config: NOTE: This will require libm to be present for linking. +//config: NOTE: This requires libm to be present for linking. //config: //config:config FEATURE_AWK_GNU_EXTENSIONS //config: bool "Enable a few GNU extensions" diff --git a/editors/vi.c b/editors/vi.c index 24ccb0019..015938585 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -61,7 +61,7 @@ //config: default y //config: depends on VI //config: help -//config: This will enable you to use yank and put, as well as mark. +//config: This enables you to use yank and put, as well as mark. //config: //config:config FEATURE_VI_SEARCH //config: bool "Enable search and replace cmds" diff --git a/findutils/grep.c b/findutils/grep.c index bd6a04a7a..cbbad731c 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -28,13 +28,13 @@ //config: bool "egrep (7.6 kb)" //config: default y //config: help -//config: Alias to "grep -E" +//config: Alias to "grep -E". //config: //config:config FGREP //config: bool "fgrep (7.6 kb)" //config: default y //config: help -//config: Alias to "grep -F" +//config: Alias to "grep -F". //config: //config:config FEATURE_GREP_CONTEXT //config: bool "Enable before and after context flags (-A, -B and -C)" diff --git a/networking/ping.c b/networking/ping.c index e9fb6fbec..31a085984 100644 --- a/networking/ping.c +++ b/networking/ping.c @@ -59,7 +59,7 @@ //config: default y //config: depends on FEATURE_IPV6 //config: help -//config: This will give you a ping that can talk IPv6. +//config: Alias to "ping -6". //config: //config:config FEATURE_FANCY_PING //config: bool "Enable fancy ping output"