Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge

Conflicts:
	procps/ps.c

51 files changed, 78 insertions, 93 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index 2769aa07d..dcb5add8f 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -276,12 +276,6 @@ config HOSTID
           hostid prints the numeric identifier (in hexadecimal) for
           the current host.
 
-config ID
-        bool "id"
-        default y
-        help
-          id displays the current user and group ID names.
-
 config INSTALL
         bool "install"
         default y
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src
index 6a41c8318..0681e44b0 100644
--- a/coreutils/Kbuild.src
+++ b/coreutils/Kbuild.src
@@ -37,7 +37,6 @@ lib-$(CONFIG_FOLD)      += fold.o
 lib-$(CONFIG_FSYNC)     += fsync.o
 lib-$(CONFIG_HEAD)      += head.o
 lib-$(CONFIG_HOSTID)    += hostid.o
-lib-$(CONFIG_ID)        += id.o
 lib-$(CONFIG_INSTALL)   += install.o
 #lib-$(CONFIG_LENGTH)    += length.o
 lib-$(CONFIG_LN)        += ln.o
diff --git a/coreutils/cal.c b/coreutils/cal.c
index ef1c29bb9..b470ad968 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -21,7 +21,6 @@
 //usage:       "[-jy] [[MONTH] YEAR]"
 //usage:#define cal_full_usage "\n\n"
 //usage:       "Display a calendar\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -j      Use julian dates"
 //usage:     "\n        -y      Display the entire year"
 
diff --git a/coreutils/catv.c b/coreutils/catv.c
index 37c7ed2d1..214b4311a 100644
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -14,7 +14,6 @@
 //usage:       "[-etv] [FILE]..."
 //usage:#define catv_full_usage "\n\n"
 //usage:       "Display nonprinting characters as ^x or M-x\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -e      End each line with $"
 //usage:     "\n        -t      Show tabs as ^I"
 //usage:     "\n        -v      Don't use ^x or M-x escapes"
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index bc9608362..7076db62f 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -15,7 +15,6 @@
 //usage:       "[-RhLHP"IF_DESKTOP("cvf")"]... GROUP FILE..."
 //usage:#define chgrp_full_usage "\n\n"
 //usage:       "Change the group membership of each FILE to GROUP\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -R      Recurse"
 //usage:     "\n        -h      Affect symlinks instead of symlink targets"
 //usage:     "\n        -L      Traverse all symlinks to directories"
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index 0bcd6bb66..5ee45b942 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -19,7 +19,6 @@
 //usage:#define chmod_full_usage "\n\n"
 //usage:       "Each MODE is one or more of the letters ugoa, one of the\n"
 //usage:       "symbols +-= and one or more of the letters rwxst\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -R      Recurse"
 //usage:        IF_DESKTOP(
 //usage:     "\n        -c      List changed files"
diff --git a/coreutils/chown.c b/coreutils/chown.c
index c4c182d3c..bb166d8fe 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -14,7 +14,6 @@
 //usage:       "[-RhLHP"IF_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
 //usage:#define chown_full_usage "\n\n"
 //usage:       "Change the owner and/or group of each FILE to OWNER and/or GROUP\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -R      Recurse"
 //usage:     "\n        -h      Affect symlinks instead of symlink targets"
 //usage:     "\n        -L      Traverse all symlinks to directories"
diff --git a/coreutils/comm.c b/coreutils/comm.c
index 7da6b25f9..cd450950b 100644
--- a/coreutils/comm.c
+++ b/coreutils/comm.c
@@ -11,7 +11,6 @@
 //usage:       "[-123] FILE1 FILE2"
 //usage:#define comm_full_usage "\n\n"
 //usage:       "Compare FILE1 with FILE2\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -1      Suppress lines unique to FILE1"
 //usage:     "\n        -2      Suppress lines unique to FILE2"
 //usage:     "\n        -3      Suppress lines common to both files"
diff --git a/coreutils/cp.c b/coreutils/cp.c
index c35dc2872..f276d25d7 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -19,7 +19,6 @@
 //usage:       "[OPTIONS] SOURCE DEST"
 //usage:#define cp_full_usage "\n\n"
 //usage:       "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -a      Same as -dpR"
 //usage:        IF_SELINUX(
 //usage:     "\n        -c      Preserve security context"
diff --git a/coreutils/cut.c b/coreutils/cut.c
index dfa1833b4..2c27b704f 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -13,7 +13,6 @@
 //usage:       "[OPTIONS] [FILE]..."
 //usage:#define cut_full_usage "\n\n"
 //usage:       "Print selected fields from each input FILE to stdout\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -b LIST Output only bytes from LIST"
 //usage:     "\n        -c LIST Output only characters from LIST"
 //usage:     "\n        -d CHAR Use CHAR instead of tab as the field delimiter"
diff --git a/coreutils/date.c b/coreutils/date.c
index 497031991..d90e620a0 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -98,7 +98,6 @@
 //usage:       "[OPTIONS] [+FMT] [TIME]"
 //usage:#define date_full_usage "\n\n"
 //usage:       "Display time (using +FMT), or set time\n"
-//usage:     "\nOptions:"
 //usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        [-s] TIME       Set time to TIME"
 //usage:     "\n        -u              Work in UTC (don't convert to local time)"
diff --git a/coreutils/dd.c b/coreutils/dd.c
index e4b53c0af..f6869cb26 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -13,7 +13,6 @@
 //usage:       "        [seek=N]" IF_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync]")
 //usage:#define dd_full_usage "\n\n"
 //usage:       "Copy a file with converting and formatting\n"
-//usage:     "\nOptions:"
 //usage:     "\n        if=FILE         Read from FILE instead of stdin"
 //usage:     "\n        of=FILE         Write to FILE instead of stdout"
 //usage:     "\n        bs=N            Read and write N bytes at a time"
diff --git a/coreutils/df.c b/coreutils/df.c
index 518e856a2..846cb38ad 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -29,7 +29,6 @@
 //usage:        "] [FILESYSTEM]..."
 //usage:#define df_full_usage "\n\n"
 //usage:       "Print filesystem usage statistics\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -P      POSIX output format"
 //usage:     "\n        -k      1024-byte blocks (default)"
 //usage:        IF_FEATURE_HUMAN_READABLE(
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index add1da666..e1fbe8538 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -17,7 +17,6 @@
 //usage:#define dos2unix_full_usage "\n\n"
 //usage:       "Convert FILE in-place from DOS to Unix format.\n"
 //usage:       "When no file is given, use stdin/stdout.\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -u      dos2unix"
 //usage:     "\n        -d      unix2dos"
 //usage:
@@ -26,7 +25,6 @@
 //usage:#define unix2dos_full_usage "\n\n"
 //usage:       "Convert FILE in-place from Unix to DOS format.\n"
 //usage:       "When no file is given, use stdin/stdout.\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -u      dos2unix"
 //usage:     "\n        -d      unix2dos"
 
diff --git a/coreutils/du.c b/coreutils/du.c
index 7a6662d1e..b8bbe3d9e 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -31,7 +31,6 @@
 //usage:        IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024")
 //usage:        IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512")
 //usage:       " bytes.\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -a      Show file sizes too"
 //usage:     "\n        -L      Follow all symlinks"
 //usage:     "\n        -H      Follow symlinks on command line"
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 0895e2940..9663894ec 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -28,7 +28,6 @@
 //usage:#define echo_full_usage "\n\n"
 //usage:       "Print the specified ARGs to stdout"
 //usage:        IF_FEATURE_FANCY_ECHO( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n      Suppress trailing newline"
 //usage:     "\n        -e      Interpret backslash escapes (i.e., \\t=tab)"
 //usage:     "\n        -E      Don't interpret backslash escapes (default)"
