aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/Config.src16
-rw-r--r--coreutils/chown.c2
-rw-r--r--coreutils/cp.c4
-rw-r--r--coreutils/dd.c4
-rw-r--r--coreutils/df.c8
-rw-r--r--coreutils/echo.c6
-rw-r--r--coreutils/env.c2
-rw-r--r--coreutils/expand.c4
-rw-r--r--coreutils/head.c4
-rw-r--r--coreutils/install.c2
-rw-r--r--coreutils/ls.c6
-rw-r--r--coreutils/md5_sha1_sum.c1
-rw-r--r--coreutils/mkdir.c2
-rw-r--r--coreutils/mv.c2
-rw-r--r--coreutils/split.c2
-rw-r--r--coreutils/tail.c7
-rw-r--r--coreutils/wc.c4
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
help
Allow cp and mv to preserve hard links.
-comment "Common options for ls, more and telnet"
- depends on LS || MORE || TELNET
-
-config FEATURE_AUTOWIDTH
- bool "Calculate terminal & column widths"
- default y
- depends on LS || MORE || TELNET
- help
- This option allows utilities such as 'ls', 'more' and 'telnet'
- to determine the width of the screen, which can allow them to
- display additional text or avoid wrapping text onto the next line.
- If you leave this disabled, your utilities will be especially
- primitive and will be unable to determine the current screen width.
-
comment "Common options for df, du, ls"
depends on DF || DU || LS
config FEATURE_HUMAN_READABLE
- bool "Support for human readable output (example 13k, 23M, 235G)"
+ bool "Support human readable output (example 13k, 23M, 235G)"
default y
depends on DF || DU || LS
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 @@
//config: bool "Enable long options"
//config: default y
//config: depends on CHOWN && LONG_OPTS
-//config: help
-//config: Enable use of long options
//applet:IF_CHOWN(APPLET_NOEXEC(chown, chown, BB_DIR_BIN, BB_SUID_DROP, chown))
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 @@
//config: cp is used to copy files and directories.
//config:
//config:config FEATURE_CP_LONG_OPTIONS
-//config: bool "Enable long options for cp"
+//config: bool "Enable long options"
//config: default y
//config: depends on CP && LONG_OPTS
//config: help
-//config: Enable long options for cp.
+//config: Enable long options.
//config: Also add support for --parents option.
//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 @@
//config: default y
//config: depends on DD
//config: help
-//config: Enables support for writing a certain number of bytes in and out,
+//config: Enable support for writing a certain number of bytes in and out,
//config: at a time, and performing conversions on the data stream.
//config:
//config:config FEATURE_DD_STATUS
@@ -49,7 +49,7 @@
//config: default y
//config: depends on DD
//config: help
-//config: Enables support for status=noxfer/none option.
+//config: Enable support for status=noxfer/none option.
//applet:IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd))
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 @@
//config: default y
//config: depends on DF
//config: help
-//config: This option enables -a, -i and -B.
-//config:
-//config: -a Show all filesystems
-//config: -i Inodes
-//config: -B <SIZE> Blocksize
+//config: -a Show all filesystems
+//config: -i Inodes
+//config: -B <SIZE> Blocksize
//applet:IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP))
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 @@
//config:
//config:# this entry also appears in shell/Config.in, next to the echo builtin
//config:config FEATURE_FANCY_ECHO
-//config: bool "Enable echo options (-n and -e)"
+//config: bool "Enable -n and -e options"
//config: default y
-//config: depends on ECHO || ASH_BUILTIN_ECHO || HUSH
-//config: help
-//config: This adds options (-n and -e) to echo.
+//config: depends on ECHO || ASH_BUILTIN_ECHO || HUSH_ECHO
//applet:IF_ECHO(APPLET_NOFORK(echo, echo, BB_DIR_BIN, BB_SUID_DROP, echo))
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 @@
//config: bool "Enable long options"
//config: default y
//config: depends on ENV && LONG_OPTS
-//config: help
-//config: Support long options for the env applet.
//applet:IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env))
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 @@
//config: bool "Enable long options"
//config: default y
//config: depends on EXPAND && LONG_OPTS
-//config: help
-//config: Support long options for the expand applet.
//config:
//config:config UNEXPAND
//config: bool "unexpand"
@@ -43,8 +41,6 @@
//config: bool "Enable long options"
//config: default y
//config: depends on UNEXPAND && LONG_OPTS
-//config: help
-//config: Support long options for the unexpand applet.
//applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP))
//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 @@
//config: from files.
//config:
//config:config FEATURE_FANCY_HEAD
-//config: bool "Enable head options (-c, -q, and -v)"
+//config: bool "Enable -c, -q, and -v"
//config: default y
//config: depends on HEAD
-//config: help
-//config: This enables the head options (-c, -q, and -v).
//applet:IF_HEAD(APPLET_NOEXEC(head, head, BB_DIR_USR_BIN, BB_SUID_DROP, head))
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 @@
//config: bool "Enable long options"
//config: default y
//config: depends on INSTALL && LONG_OPTS
-//config: help
-//config: Support long options for the install applet.
//applet:IF_INSTALL(APPLET(install, BB_DIR_USR_BIN, BB_SUID_DROP))
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 @@
//config: bool "Enable filetyping options (-p and -F)"
//config: default y
//config: depends on LS
-//config: help
-//config: Enable the ls options (-p and -F).
//config:
//config:config FEATURE_LS_FOLLOWLINKS
//config: bool "Enable symlinks dereferencing (-L)"
//config: default y
//config: depends on LS
-//config: help
-//config: Enable the ls option (-L).
//config:
//config:config FEATURE_LS_RECURSIVE
//config: bool "Enable recursion (-R)"
//config: default y
//config: depends on LS
-//config: help
-//config: Enable the ls option (-R).
//config:
//config:config FEATURE_LS_SORTFILES
//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 @@
//config: help
//config: Enabling the -c options allows files to be checked
//config: against pre-calculated hash values.
-//config:
//config: -s and -w are useful options when verifying checksums.
//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 @@
//config: bool "Enable long options"
//config: default y
//config: depends on MKDIR && LONG_OPTS
-//config: help
-//config: Support long options for the mkdir applet.
//applet:IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
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 @@
//config: bool "Enable long options"
//config: default y
//config: depends on MV && LONG_OPTS
-//config: help
-//config: Support long options for the mv applet.
//applet:IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
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 @@
//config: bool "split"
//config: default y
//config: help
-//config: split a file into pieces.
+//config: Split a file into pieces.
//config:
//config:config FEATURE_SPLIT_FANCY
//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 @@
//config: from files.
//config:
//config:config FEATURE_FANCY_TAIL
-//config: bool "Enable extra tail options (-q, -s, -v, and -F)"
+//config: bool "Enable -q, -s, -v, and -F options"
//config: default y
//config: depends on TAIL
//config: help
-//config: The options (-q, -s, -v and -F) are provided by GNU tail, but
-//config: are not specific in the SUSv3 standard.
-//config:
+//config: These options are provided by GNU tail, but
+//config: are not specific in the SUSv3 standard:
//config: -q Never output headers giving file names
//config: -s SEC Wait SEC seconds between reads with -f
//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 @@
//config: in specified files.
//config:
//config:config FEATURE_WC_LARGE
-//config: bool "Support very large files in wc"
+//config: bool "Support very large counts"
//config: default y
//config: depends on WC
//config: help
-//config: Use "unsigned long long" in wc for counter variables.
+//config: Use "unsigned long long" for counter variables.
//applet:IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP))