diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-10 14:58:54 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-10 14:58:54 +0100 |
commit | f560422fa079b07a761a572ca4f9cf287c2cc47e (patch) | |
tree | 6962fe92683c37e561363eed6da8b60c09842196 /archival | |
parent | f10f7a21d40d5ce0846414973e88602a59d4580e (diff) | |
download | busybox-w32-f560422fa079b07a761a572ca4f9cf287c2cc47e.tar.gz busybox-w32-f560422fa079b07a761a572ca4f9cf287c2cc47e.tar.bz2 busybox-w32-f560422fa079b07a761a572ca4f9cf287c2cc47e.zip |
Big cleanup in config help and description
Redundant help texts (one which only repeats the description)
are deleted.
Descriptions and help texts are trimmed.
Some config options are moved, even across menus.
No config option _names_ are changed.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r-- | archival/Config.src | 10 | ||||
-rw-r--r-- | archival/ar.c | 2 | ||||
-rw-r--r-- | archival/bbunzip.c | 4 | ||||
-rw-r--r-- | archival/cpio.c | 4 | ||||
-rw-r--r-- | archival/gzip.c | 4 | ||||
-rw-r--r-- | archival/tar.c | 35 |
6 files changed, 17 insertions, 42 deletions
diff --git a/archival/Config.src b/archival/Config.src index 5e7cfc0a4..0c97f3d7c 100644 --- a/archival/Config.src +++ b/archival/Config.src | |||
@@ -8,32 +8,22 @@ menu "Archival Utilities" | |||
8 | config FEATURE_SEAMLESS_XZ | 8 | config FEATURE_SEAMLESS_XZ |
9 | bool "Make tar, rpm, modprobe etc understand .xz data" | 9 | bool "Make tar, rpm, modprobe etc understand .xz data" |
10 | default y | 10 | default y |
11 | help | ||
12 | Make tar, rpm, modprobe etc understand .xz data. | ||
13 | 11 | ||
14 | config FEATURE_SEAMLESS_LZMA | 12 | config FEATURE_SEAMLESS_LZMA |
15 | bool "Make tar, rpm, modprobe etc understand .lzma data" | 13 | bool "Make tar, rpm, modprobe etc understand .lzma data" |
16 | default y | 14 | default y |
17 | help | ||
18 | Make tar, rpm, modprobe etc understand .lzma data. | ||
19 | 15 | ||
20 | config FEATURE_SEAMLESS_BZ2 | 16 | config FEATURE_SEAMLESS_BZ2 |
21 | bool "Make tar, rpm, modprobe etc understand .bz2 data" | 17 | bool "Make tar, rpm, modprobe etc understand .bz2 data" |
22 | default y | 18 | default y |
23 | help | ||
24 | Make tar, rpm, modprobe etc understand .bz2 data. | ||
25 | 19 | ||
26 | config FEATURE_SEAMLESS_GZ | 20 | config FEATURE_SEAMLESS_GZ |
27 | bool "Make tar, rpm, modprobe etc understand .gz data" | 21 | bool "Make tar, rpm, modprobe etc understand .gz data" |
28 | default y | 22 | default y |
29 | help | ||
30 | Make tar, rpm, modprobe etc understand .gz data. | ||
31 | 23 | ||
32 | config FEATURE_SEAMLESS_Z | 24 | config FEATURE_SEAMLESS_Z |
33 | bool "Make tar, rpm, modprobe etc understand .Z data" | 25 | bool "Make tar, rpm, modprobe etc understand .Z data" |
34 | default n # it is ancient | 26 | default n # it is ancient |
35 | help | ||
36 | Make tar, rpm, modprobe etc understand .Z data. | ||
37 | 27 | ||
38 | INSERT | 28 | INSERT |
39 | 29 | ||
diff --git a/archival/ar.c b/archival/ar.c index e49d5cb2b..d119c75ad 100644 --- a/archival/ar.c +++ b/archival/ar.c | |||
@@ -31,7 +31,7 @@ | |||
31 | //config: probably say N here: most compilers come with their own ar utility. | 31 | //config: probably say N here: most compilers come with their own ar utility. |
32 | //config: | 32 | //config: |
33 | //config:config FEATURE_AR_LONG_FILENAMES | 33 | //config:config FEATURE_AR_LONG_FILENAMES |
34 | //config: bool "Support for long filenames (not needed for debs)" | 34 | //config: bool "Support long filenames (not needed for debs)" |
35 | //config: default y | 35 | //config: default y |
36 | //config: depends on AR | 36 | //config: depends on AR |
37 | //config: help | 37 | //config: help |
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index aa8453440..fb7a3678d 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c | |||
@@ -312,8 +312,6 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) | |||
312 | //config: bool "Enable long options" | 312 | //config: bool "Enable long options" |
313 | //config: default y | 313 | //config: default y |
314 | //config: depends on (GUNZIP || ZCAT) && LONG_OPTS | 314 | //config: depends on (GUNZIP || ZCAT) && LONG_OPTS |
315 | //config: help | ||
316 | //config: Enable use of long options. | ||
317 | 315 | ||
318 | //applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP)) | 316 | //applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP)) |
319 | //applet:IF_ZCAT(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat)) | 317 | //applet:IF_ZCAT(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat)) |
@@ -522,7 +520,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) | |||
522 | //config: IOW: you'll get lzma applet, but it will always require -d option. | 520 | //config: IOW: you'll get lzma applet, but it will always require -d option. |
523 | //config: | 521 | //config: |
524 | //config:config FEATURE_LZMA_FAST | 522 | //config:config FEATURE_LZMA_FAST |
525 | //config: bool "Optimize unlzma for speed" | 523 | //config: bool "Optimize for speed" |
526 | //config: default n | 524 | //config: default n |
527 | //config: depends on UNLZMA || LZCAT || LZMA | 525 | //config: depends on UNLZMA || LZCAT || LZMA |
528 | //config: help | 526 | //config: help |
diff --git a/archival/cpio.c b/archival/cpio.c index 540218cb2..683f0bb1f 100644 --- a/archival/cpio.c +++ b/archival/cpio.c | |||
@@ -29,7 +29,7 @@ | |||
29 | //config: should probably say N here. | 29 | //config: should probably say N here. |
30 | //config: | 30 | //config: |
31 | //config:config FEATURE_CPIO_O | 31 | //config:config FEATURE_CPIO_O |
32 | //config: bool "Support for archive creation" | 32 | //config: bool "Support archive creation" |
33 | //config: default y | 33 | //config: default y |
34 | //config: depends on CPIO | 34 | //config: depends on CPIO |
35 | //config: help | 35 | //config: help |
@@ -37,7 +37,7 @@ | |||
37 | //config: format only. | 37 | //config: format only. |
38 | //config: | 38 | //config: |
39 | //config:config FEATURE_CPIO_P | 39 | //config:config FEATURE_CPIO_P |
40 | //config: bool "Support for passthrough mode" | 40 | //config: bool "Support passthrough mode" |
41 | //config: default y | 41 | //config: default y |
42 | //config: depends on FEATURE_CPIO_O | 42 | //config: depends on FEATURE_CPIO_O |
43 | //config: help | 43 | //config: help |
diff --git a/archival/gzip.c b/archival/gzip.c index 63bf76053..e698c26cd 100644 --- a/archival/gzip.c +++ b/archival/gzip.c | |||
@@ -48,11 +48,9 @@ aa: 85.1% -- replaced with aa.gz | |||
48 | //config: bool "Enable long options" | 48 | //config: bool "Enable long options" |
49 | //config: default y | 49 | //config: default y |
50 | //config: depends on GZIP && LONG_OPTS | 50 | //config: depends on GZIP && LONG_OPTS |
51 | //config: help | ||
52 | //config: Enable use of long options, increases size by about 106 Bytes | ||
53 | //config: | 51 | //config: |
54 | //config:config GZIP_FAST | 52 | //config:config GZIP_FAST |
55 | //config: int "Trade memory for gzip speed (0:small,slow - 2:fast,big)" | 53 | //config: int "Trade memory for speed (0:small,slow - 2:fast,big)" |
56 | //config: default 0 | 54 | //config: default 0 |
57 | //config: range 0 2 | 55 | //config: range 0 2 |
58 | //config: depends on GZIP | 56 | //config: depends on GZIP |
diff --git a/archival/tar.c b/archival/tar.c index 8e315c610..b1d58a2df 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -49,13 +49,15 @@ | |||
49 | //config: create compressed archives. It's probably the most widely used | 49 | //config: create compressed archives. It's probably the most widely used |
50 | //config: UNIX archive program. | 50 | //config: UNIX archive program. |
51 | //config: | 51 | //config: |
52 | //config:config FEATURE_TAR_LONG_OPTIONS | ||
53 | //config: bool "Enable long options" | ||
54 | //config: default y | ||
55 | //config: depends on TAR && LONG_OPTS | ||
56 | //config: | ||
52 | //config:config FEATURE_TAR_CREATE | 57 | //config:config FEATURE_TAR_CREATE |
53 | //config: bool "Enable archive creation" | 58 | //config: bool "Enable -c (archive creation)" |
54 | //config: default y | 59 | //config: default y |
55 | //config: depends on TAR | 60 | //config: depends on TAR |
56 | //config: help | ||
57 | //config: If you enable this option you'll be able to create | ||
58 | //config: tar archives using the `-c' option. | ||
59 | //config: | 61 | //config: |
60 | //config:config FEATURE_TAR_AUTODETECT | 62 | //config:config FEATURE_TAR_AUTODETECT |
61 | //config: bool "Autodetect compressed tarballs" | 63 | //config: bool "Autodetect compressed tarballs" |
@@ -74,7 +76,7 @@ | |||
74 | //config: a list of files to include or exclude from an archive. | 76 | //config: a list of files to include or exclude from an archive. |
75 | //config: | 77 | //config: |
76 | //config:config FEATURE_TAR_OLDGNU_COMPATIBILITY | 78 | //config:config FEATURE_TAR_OLDGNU_COMPATIBILITY |
77 | //config: bool "Support for old tar header format" | 79 | //config: bool "Support old tar header format" |
78 | //config: default y | 80 | //config: default y |
79 | //config: depends on TAR || DPKG | 81 | //config: depends on TAR || DPKG |
80 | //config: help | 82 | //config: help |
@@ -93,22 +95,12 @@ | |||
93 | //config: tarballs still exist. | 95 | //config: tarballs still exist. |
94 | //config: | 96 | //config: |
95 | //config:config FEATURE_TAR_GNU_EXTENSIONS | 97 | //config:config FEATURE_TAR_GNU_EXTENSIONS |
96 | //config: bool "Support for GNU tar extensions (long filenames)" | 98 | //config: bool "Support GNU tar extensions (long filenames)" |
97 | //config: default y | 99 | //config: default y |
98 | //config: depends on TAR || DPKG | 100 | //config: depends on TAR || DPKG |
99 | //config: help | ||
100 | //config: With this option busybox supports GNU long filenames and | ||
101 | //config: linknames. | ||
102 | //config: | ||
103 | //config:config FEATURE_TAR_LONG_OPTIONS | ||
104 | //config: bool "Enable long options" | ||
105 | //config: default y | ||
106 | //config: depends on TAR && LONG_OPTS | ||
107 | //config: help | ||
108 | //config: Enable use of long options, increases size by about 400 Bytes | ||
109 | //config: | 101 | //config: |
110 | //config:config FEATURE_TAR_TO_COMMAND | 102 | //config:config FEATURE_TAR_TO_COMMAND |
111 | //config: bool "Support for writing to an external program" | 103 | //config: bool "Support writing to an external program (--to-command)" |
112 | //config: default y | 104 | //config: default y |
113 | //config: depends on TAR && FEATURE_TAR_LONG_OPTIONS | 105 | //config: depends on TAR && FEATURE_TAR_LONG_OPTIONS |
114 | //config: help | 106 | //config: help |
@@ -121,20 +113,17 @@ | |||
121 | //config: default y | 113 | //config: default y |
122 | //config: depends on TAR | 114 | //config: depends on TAR |
123 | //config: help | 115 | //config: help |
124 | //config: Enables use of user and group names in tar. This affects contents | 116 | //config: Enable use of user and group names in tar. This affects contents |
125 | //config: listings (-t) and preserving permissions when unpacking (-p). | 117 | //config: listings (-t) and preserving permissions when unpacking (-p). |
126 | //config: +200 bytes. | 118 | //config: +200 bytes. |
127 | //config: | 119 | //config: |
128 | //config:config FEATURE_TAR_NOPRESERVE_TIME | 120 | //config:config FEATURE_TAR_NOPRESERVE_TIME |
129 | //config: bool "Enable -m (do not preserve time) option" | 121 | //config: bool "Enable -m (do not preserve time) GNU option" |
130 | //config: default y | 122 | //config: default y |
131 | //config: depends on TAR | 123 | //config: depends on TAR |
132 | //config: help | ||
133 | //config: With this option busybox supports GNU tar -m | ||
134 | //config: (do not preserve time) option. | ||
135 | //config: | 124 | //config: |
136 | //config:config FEATURE_TAR_SELINUX | 125 | //config:config FEATURE_TAR_SELINUX |
137 | //config: bool "Support for extracting SELinux labels" | 126 | //config: bool "Support extracting SELinux labels" |
138 | //config: default n | 127 | //config: default n |
139 | //config: depends on TAR && SELINUX | 128 | //config: depends on TAR && SELINUX |
140 | //config: help | 129 | //config: help |