diff --git a/coreutils/env.c b/coreutils/env.c
index 747c668da..807ef13e9 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -36,7 +36,6 @@
 //usage:#define env_full_usage "\n\n"
 //usage:       "Print the current environment or run PROG after setting up\n"
 //usage:       "the specified environment\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -, -i   Start with an empty environment"
 //usage:     "\n        -u      Remove variable from the environment"
 
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 73ab0ece3..25bbffc66 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -25,7 +25,6 @@
 //usage:       "[-i] [-t N] [FILE]..."
 //usage:#define expand_full_usage "\n\n"
 //usage:       "Convert tabs to spaces, writing to stdout\n"
-//usage:     "\nOptions:"
 //usage:        IF_FEATURE_EXPAND_LONG_OPTIONS(
 //usage:     "\n        -i,--initial    Don't convert tabs after non blanks"
 //usage:     "\n        -t,--tabs=N     Tabstops every N chars"
@@ -39,7 +38,6 @@
 //usage:       "[-fa][-t N] [FILE]..."
 //usage:#define unexpand_full_usage "\n\n"
 //usage:       "Convert spaces to tabs, writing to stdout\n"
-//usage:     "\nOptions:"
 //usage:        IF_FEATURE_UNEXPAND_LONG_OPTIONS(
 //usage:     "\n        -a,--all        Convert all blanks"
 //usage:     "\n        -f,--first-only Convert only leading blanks"
diff --git a/coreutils/fold.c b/coreutils/fold.c
index 3fe668512..0e7306377 100644
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -14,7 +14,6 @@
 //usage:       "[-bs] [-w WIDTH] [FILE]..."
 //usage:#define fold_full_usage "\n\n"
 //usage:       "Wrap input lines in each FILE (or stdin), writing to stdout\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -b      Count bytes rather than columns"
 //usage:     "\n        -s      Break at spaces"
 //usage:     "\n        -w      Use WIDTH columns instead of 80"
diff --git a/coreutils/fsync.c b/coreutils/fsync.c
index 518c5642b..652a41c33 100644
--- a/coreutils/fsync.c
+++ b/coreutils/fsync.c
@@ -11,7 +11,6 @@
 //usage:       "[-d] FILE..."
 //usage:#define fsync_full_usage "\n\n"
 //usage:       "Write files' buffered blocks to disk\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -d      Avoid syncing metadata"
 
 #include "libbb.h"
diff --git a/coreutils/head.c b/coreutils/head.c
index f49320ef4..ec4512765 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -16,7 +16,6 @@
 //usage:#define head_full_usage "\n\n"
 //usage:       "Print first 10 lines of each FILE (or stdin) to stdout.\n"
 //usage:       "With more than one FILE, precede each with a filename header.\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n N[kbm]       Print first N lines"
 //usage:        IF_FEATURE_FANCY_HEAD(
 //usage:     "\n        -c N[kbm]       Print first N bytes"
diff --git a/coreutils/id.c b/coreutils/id.c
index 42ed4c749..399d25e34 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -15,11 +15,28 @@
  * Added -G option Tito Ragusa (C) 2008 for SUSv3.
  */
 
+//config:config ID
+//config:       bool "id"
+//config:       default y
+//config:       help
+//config:         id displays the current user and group ID names.
+
+//config:config GROUPS
+//config:       bool "groups"
+//config:       default y
+//config:       help
+//config:         Print the group names associated with current user id.
+
+//kbuild:lib-$(CONFIG_GROUPS) += id.o
+//kbuild:lib-$(CONFIG_ID)     += id.o
+
+//applet:IF_GROUPS(APPLET_NOEXEC(groups, id, BB_DIR_USR_BIN, BB_SUID_DROP, groups))
+//applet:IF_ID(    APPLET_NOEXEC(id,     id, BB_DIR_USR_BIN, BB_SUID_DROP, id    ))
+
 //usage:#define id_trivial_usage
 //usage:       "[OPTIONS] [USER]"
 //usage:#define id_full_usage "\n\n"
 //usage:       "Print information about USER or the current user\n"
