libarchive: FEATURE_LZMA_FAST should be visible if FEATURE_SEAMLESS_LZMA

While at it, tweak some config help texts.

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

diff --git a/archival/Config.src b/archival/Config.src
index 0c97f3d7cc5b32d7fab7059058ef8d10842187cf..4bb46f167211f6216bc18b9cf4e6c45d40c2c4f8 100644 (file)
--- 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 969b6f2bc665f463d2d9b3a96ff7e51b50b9dc0d..8e4d81eebf7c7cb09021c81e53dd3c557a3694bb 100644 (file)
--- 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 94698d902940d47d9e7eed7d4fbe04c9cadb6ed5..bf18a74856daf88b805484fd88739972f53a75ab 100644 (file)
--- 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 f1608e24b57ffd0c3abc17c62becac957e94b4f5..967d4b74d5d3e76b513a08d6a4afc5b53e3633a5 100644 (file)
--- 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 b836580d023317b823d5b130e62c3907a564b3d0..9d859b820af56e59f41fc3ad755c72660f63936a 100644 (file)
--- 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 24ccb00199ab914efad304cb47ba71bc8f4663e0..0159385855f40db6247c7158f23aa19f348144ab 100644 (file)
--- 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 bd6a04a7acf9d45850b72be24764c2d532960007..cbbad731c581ee1d146b4ad64677e90dd276e0fc 100644 (file)
--- 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 e9fb6fbeca934213f5684c2cd4f27c7c0e0c2386..31a08598412dea652fbbd7b063968181bd1c4bc0 100644 (file)
--- 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"