diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-20 23:28:00 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-20 23:28:00 +0200 |
commit | 75d151e31d135ebab083307ded4e9b98970baa75 (patch) | |
tree | 2af1b57b1060f0384f6e2761a88e9c099aa5cfa0 | |
parent | ad37abf4231275d0991d42f9003666f1efd4114b (diff) | |
download | busybox-w32-75d151e31d135ebab083307ded4e9b98970baa75.tar.gz busybox-w32-75d151e31d135ebab083307ded4e9b98970baa75.tar.bz2 busybox-w32-75d151e31d135ebab083307ded4e9b98970baa75.zip |
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>
-rw-r--r-- | archival/Config.src | 8 | ||||
-rw-r--r-- | archival/ar.c | 2 | ||||
-rw-r--r-- | archival/bbunzip.c | 19 | ||||
-rw-r--r-- | archival/lzop.c | 2 | ||||
-rw-r--r-- | editors/awk.c | 2 | ||||
-rw-r--r-- | editors/vi.c | 2 | ||||
-rw-r--r-- | findutils/grep.c | 4 | ||||
-rw-r--r-- | 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 | |||
27 | 27 | ||
28 | INSERT | 28 | INSERT |
29 | 29 | ||
30 | config FEATURE_LZMA_FAST | ||
31 | bool "Optimize lzma for speed" | ||
32 | default n | ||
33 | depends on UNLZMA || LZCAT || LZMA || FEATURE_SEAMLESS_LZMA | ||
34 | help | ||
35 | This option reduces decompression time by about 25% at the cost of | ||
36 | a 1K bigger binary. | ||
37 | |||
30 | endmenu | 38 | 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 @@ | |||
25 | //config: extract contents from archives. In practice, it is used exclusively | 25 | //config: extract contents from archives. In practice, it is used exclusively |
26 | //config: for object module archives used by compilers. | 26 | //config: for object module archives used by compilers. |
27 | //config: | 27 | //config: |
28 | //config: On an x86 system, the ar applet adds about 1K. | ||
29 | //config: | ||
30 | //config: Unless you have a specific application which requires ar, you should | 28 | //config: Unless you have a specific application which requires ar, you should |
31 | //config: probably say N here: most compilers come with their own ar utility. | 29 | //config: probably say N here: most compilers come with their own ar utility. |
32 | //config: | 30 | //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) | |||
501 | //config: is generally considerably better than that achieved by the bzip2 | 501 | //config: is generally considerably better than that achieved by the bzip2 |
502 | //config: compressors. | 502 | //config: compressors. |
503 | //config: | 503 | //config: |
504 | //config: The BusyBox unlzma applet is limited to decompression only. | ||
505 | //config: On an x86 system, this applet adds about 4K. | ||
506 | //config: | ||
507 | //config:config LZCAT | 504 | //config:config LZCAT |
508 | //config: bool "lzcat (8.5 kb)" | 505 | //config: bool "lzcat (8.5 kb)" |
509 | //config: default y | 506 | //config: default y |
510 | //config: help | 507 | //config: help |
511 | //config: unlzma is a compression utility using the Lempel-Ziv-Markov chain | 508 | //config: Alias to "unlzma -c". |
512 | //config: compression algorithm, and range coding. Compression | ||
513 | //config: is generally considerably better than that achieved by the bzip2 | ||
514 | //config: compressors. | ||
515 | //config: | ||
516 | //config: The BusyBox unlzma applet is limited to decompression only. | ||
517 | //config: On an x86 system, this applet adds about 4K. | ||
518 | //config: | 509 | //config: |
519 | //config:config LZMA | 510 | //config:config LZMA |
520 | //config: bool "lzma -d" | 511 | //config: bool "lzma -d" |
@@ -522,14 +513,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) | |||
522 | //config: help | 513 | //config: help |
523 | //config: Enable this option if you want commands like "lzma -d" to work. | 514 | //config: Enable this option if you want commands like "lzma -d" to work. |
524 | //config: IOW: you'll get lzma applet, but it will always require -d option. | 515 | //config: IOW: you'll get lzma applet, but it will always require -d option. |
525 | //config: | ||
526 | //config:config FEATURE_LZMA_FAST | ||
527 | //config: bool "Optimize for speed" | ||
528 | //config: default n | ||
529 | //config: depends on UNLZMA || LZCAT || LZMA | ||
530 | //config: help | ||
531 | //config: This option reduces decompression time by about 25% at the cost of | ||
532 | //config: a 1K bigger binary. | ||
533 | 516 | ||
534 | //applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP)) | 517 | //applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP)) |
535 | // APPLET_ODDNAME:name main location suid_type help | 518 | // 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 @@ | |||
41 | //config: bool "lzopcat (13 kb)" | 41 | //config: bool "lzopcat (13 kb)" |
42 | //config: default n # INCOMPAT: upstream lzop does not provide such tool | 42 | //config: default n # INCOMPAT: upstream lzop does not provide such tool |
43 | //config: help | 43 | //config: help |
44 | //config: Alias to "unlzop -c". | 44 | //config: Alias to "lzop -dc". |
45 | //config: | 45 | //config: |
46 | //config:config LZOP_COMPR_HIGH | 46 | //config:config LZOP_COMPR_HIGH |
47 | //config: bool "lzop compression levels 7,8,9 (not very useful)" | 47 | //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 @@ | |||
20 | //config: depends on AWK | 20 | //config: depends on AWK |
21 | //config: help | 21 | //config: help |
22 | //config: Enable math functions of the Awk programming language. | 22 | //config: Enable math functions of the Awk programming language. |
23 | //config: NOTE: This will require libm to be present for linking. | 23 | //config: NOTE: This requires libm to be present for linking. |
24 | //config: | 24 | //config: |
25 | //config:config FEATURE_AWK_GNU_EXTENSIONS | 25 | //config:config FEATURE_AWK_GNU_EXTENSIONS |
26 | //config: bool "Enable a few GNU extensions" | 26 | //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 @@ | |||
61 | //config: default y | 61 | //config: default y |
62 | //config: depends on VI | 62 | //config: depends on VI |
63 | //config: help | 63 | //config: help |
64 | //config: This will enable you to use yank and put, as well as mark. | 64 | //config: This enables you to use yank and put, as well as mark. |
65 | //config: | 65 | //config: |
66 | //config:config FEATURE_VI_SEARCH | 66 | //config:config FEATURE_VI_SEARCH |
67 | //config: bool "Enable search and replace cmds" | 67 | //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 @@ | |||
28 | //config: bool "egrep (7.6 kb)" | 28 | //config: bool "egrep (7.6 kb)" |
29 | //config: default y | 29 | //config: default y |
30 | //config: help | 30 | //config: help |
31 | //config: Alias to "grep -E" | 31 | //config: Alias to "grep -E". |
32 | //config: | 32 | //config: |
33 | //config:config FGREP | 33 | //config:config FGREP |
34 | //config: bool "fgrep (7.6 kb)" | 34 | //config: bool "fgrep (7.6 kb)" |
35 | //config: default y | 35 | //config: default y |
36 | //config: help | 36 | //config: help |
37 | //config: Alias to "grep -F" | 37 | //config: Alias to "grep -F". |
38 | //config: | 38 | //config: |
39 | //config:config FEATURE_GREP_CONTEXT | 39 | //config:config FEATURE_GREP_CONTEXT |
40 | //config: bool "Enable before and after context flags (-A, -B and -C)" | 40 | //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 @@ | |||
59 | //config: default y | 59 | //config: default y |
60 | //config: depends on FEATURE_IPV6 | 60 | //config: depends on FEATURE_IPV6 |
61 | //config: help | 61 | //config: help |
62 | //config: This will give you a ping that can talk IPv6. | 62 | //config: Alias to "ping -6". |
63 | //config: | 63 | //config: |
64 | //config:config FEATURE_FANCY_PING | 64 | //config:config FEATURE_FANCY_PING |
65 | //config: bool "Enable fancy ping output" | 65 | //config: bool "Enable fancy ping output" |