-//usage:     "\nOptions:"
 //usage:        IF_SELINUX(
 //usage:     "\n        -Z      Security context"
 //usage:        )
@@ -33,6 +50,15 @@
 //usage:       "$ id\n"
 //usage:       "uid=1000(andersen) gid=1000(andersen)\n"
 
+//usage:#define groups_trivial_usage
+//usage:       "[USER]"
+//usage:#define groups_full_usage "\n\n"
+//usage:       "Print the group memberships of USER or for the current process"
+//usage:
+//usage:#define groups_example_usage
+//usage:       "$ groups\n"
+//usage:       "andersen lp dialout cdrom floppy\n"
+
 #include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
@@ -91,7 +117,7 @@ static int print_user(uid_t id, const char *prefix)
 
 /* On error set *n < 0 and return >= 0
  * If *n is too small, update it and return < 0
- *  (ok to trash groups[] in both cases)
+ * (ok to trash groups[] in both cases)
  * Otherwise fill in groups[] and return >= 0
  */
 static int get_groups(const char *username, gid_t rgid, gid_t *groups, int *n)
@@ -105,20 +131,19 @@ static int get_groups(const char *username, gid_t rgid, gid_t *groups, int *n)
                 m = getgrouplist(username, rgid, groups, n);
                 /* I guess *n < 0 might indicate error. Anyway,
                  * malloc'ing -1 bytes won't be good, so: */
-                //if (*n < 0)
-                //      return 0;
-                //return m;
-                //commented out here, happens below anyway
-        } else {
-                /* On error -1 is returned, which ends up in *n */
-                int nn = getgroups(*n, groups);
-                /* 0: nn <= *n, groups[] was big enough; -1 otherwise */
-                m = - (nn > *n);
-                *n = nn;
+                if (*n < 0)
+                        return 0;
+                return m;
         }
-        if (*n < 0)
-                return 0; /* error, don't return < 0! */
-        return m;
+
+        *n = getgroups(*n, groups);
+        if (*n >= 0)
+                return *n;
+        /* Error */
+        if (errno == EINVAL) /* *n is too small? */
+                *n = getgroups(0, groups); /* get needed *n */
+        /* if *n >= 0, return -1 (got new *n), else return 0 (error): */
+        return -(*n >= 0);
 }
 
 int id_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -136,11 +161,22 @@ int id_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_SELINUX
         security_context_t scontext = NULL;
 #endif
