diff options
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/Config.src | 16 | ||||
-rw-r--r-- | coreutils/chown.c | 2 | ||||
-rw-r--r-- | coreutils/cp.c | 4 | ||||
-rw-r--r-- | coreutils/dd.c | 4 | ||||
-rw-r--r-- | coreutils/df.c | 8 | ||||
-rw-r--r-- | coreutils/echo.c | 6 | ||||
-rw-r--r-- | coreutils/env.c | 2 | ||||
-rw-r--r-- | coreutils/expand.c | 4 | ||||
-rw-r--r-- | coreutils/head.c | 4 | ||||
-rw-r--r-- | coreutils/install.c | 2 | ||||
-rw-r--r-- | coreutils/ls.c | 6 | ||||
-rw-r--r-- | coreutils/md5_sha1_sum.c | 1 | ||||
-rw-r--r-- | coreutils/mkdir.c | 2 | ||||
-rw-r--r-- | coreutils/mv.c | 2 | ||||
-rw-r--r-- | coreutils/split.c | 2 | ||||
-rw-r--r-- | coreutils/tail.c | 7 | ||||
-rw-r--r-- | coreutils/wc.c | 4 |
17 files changed, 17 insertions, 59 deletions
diff --git a/coreutils/Config.src b/coreutils/Config.src index c056320f8..1d2fea1fb 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src | |||
@@ -27,25 +27,11 @@ config FEATURE_PRESERVE_HARDLINKS | |||
27 | help | 27 | help |
28 | Allow cp and mv to preserve hard links. | 28 | Allow cp and mv to preserve hard links. |
29 | 29 | ||
30 | comment "Common options for ls, more and telnet" | ||
31 | depends on LS || MORE || TELNET | ||
32 | |||
33 | config FEATURE_AUTOWIDTH | ||
34 | bool "Calculate terminal & column widths" | ||
35 | default y | ||
36 | depends on LS || MORE || TELNET | ||
37 | help | ||
38 | This option allows utilities such as 'ls', 'more' and 'telnet' | ||
39 | to determine the width of the screen, which can allow them to | ||
40 | display additional text or avoid wrapping text onto the next line. | ||
41 | If you leave this disabled, your utilities will be especially | ||
42 | primitive and will be unable to determine the current screen width. | ||
43 | |||
44 | comment "Common options for df, du, ls" | 30 | comment "Common options for df, du, ls" |
45 | depends on DF || DU || LS | 31 | depends on DF || DU || LS |
46 | 32 | ||
47 | config FEATURE_HUMAN_READABLE | 33 | config FEATURE_HUMAN_READABLE |
48 | bool "Support for human readable output (example 13k, 23M, 235G)" | 34 | bool "Support human readable output (example 13k, 23M, 235G)" |
49 | default y | 35 | default y |
50 | depends on DF || DU || LS | 36 | depends on DF || DU || LS |
51 | help | 37 | help |
diff --git a/coreutils/chown.c b/coreutils/chown.c index 50b06d73a..12cd0eacc 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c | |||
@@ -17,8 +17,6 @@ | |||
17 | //config: bool "Enable long options" | 17 | //config: bool "Enable long options" |
18 | //config: default y | 18 | //config: default y |
19 | //config: depends on CHOWN && LONG_OPTS | 19 | //config: depends on CHOWN && LONG_OPTS |
20 | //config: help | ||
21 | //config: Enable use of long options | ||
22 | 20 | ||
23 | //applet:IF_CHOWN(APPLET_NOEXEC(chown, chown, BB_DIR_BIN, BB_SUID_DROP, chown)) | 21 | //applet:IF_CHOWN(APPLET_NOEXEC(chown, chown, BB_DIR_BIN, BB_SUID_DROP, chown)) |
24 | 22 | ||
diff --git a/coreutils/cp.c b/coreutils/cp.c index 4ecdaafda..1e5f36d10 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c | |||
@@ -18,11 +18,11 @@ | |||
18 | //config: cp is used to copy files and directories. | 18 | //config: cp is used to copy files and directories. |
19 | //config: | 19 | //config: |
20 | //config:config FEATURE_CP_LONG_OPTIONS | 20 | //config:config FEATURE_CP_LONG_OPTIONS |
21 | //config: bool "Enable long options for cp" | 21 | //config: bool "Enable long options" |
22 | //config: default y | 22 | //config: default y |
23 | //config: depends on CP && LONG_OPTS | 23 | //config: depends on CP && LONG_OPTS |
24 | //config: help | 24 | //config: help |
25 | //config: Enable long options for cp. | 25 | //config: Enable long options. |
26 | //config: Also add support for --parents option. | 26 | //config: Also add support for --parents option. |
27 | 27 | ||
28 | //applet:IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp)) | 28 | //applet:IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp)) |
diff --git a/coreutils/dd.c b/coreutils/dd.c index 3d1ba2ee6..5e68087fc 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
@@ -41,7 +41,7 @@ | |||
41 | //config: default y | 41 | //config: default y |
42 | //config: depends on DD | 42 | //config: depends on DD |
43 | //config: help | 43 | //config: help |
44 | //config: Enables support for writing a certain number of bytes in and out, | 44 | //config: Enable support for writing a certain number of bytes in and out, |
45 | //config: at a time, and performing conversions on the data stream. | 45 | //config: at a time, and performing conversions on the data stream. |
46 | //config: | 46 | //config: |
47 | //config:config FEATURE_DD_STATUS | 47 | //config:config FEATURE_DD_STATUS |
@@ -49,7 +49,7 @@ | |||
49 | //config: default y | 49 | //config: default y |
50 | //config: depends on DD | 50 | //config: depends on DD |
51 | //config: help | 51 | //config: help |
52 | //config: Enables support for status=noxfer/none option. | 52 | //config: Enable support for status=noxfer/none option. |
53 | 53 | ||
54 | //applet:IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd)) | 54 | //applet:IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd)) |
55 | 55 | ||
diff --git a/coreutils/df.c b/coreutils/df.c index 79e4c4670..cf367161a 100644 --- a/coreutils/df.c +++ b/coreutils/df.c | |||
@@ -29,11 +29,9 @@ | |||
29 | //config: default y | 29 | //config: default y |
30 | //config: depends on DF | 30 | //config: depends on DF |
31 | //config: help | 31 | //config: help |
32 | //config: This option enables -a, -i and -B. | 32 | //config: -a Show all filesystems |
33 | //config: | 33 | //config: -i Inodes |
34 | //config: -a Show all filesystems | 34 | //config: -B <SIZE> Blocksize |
35 | //config: -i Inodes | ||
36 | //config: -B <SIZE> Blocksize | ||
37 | 35 | ||
38 | //applet:IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP)) | 36 | //applet:IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP)) |
39 | 37 | ||
diff --git a/coreutils/echo.c b/coreutils/echo.c index fd0d9b780..d0dba650d 100644 --- a/coreutils/echo.c +++ b/coreutils/echo.c | |||
@@ -26,11 +26,9 @@ | |||
26 | //config: | 26 | //config: |
27 | //config:# this entry also appears in shell/Config.in, next to the echo builtin | 27 | //config:# this entry also appears in shell/Config.in, next to the echo builtin |
28 | //config:config FEATURE_FANCY_ECHO | 28 | //config:config FEATURE_FANCY_ECHO |
29 | //config: bool "Enable echo options (-n and -e)" | 29 | //config: bool "Enable -n and -e options" |
30 | //config: default y | 30 | //config: default y |
31 | //config: depends on ECHO || ASH_BUILTIN_ECHO || HUSH | 31 | //config: depends on ECHO || ASH_BUILTIN_ECHO || HUSH_ECHO |
32 | //config: help | ||
33 | //config: This adds options (-n and -e) to echo. | ||
34 | 32 | ||
35 | //applet:IF_ECHO(APPLET_NOFORK(echo, echo, BB_DIR_BIN, BB_SUID_DROP, echo)) | 33 | //applet:IF_ECHO(APPLET_NOFORK(echo, echo, BB_DIR_BIN, BB_SUID_DROP, echo)) |
36 | 34 | ||
diff --git a/coreutils/env.c b/coreutils/env.c index e91eddb5c..2bd5f41d0 100644 --- a/coreutils/env.c +++ b/coreutils/env.c | |||
@@ -35,8 +35,6 @@ | |||
35 | //config: bool "Enable long options" | 35 | //config: bool "Enable long options" |
36 | //config: default y | 36 | //config: default y |
37 | //config: depends on ENV && LONG_OPTS | 37 | //config: depends on ENV && LONG_OPTS |
38 | //config: help | ||
39 | //config: Support long options for the env applet. | ||
40 | 38 | ||
41 | //applet:IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env)) | 39 | //applet:IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env)) |
42 | 40 | ||
diff --git a/coreutils/expand.c b/coreutils/expand.c index bb59af46d..29affc932 100644 --- a/coreutils/expand.c +++ b/coreutils/expand.c | |||
@@ -30,8 +30,6 @@ | |||
30 | //config: bool "Enable long options" | 30 | //config: bool "Enable long options" |
31 | //config: default y | 31 | //config: default y |
32 | //config: depends on EXPAND && LONG_OPTS | 32 | //config: depends on EXPAND && LONG_OPTS |
33 | //config: help | ||
34 | //config: Support long options for the expand applet. | ||
35 | //config: | 33 | //config: |
36 | //config:config UNEXPAND | 34 | //config:config UNEXPAND |
37 | //config: bool "unexpand" | 35 | //config: bool "unexpand" |
@@ -43,8 +41,6 @@ | |||
43 | //config: bool "Enable long options" | 41 | //config: bool "Enable long options" |
44 | //config: default y | 42 | //config: default y |
45 | //config: depends on UNEXPAND && LONG_OPTS | 43 | //config: depends on UNEXPAND && LONG_OPTS |
46 | //config: help | ||
47 | //config: Support long options for the unexpand applet. | ||
48 | 44 | ||
49 | //applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP)) | 45 | //applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP)) |
50 | //applet:IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand)) | 46 | //applet:IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand)) |
diff --git a/coreutils/head.c b/coreutils/head.c index 176e91e3a..d49113e7f 100644 --- a/coreutils/head.c +++ b/coreutils/head.c | |||
@@ -14,11 +14,9 @@ | |||
14 | //config: from files. | 14 | //config: from files. |
15 | //config: | 15 | //config: |
16 | //config:config FEATURE_FANCY_HEAD | 16 | //config:config FEATURE_FANCY_HEAD |
17 | //config: bool "Enable head options (-c, -q, and -v)" | 17 | //config: bool "Enable -c, -q, and -v" |
18 | //config: default y | 18 | //config: default y |
19 | //config: depends on HEAD | 19 | //config: depends on HEAD |
20 | //config: help | ||
21 | //config: This enables the head options (-c, -q, and -v). | ||
22 | 20 | ||
23 | //applet:IF_HEAD(APPLET_NOEXEC(head, head, BB_DIR_USR_BIN, BB_SUID_DROP, head)) | 21 | //applet:IF_HEAD(APPLET_NOEXEC(head, head, BB_DIR_USR_BIN, BB_SUID_DROP, head)) |
24 | 22 | ||
diff --git a/coreutils/install.c b/coreutils/install.c index 831f9b802..2a642bdb6 100644 --- a/coreutils/install.c +++ b/coreutils/install.c | |||
@@ -15,8 +15,6 @@ | |||
15 | //config: bool "Enable long options" | 15 | //config: bool "Enable long options" |
16 | //config: default y | 16 | //config: default y |
17 | //config: depends on INSTALL && LONG_OPTS | 17 | //config: depends on INSTALL && LONG_OPTS |
18 | //config: help | ||
19 | //config: Support long options for the install applet. | ||
20 | 18 | ||
21 | //applet:IF_INSTALL(APPLET(install, BB_DIR_USR_BIN, BB_SUID_DROP)) | 19 | //applet:IF_INSTALL(APPLET(install, BB_DIR_USR_BIN, BB_SUID_DROP)) |
22 | 20 | ||
diff --git a/coreutils/ls.c b/coreutils/ls.c index 0f35c70d5..531eb85b5 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -37,22 +37,16 @@ | |||
37 | //config: bool "Enable filetyping options (-p and -F)" | 37 | //config: bool "Enable filetyping options (-p and -F)" |
38 | //config: default y | 38 | //config: default y |
39 | //config: depends on LS | 39 | //config: depends on LS |
40 | //config: help | ||
41 | //config: Enable the ls options (-p and -F). | ||
42 | //config: | 40 | //config: |
43 | //config:config FEATURE_LS_FOLLOWLINKS | 41 | //config:config FEATURE_LS_FOLLOWLINKS |
44 | //config: bool "Enable symlinks dereferencing (-L)" | 42 | //config: bool "Enable symlinks dereferencing (-L)" |
45 | //config: default y | 43 | //config: default y |
46 | //config: depends on LS | 44 | //config: depends on LS |
47 | //config: help | ||
48 | //config: Enable the ls option (-L). | ||
49 | //config: | 45 | //config: |
50 | //config:config FEATURE_LS_RECURSIVE | 46 | //config:config FEATURE_LS_RECURSIVE |
51 | //config: bool "Enable recursion (-R)" | 47 | //config: bool "Enable recursion (-R)" |
52 | //config: default y | 48 | //config: default y |
53 | //config: depends on LS | 49 | //config: depends on LS |
54 | //config: help | ||
55 | //config: Enable the ls option (-R). | ||
56 | //config: | 50 | //config: |
57 | //config:config FEATURE_LS_SORTFILES | 51 | //config:config FEATURE_LS_SORTFILES |
58 | //config: bool "Sort the file names" | 52 | //config: bool "Sort the file names" |
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c index 783f44027..76788554c 100644 --- a/coreutils/md5_sha1_sum.c +++ b/coreutils/md5_sha1_sum.c | |||
@@ -45,7 +45,6 @@ | |||
45 | //config: help | 45 | //config: help |
46 | //config: Enabling the -c options allows files to be checked | 46 | //config: Enabling the -c options allows files to be checked |
47 | //config: against pre-calculated hash values. | 47 | //config: against pre-calculated hash values. |
48 | //config: | ||
49 | //config: -s and -w are useful options when verifying checksums. | 48 | //config: -s and -w are useful options when verifying checksums. |
50 | 49 | ||
51 | //applet:IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum)) | 50 | //applet:IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum)) |
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c index 3afe76c28..fcc34f1ad 100644 --- a/coreutils/mkdir.c +++ b/coreutils/mkdir.c | |||
@@ -23,8 +23,6 @@ | |||
23 | //config: bool "Enable long options" | 23 | //config: bool "Enable long options" |
24 | //config: default y | 24 | //config: default y |
25 | //config: depends on MKDIR && LONG_OPTS | 25 | //config: depends on MKDIR && LONG_OPTS |
26 | //config: help | ||
27 | //config: Support long options for the mkdir applet. | ||
28 | 26 | ||
29 | //applet:IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir)) | 27 | //applet:IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir)) |
30 | 28 | ||
diff --git a/coreutils/mv.c b/coreutils/mv.c index 1cc318fd1..df2ef0a52 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c | |||
@@ -21,8 +21,6 @@ | |||
21 | //config: bool "Enable long options" | 21 | //config: bool "Enable long options" |
22 | //config: default y | 22 | //config: default y |
23 | //config: depends on MV && LONG_OPTS | 23 | //config: depends on MV && LONG_OPTS |
24 | //config: help | ||
25 | //config: Support long options for the mv applet. | ||
26 | 24 | ||
27 | //applet:IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP)) | 25 | //applet:IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP)) |
28 | 26 | ||
diff --git a/coreutils/split.c b/coreutils/split.c index 50918a1ce..7af359d0e 100644 --- a/coreutils/split.c +++ b/coreutils/split.c | |||
@@ -9,7 +9,7 @@ | |||
9 | //config: bool "split" | 9 | //config: bool "split" |
10 | //config: default y | 10 | //config: default y |
11 | //config: help | 11 | //config: help |
12 | //config: split a file into pieces. | 12 | //config: Split a file into pieces. |
13 | //config: | 13 | //config: |
14 | //config:config FEATURE_SPLIT_FANCY | 14 | //config:config FEATURE_SPLIT_FANCY |
15 | //config: bool "Fancy extensions" | 15 | //config: bool "Fancy extensions" |
diff --git a/coreutils/tail.c b/coreutils/tail.c index 99f58ddd8..e7a24a7a8 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c | |||
@@ -26,13 +26,12 @@ | |||
26 | //config: from files. | 26 | //config: from files. |
27 | //config: | 27 | //config: |
28 | //config:config FEATURE_FANCY_TAIL | 28 | //config:config FEATURE_FANCY_TAIL |
29 | //config: bool "Enable extra tail options (-q, -s, -v, and -F)" | 29 | //config: bool "Enable -q, -s, -v, and -F options" |
30 | //config: default y | 30 | //config: default y |
31 | //config: depends on TAIL | 31 | //config: depends on TAIL |
32 | //config: help | 32 | //config: help |
33 | //config: The options (-q, -s, -v and -F) are provided by GNU tail, but | 33 | //config: These options are provided by GNU tail, but |
34 | //config: are not specific in the SUSv3 standard. | 34 | //config: are not specific in the SUSv3 standard: |
35 | //config: | ||
36 | //config: -q Never output headers giving file names | 35 | //config: -q Never output headers giving file names |
37 | //config: -s SEC Wait SEC seconds between reads with -f | 36 | //config: -s SEC Wait SEC seconds between reads with -f |
38 | //config: -v Always output headers giving file names | 37 | //config: -v Always output headers giving file names |
diff --git a/coreutils/wc.c b/coreutils/wc.c index 73837141e..4c53049b0 100644 --- a/coreutils/wc.c +++ b/coreutils/wc.c | |||
@@ -40,11 +40,11 @@ | |||
40 | //config: in specified files. | 40 | //config: in specified files. |
41 | //config: | 41 | //config: |
42 | //config:config FEATURE_WC_LARGE | 42 | //config:config FEATURE_WC_LARGE |
43 | //config: bool "Support very large files in wc" | 43 | //config: bool "Support very large counts" |
44 | //config: default y | 44 | //config: default y |
45 | //config: depends on WC | 45 | //config: depends on WC |
46 | //config: help | 46 | //config: help |
47 | //config: Use "unsigned long long" in wc for counter variables. | 47 | //config: Use "unsigned long long" for counter variables. |
48 | 48 | ||
49 | //applet:IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP)) | 49 | //applet:IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP)) |
50 | 50 | ||