-        /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/
-        /* Don't allow more than one username */
-        opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG"
+
+        if (ENABLE_GROUPS && (!ENABLE_ID || applet_name[0] == 'g')) {
+                /* TODO: coreutils groups prepend "USER : " prefix,
+                 * and accept many usernames. Example:
+                 * # groups root root
+                 * root : root
+                 * root : root
+                 */
+                opt = option_mask32 = getopt32(argv, "") | JUST_ALL_GROUPS | NAME_NOT_NUMBER;
+        } else {
+                /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/
+                /* Don't allow more than one username */
+                opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG"
                          IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G");
-        opt = getopt32(argv, "rnugG" IF_SELINUX("Z"));
+                opt = getopt32(argv, "rnugG" IF_SELINUX("Z"));
+        }
 
         username = argv[optind];
         if (username) {
@@ -177,11 +213,11 @@ int id_main(int argc UNUSED_PARAM, char **argv)
                 /* We are supplying largish buffer, trying
                  * to not run get_groups() twice. That might be slow
                  * ("user database in remote SQL server" case) */
-                groups = xmalloc(64 * sizeof(gid_t));
+                groups = xmalloc(64 * sizeof(groups[0]));
                 n = 64;
                 if (get_groups(username, rgid, groups, &n) < 0) {
                         /* Need bigger buffer after all */
-                        groups = xrealloc(groups, n * sizeof(gid_t));
+                        groups = xrealloc(groups, n * sizeof(groups[0]));
                         get_groups(username, rgid, groups, &n);
                 }
                 if (n > 0) {
diff --git a/coreutils/install.c b/coreutils/install.c
index fe5f26e79..445497f9a 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -11,7 +11,6 @@
 //usage:        "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST"
 //usage:#define install_full_usage "\n\n"
 //usage:       "Copy files and set attributes\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Just copy (default)"
 //usage:     "\n        -d      Create directories"
 //usage:     "\n        -D      Create leading target directories"
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 2da915a68..88a9a8f91 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -15,7 +15,6 @@
 //usage:       "[OPTIONS] TARGET... LINK|DIR"
 //usage:#define ln_full_usage "\n\n"
 //usage:       "Create a link LINK or DIR/TARGET to the specified TARGET(s)\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -s      Make symlinks instead of hardlinks"
 //usage:     "\n        -f      Remove existing destinations"
 //usage:     "\n        -n      Don't dereference symlinks - treat like normal file"
diff --git a/coreutils/ls.c b/coreutils/ls.c
index c967fd462..4abf84513 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -42,7 +42,6 @@
 //usage:        IF_FEATURE_AUTOWIDTH(" [-w WIDTH]") " [FILE]..."
 //usage:#define ls_full_usage "\n\n"
 //usage:       "List directory contents\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -1      One column output"
 //usage:     "\n        -a      Include entries which start with ."
 //usage:     "\n        -A      Like -a, but exclude . and .."
@@ -183,11 +182,10 @@ LIST_LONG       = LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | LIST_SIZE | \
 /* -Q       GNU option, busybox always supports */
 /* -k       SELinux option, busybox always supports (ignores if !SELinux) */
 /*          Std has -k which means "show sizes in kbytes" */
-/* -FLHRctur Std options, busybox optionally supports */
-/* -p       Std option, busybox optionally supports */
-/*          Not fully compatible - we show not only '/' but other chars too */
+/* -LHRctur Std options, busybox optionally supports */
+/* -Fp      Std options, busybox optionally supports */
 /* -SXvhTw  GNU options, busybox optionally supports */
-/*          -T TABWIDTH is ignored (we don't use tabs on output) */
+/* -T WIDTH Ignored (we don't use tabs on output) */
 /* -KZ      SELinux mandated options, busybox optionally supports */
 /*          (coreutils 8.4 has no -K, remove it?) */
 /* -e       I think we made this one up (looks similar to GNU --full-time) */
@@ -884,19 +882,29 @@ static int sortcmp(const void *a, const void *b)
         // instead of branch forest
         if (sort_opts == SORT_SIZE) {
                 dif = (d2->dn_size - d1->dn_size);
-        } else if (sort_opts == SORT_ATIME) {
+        } else
+        if (sort_opts == SORT_ATIME) {
                 dif = (d2->dn_atime - d1->dn_atime);
-        } else if (sort_opts == SORT_CTIME) {
+        } else
+        if (sort_opts == SORT_CTIME) {
                 dif = (d2->dn_ctime - d1->dn_ctime);
-        } else if (sort_opts == SORT_MTIME) {
+        } else
+        if (sort_opts == SORT_MTIME) {
                 dif = (d2->dn_mtime - d1->dn_mtime);
-        } else if (sort_opts == SORT_DIR) {
+        } else
+        if (sort_opts == SORT_DIR) {
                 dif = S_ISDIR(d2->dn_mode) - S_ISDIR(d1->dn_mode);
-                /* } else if (sort_opts == SORT_VERSION) { */
-                /* } else if (sort_opts == SORT_EXT) { */
+        } else
+#if defined(HAVE_STRVERSCMP) && HAVE_STRVERSCMP == 1
+        if (sort_opts == SORT_VERSION) {
+                dif = strverscmp(d1->name, d2->name);
+        } else
+#endif
+        if (sort_opts == SORT_EXT) {
+                dif = strcmp(strchrnul(d1->name, '.'), strchrnul(d2->name, '.'));
         }
         if (dif == 0) {
-                /* sort by name, or tie_breaker for other sorts */
+                /* sort by name, use as tie breaker for other sorts */
                 if (ENABLE_LOCALE_SUPPORT)
                         dif = strcoll(d1->name, d2->name);
                 else
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 050d46701..53fd4d1a8 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -12,7 +12,6 @@
 //usage:#define md5sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums"
 //usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Check sums against given list"
 //usage:     "\n        -s      Don't output anything, status code shows success"
 //usage:     "\n        -w      Warn about improperly formatted checksum lines"
@@ -34,7 +33,6 @@
 //usage:#define sha1sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums"
 //usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Check sums against given list"
 //usage:     "\n        -s      Don't output anything, status code shows success"
 //usage:     "\n        -w      Warn about improperly formatted checksum lines"
@@ -46,7 +44,6 @@
 //usage:#define sha256sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA256 checksums"
 //usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Check sums against given list"
 //usage:     "\n        -s      Don't output anything, status code shows success"
 //usage:     "\n        -w      Warn about improperly formatted checksum lines"
@@ -58,7 +55,6 @@
 //usage:#define sha512sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA512 checksums"
 //usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Check sums against given list"
 //usage:     "\n        -s      Don't output anything, status code shows success"
 //usage:     "\n        -w      Warn about improperly formatted checksum lines"
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index e425bbe5e..a4429b1cb 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -23,7 +23,6 @@
 //usage:       "[OPTIONS] DIRECTORY..."
 //usage:#define mkdir_full_usage "\n\n"
 //usage:       "Create DIRECTORY\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -m MODE Mode"
 //usage:     "\n        -p      No error if exists; make parent directories as needed"
 //usage:        IF_SELINUX(
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index 84d8d99dd..ef58325b3 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -14,7 +14,6 @@
 //usage:       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME"
 //usage:#define mkfifo_full_usage "\n\n"
 //usage:       "Create named pipe\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -m MODE Mode (default a=rw)"
 //usage:        IF_SELINUX(
 //usage:     "\n        -Z      Set security context"
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 50dbd62e3..32d3659ac 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -13,7 +13,6 @@
 //usage:       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE MAJOR MINOR"
 //usage:#define mknod_full_usage "\n\n"
 //usage:       "Create a special file (block, character, or pipe)\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -m MODE Creation mode (default a=rw)"
 //usage:        IF_SELINUX(
 //usage:     "\n        -Z      Set security context"
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 399f391b2..87f4cd5a5 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -21,7 +21,6 @@
 //usage:       "or: mv [-fin] SOURCE... DIRECTORY"
 //usage:#define mv_full_usage "\n\n"
 //usage:       "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -f      Don't prompt before overwriting"
 //usage:     "\n        -i      Interactive, prompt before overwrite"
 //usage:     "\n        -n      Don't overwrite an existing file"
diff --git a/coreutils/nice.c b/coreutils/nice.c
index 2763986e7..ce759916f 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -11,7 +11,6 @@
 //usage:       "[-n ADJUST] [PROG ARGS]"
 //usage:#define nice_full_usage "\n\n"
 //usage:       "Change scheduling priority, run PROG\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n ADJUST       Adjust priority by ADJUST"
 
 #include <sys/resource.h>
diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index 1a0eca646..f7ad791ec 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -12,7 +12,6 @@
 //usage:#define readlink_full_usage "\n\n"
 //usage:       "Display the value of a symlink"
 //usage:        IF_FEATURE_READLINK_FOLLOW( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -f      Canonicalize by following all symlinks"
 //usage:     "\n        -n      Don't add newline"
 //usage:     "\n        -v      Verbose"
diff --git a/coreutils/rm.c b/coreutils/rm.c
index 8efd895cc..042fba162 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -19,7 +19,6 @@
 //usage:       "[-irf] FILE..."
 //usage:#define rm_full_usage "\n\n"
 //usage:       "Remove (unlink) FILEs\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -i      Always prompt before removing"
 //usage:     "\n        -f      Never prompt"
 //usage:     "\n        -R,-r   Recurse"
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 0dbd940a1..2840d1cfa 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -14,7 +14,6 @@
 //usage:       "[OPTIONS] DIRECTORY..."
 //usage:#define rmdir_full_usage "\n\n"
 //usage:       "Remove DIRECTORY if it is empty\n"
-//usage:     "\nOptions:"
 //usage:        IF_FEATURE_RMDIR_LONG_OPTIONS(
 //usage:     "\n        -p|--parents    Include parents"
 //usage:     "\n        --ignore-fail-on-non-empty"
diff --git a/coreutils/seq.c b/coreutils/seq.c
index b600266fd..898619293 100644
--- a/coreutils/seq.c
+++ b/coreutils/seq.c
@@ -12,7 +12,6 @@
 //usage:#define seq_full_usage "\n\n"
 //usage:       "Print numbers from FIRST to LAST, in steps of INC.\n"
 //usage:       "FIRST, INC default to 1.\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -w      Pad to last with leading zeros"
 //usage:     "\n        -s SEP  String separator"
 
diff --git a/coreutils/sort.c b/coreutils/sort.c
index f709ea1b3..1df07285c 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -18,7 +18,6 @@
 //usage:       "] [FILE]..."
 //usage:#define sort_full_usage "\n\n"
 //usage:       "Sort lines of text\n"
-//usage:     "\nOptions:"
 //usage:        IF_FEATURE_SORT_BIG(
 //usage:     "\n        -b      Ignore leading blanks"
 //usage:     "\n        -c      Check whether input is sorted"
diff --git a/coreutils/split.c b/coreutils/split.c
index f0077077e..11e640442 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -13,8 +13,7 @@
 //usage:#define split_trivial_usage
 //usage:       "[OPTIONS] [INPUT [PREFIX]]"
 //usage:#define split_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n        -b N[k|m]       Split by N (kilo|mega)bytes"
+//usage:       "        -b N[k|m]       Split by N (kilo|mega)bytes"
 //usage:     "\n        -l N            Split by N lines"
 //usage:     "\n        -a N            Use N letters as suffix"
 //usage:
diff --git a/coreutils/stat.c b/coreutils/stat.c
index e85e51033..2797719dd 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -17,7 +17,6 @@
 //usage:       "[OPTIONS] FILE..."
 //usage:#define stat_full_usage "\n\n"
 //usage:       "Display file (default) or filesystem status\n"
-//usage:     "\nOptions:"
 //usage:        IF_FEATURE_STAT_FORMAT(
 //usage:     "\n        -c fmt  Use the specified format"
 //usage:        )
diff --git a/coreutils/stty.c b/coreutils/stty.c
index af2347161..7f057ead2 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -26,7 +26,6 @@
 //usage:#define stty_full_usage "\n\n"
 //usage:       "Without arguments, prints baud rate, line discipline,\n"
 //usage:       "and deviations from stty sane\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -F DEVICE       Open device instead of stdin"
 //usage:     "\n        -a              Print all current settings in human-readable form"
 //usage:     "\n        -g              Print in stty-readable form"
diff --git a/coreutils/sum.c b/coreutils/sum.c
index 9e6b0c5b1..95110a6da 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -17,7 +17,6 @@
 //usage:       "[-rs] [FILE]..."
 //usage:#define sum_full_usage "\n\n"
 //usage:       "Checksum and count the blocks in a file\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -r      Use BSD sum algorithm (1K blocks)"
 //usage:     "\n        -s      Use System V sum algorithm (512byte blocks)"
 
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 4b42ebc52..454c25936 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -29,7 +29,6 @@
 //usage:#define tail_full_usage "\n\n"
 //usage:       "Print last 10 lines of each FILE (or stdin) to stdout.\n"
 //usage:       "With more than one FILE, precede each with a filename header.\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -f              Print data as file grows"
 //usage:        IF_FEATURE_FANCY_TAIL(
 //usage:     "\n        -s SECONDS      Wait SECONDS between reads with -f"
diff --git a/coreutils/tee.c b/coreutils/tee.c
index 3e3164e70..48cc0508f 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -14,7 +14,6 @@
 //usage:       "[-ai] [FILE]..."
 //usage:#define tee_full_usage "\n\n"
 //usage:       "Copy stdin to each FILE, and also to stdout\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -a      Append to the given FILEs, don't overwrite"
 //usage:     "\n        -i      Ignore interrupt signals (SIGINT)"
 //usage:
diff --git a/coreutils/touch.c b/coreutils/touch.c
index c51fb70ca..0f980fd7b 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -34,7 +34,6 @@
 //usage:       "[-c]" IF_DESKTOP(" [-d DATE] [-r FILE]") " FILE [FILE]..."
 //usage:#define touch_full_usage "\n\n"
 //usage:       "Update the last-modified date on the given FILE[s]\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Don't create files"
 //usage:        IF_DESKTOP(
 //usage:     "\n        -d DT   Date/time to use"
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 2f14a414f..e67948a36 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -51,7 +51,6 @@
 //usage:       "[-cds] STRING1 [STRING2]"
 //usage:#define tr_full_usage "\n\n"
 //usage:       "Translate, squeeze, or delete characters from stdin, writing to stdout\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Take complement of STRING1"
 //usage:     "\n        -d      Delete input characters coded STRING1"
 //usage:     "\n        -s      Squeeze multiple output characters of STRING2 into one character"
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 67399cbf3..45175054e 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -15,7 +15,6 @@
 //usage:#define tty_full_usage "\n\n"
 //usage:       "Print file name of stdin's terminal"
 //usage:        IF_INCLUDE_SUSv2( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -s      Print nothing, only return exit status"
 //usage:        )
 //usage:
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 775c450df..3809835a4 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -52,7 +52,6 @@
 //usage:       "[-amnrspv]"
 //usage:#define uname_full_usage "\n\n"
 //usage:       "Print system information\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -a      Print all"
 //usage:     "\n        -m      The machine (hardware) type"
 //usage:     "\n        -n      Hostname"
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 6e764d8a4..9208d34ec 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -14,7 +14,6 @@
 //usage:       "[-cdu][-f,s,w N] [INPUT [OUTPUT]]"
 //usage:#define uniq_full_usage "\n\n"
 //usage:       "Discard duplicate lines\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Prefix lines by the number of occurrences"
 //usage:     "\n        -d      Only print duplicate lines"
 //usage:     "\n        -u      Only print unique lines"
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 47a155ecb..6ecfe6cef 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -158,7 +158,6 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 //usage:        "[-d] [FILE]"
 //usage:#define base64_full_usage "\n\n"
 //usage:       "Base64 encode or decode FILE to standard output"
-//usage:     "\nOptions:"
 //usage:     "\n        -d      Decode data"
 ////usage:     "\n      -w COL  Wrap lines at COL (default 76, 0 disables)"
 ////usage:     "\n      -i      When decoding, ignore non-alphabet characters"
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index b4cd0a9e6..84a489a11 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -12,7 +12,6 @@
 //usage:       "[-m] [INFILE] STORED_FILENAME"
 //usage:#define uuencode_full_usage "\n\n"
 //usage:       "Uuencode a file to stdout\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -m      Use base64 encoding per RFC1521"
 //usage:
 //usage:#define uuencode_example_usage
diff --git a/coreutils/wc.c b/coreutils/wc.c
index 6e22c66c8..a410e407a 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -64,7 +64,6 @@
 //usage:
 //usage:#define wc_full_usage "\n\n"
 //usage:       "Count lines, words, and bytes for each FILE (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Count bytes"
 //usage:        IF_UNICODE_SUPPORT(
 //usage:     "\n        -m      Count characters"
diff --git a/coreutils/who.c b/coreutils/who.c
index ec385bf95..9f37f65fd 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -22,7 +22,6 @@
 //usage:       "[-a]"
 //usage:#define who_full_usage "\n\n"
 //usage:       "Show who is logged on\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -a      Show all"
 
 #include "libbb.h"