9 files changed, 273 insertions, 200 deletions

diff --git a/coreutils/Config.in b/coreutils/Config.src
index ead632a31..d4c9e0541 100644
--- a/coreutils/Config.in
+++ b/coreutils/Config.src
@@ -5,89 +5,76 @@
 
 menu "Coreutils"
 
-config BASENAME
-        bool "basename"
-        default n
-        help
-          basename is used to strip the directory and suffix from filenames,
-          leaving just the filename itself. Enable this option if you wish
-          to enable the 'basename' utility.
+INSERT
 
 config CAL
         bool "cal"
-        default n
+        default y
         help
           cal is used to display a monthly calender.
 
-config CAT
-        bool "cat"
-        default n
-        help
-          cat is used to concatenate files and print them to the standard
-          output. Enable this option if you wish to enable the 'cat' utility.
-
 config CATV
         bool "catv"
-        default n
+        default y
         help
           Display nonprinting characters as escape sequences (like some
           implementations' cat -v option).
 
 config CHGRP
         bool "chgrp"
-        default n
+        default y
         help
           chgrp is used to change the group ownership of files.
 
 config CHMOD
         bool "chmod"
-        default n
+        default y
         help
           chmod is used to change the access permission of files.
 
 config CHOWN
         bool "chown"
-        default n
+        default y
         help
           chown is used to change the user and/or group ownership
           of files.
 
 config FEATURE_CHOWN_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on CHOWN && LONG_OPTS
         help
           Enable use of long options
 
 config CHROOT
         bool "chroot"
-        default n
+        default y
         help
           chroot is used to change the root directory and run a command.
           The default command is `/bin/sh'.
 
 config CKSUM
         bool "cksum"
-        default n
+        default y
         help
           cksum is used to calculate the CRC32 checksum of a file.
 
 config COMM
         bool "comm"
-        default n
+        default y
         help
           comm is used to compare two files line by line and return
           a three-column output.
 
 config CP
         bool "cp"
-        default n
+        default y
         help
           cp is used to copy files and directories.
 
 config FEATURE_CP_LONG_OPTIONS
         bool "Enable long options for cp"
-        default n
+        default y
         depends on CP && LONG_OPTS
         help
           Enable long options for cp.
@@ -95,45 +82,14 @@ config FEATURE_CP_LONG_OPTIONS
 
 config CUT
         bool "cut"
-        default n
+        default y
         help
           cut is used to print selected parts of lines from
           each file to stdout.
 
-config DATE
-        bool "date"
-        default n
-        help
-          date is used to set the system date or display the
-          current time in the given format.
-
-config FEATURE_DATE_ISOFMT
-        bool "Enable ISO date format output (-I)"
-        default y
-        depends on DATE
-        help
-          Enable option (-I) to output an ISO-8601 compliant
-          date/time string.
-
-config FEATURE_DATE_COMPAT
-        bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format"
-        default y
-        depends on DATE
-        help
-          System time can be set by 'date -s DATE' and simply 'date DATE',
-          but formats of DATE string are different. 'date DATE' accepts
-          a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
-          unnatural placement of year between minutes and seconds.
-          date -s (and other commands like touch -d) use more sensible
-          formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
-
-          With this option off, 'date DATE' is 'date -s DATE' support
-          the same format. With it on, 'date DATE' additionally supports
-          MMDDhhmm[[YY]YY][.ss] format.
-
 config DD
         bool "dd"
-        default n
+        default y
         help
           dd copies a file (from standard input to standard output,
           by default) using specific input and output blocksizes,
@@ -155,7 +111,7 @@ config FEATURE_DD_SIGNAL_HANDLING
 
 config FEATURE_DD_THIRD_STATUS_LINE
         bool "Enable the third status line upon signal"
-        default n
+        default y
         depends on DD && FEATURE_DD_SIGNAL_HANDLING
         help
           Displays a coreutils-like third status line with transferred bytes,
@@ -163,7 +119,7 @@ config FEATURE_DD_THIRD_STATUS_LINE
 
 config FEATURE_DD_IBS_OBS
         bool "Enable ibs, obs and conv options"
-        default n
+        default y
         depends on DD
         help
           Enables support for writing a certain number of bytes in and out,
@@ -171,14 +127,14 @@ config FEATURE_DD_IBS_OBS
 
 config DF
         bool "df"
-        default n
+        default y
         help
           df reports the amount of disk space used and available
           on filesystems.
 
 config FEATURE_DF_FANCY
         bool "Enable -a, -i, -B"
-        default n
+        default y
         depends on DF
         help
           This option enables -a, -i and -B.
@@ -189,14 +145,14 @@ config FEATURE_DF_FANCY
 
 config DIRNAME
         bool "dirname"
-        default n
+        default y
         help
           dirname is used to strip a non-directory suffix from
           a file name.
 
 config DOS2UNIX
         bool "dos2unix/unix2dos"
-        default n
+        default y
         help
           dos2unix is used to convert a text file from DOS format to
           UNIX format, and vice versa.
@@ -211,7 +167,7 @@ config UNIX2DOS
 
 config DU
         bool "du (default blocksize of 512 bytes)"
-        default n
+        default y
         help
           du is used to report the amount of disk space used
           for specified files.
@@ -225,7 +181,7 @@ config FEATURE_DU_DEFAULT_BLOCKSIZE_1K
 
 config ECHO
         bool "echo (basic SuSv3 version taking no options)"
-        default n
+        default y
         help
           echo is used to print a specified string to stdout.
 
@@ -239,7 +195,7 @@ config FEATURE_FANCY_ECHO
 
 config ENV
         bool "env"
-        default n
+        default y
         help
           env is used to set an environment variable and run
           a command; without options it displays the current
@@ -247,34 +203,34 @@ config ENV
 
 config FEATURE_ENV_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on ENV && LONG_OPTS
         help
           Support long options for the env applet.
 
 config EXPAND
         bool "expand"
-        default n
+        default y
         help
           By default, convert all tabs to spaces.
 
 config FEATURE_EXPAND_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on EXPAND && LONG_OPTS
         help
           Support long options for the expand applet.
 
 config EXPR
         bool "expr"
-        default n
+        default y
         help
           expr is used to calculate numbers and print the result
           to standard output.
 
 config EXPR_MATH_SUPPORT_64
         bool "Extend Posix numbers support to 64 bit"
-        default n
+        default y
         depends on EXPR
         help
           Enable 64-bit math support in the expr applet. This will make
@@ -283,83 +239,83 @@ config EXPR_MATH_SUPPORT_64
 
 config FALSE
         bool "false"
-        default n
+        default y
         help
           false returns an exit code of FALSE (1).
 
 config FOLD
         bool "fold"
-        default n
+        default y
         help
           Wrap text to fit a specific width.
 
 config FSYNC
         bool "fsync"
-        default n
+        default y
         help
           fsync is used to flush file-related cached blocks to disk.
 
 config HEAD
         bool "head"
-        default n
+        default y
         help
           head is used to print the first specified number of lines
           from files.
 
 config FEATURE_FANCY_HEAD
         bool "Enable head options (-c, -q, and -v)"
-        default n
+        default y
         depends on HEAD
         help
           This enables the head options (-c, -q, and -v).
 
 config HOSTID
         bool "hostid"
-        default n
+        default y
         help
           hostid prints the numeric identifier (in hexadecimal) for
           the current host.
 
 config ID
         bool "id"
-        default n
+        default y
         help
           id displays the current user and group ID names.
 
 config INSTALL
         bool "install"
-        default n
+        default y
         help
           Copy files and set attributes.
 
 config FEATURE_INSTALL_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on INSTALL && LONG_OPTS
         help
           Support long options for the install applet.
 
 config LENGTH
         bool "length"
-        default n
+        default y
         help
           length is used to print out the length of a specified string.
 
 config LN
         bool "ln"
-        default n
+        default y
         help
           ln is used to create hard or soft links between files.
 
 config LOGNAME
         bool "logname"
-        default n
+        default y
         help
           logname is used to print the current user's login name.
 
 config LS
         bool "ls"
-        default n
+        default y
         help
           ls is used to list the contents of directories.
 
@@ -414,7 +370,7 @@ config FEATURE_LS_COLOR
 
 config FEATURE_LS_COLOR_IS_DEFAULT
         bool "Produce colored ls output by default"
-        default n
+        default y
         depends on FEATURE_LS_COLOR
         help
           Saying yes here will turn coloring on by default,
@@ -425,123 +381,123 @@ config FEATURE_LS_COLOR_IS_DEFAULT
 
 config MD5SUM
         bool "md5sum"
-        default n
+        default y
         help
           md5sum is used to print or check MD5 checksums.
 
 config MKDIR
         bool "mkdir"
-        default n
+        default y
         help
           mkdir is used to create directories with the specified names.
 
 config FEATURE_MKDIR_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on MKDIR && LONG_OPTS
         help
           Support long options for the mkdir applet.
 
 config MKFIFO
         bool "mkfifo"
-        default n
+        default y
         help
           mkfifo is used to create FIFOs (named pipes).
           The `mknod' program can also create FIFOs.
 
 config MKNOD
         bool "mknod"
-        default n
+        default y
         help
           mknod is used to create FIFOs or block/character special
           files with the specified names.
 
 config MV
         bool "mv"
-        default n
+        default y
         help
           mv is used to move or rename files or directories.
 
 config FEATURE_MV_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on MV && LONG_OPTS
         help
           Support long options for the mv applet.
 
 config NICE
         bool "nice"
-        default n
+        default y
         help
           nice runs a program with modified scheduling priority.
 
 config NOHUP
         bool "nohup"
-        default n
+        default y
         help
           run a command immune to hangups, with output to a non-tty.
 
 config OD
         bool "od"
-        default n
+        default y
         help
           od is used to dump binary files in octal and other formats.
 
 config PRINTENV
         bool "printenv"
-        default n
+        default y
         help
           printenv is used to print all or part of environment.
 
 config PRINTF
         bool "printf"
-        default n
+        default y
         help
           printf is used to format and print specified strings.
           It's similar to `echo' except it has more options.
 
 config PWD
         bool "pwd"
-        default n
+        default y
         help
           pwd is used to print the current directory.
 
 config READLINK
         bool "readlink"
-        default n
+        default y
         help
           This program reads a symbolic link and returns the name
           of the file it points to
 
 config FEATURE_READLINK_FOLLOW
         bool "Enable canonicalization by following all symlinks (-f)"
-        default n
+        default y
         depends on READLINK
         help
           Enable the readlink option (-f).
 
 config REALPATH
         bool "realpath"
-        default n
+        default y
         help
           Return the canonicalized absolute pathname.
           This isn't provided by GNU shellutils, but where else does it belong.
 
 config RM
         bool "rm"
-        default n
+        default y
         help
           rm is used to remove files or directories.
 
 config RMDIR
         bool "rmdir"
-        default n
+        default y
         help
           rmdir is used to remove empty directories.
 
 config FEATURE_RMDIR_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on RMDIR && LONG_OPTS
         help
           Support long options for the rmdir applet, including
@@ -549,31 +505,31 @@ config FEATURE_RMDIR_LONG_OPTIONS
 
 config SEQ
         bool "seq"
-        default n
+        default y
         help
           print a sequence of numbers
 
 config SHA1SUM
         bool "sha1sum"
-        default n
+        default y
         help
           Compute and check SHA1 message digest
 
 config SHA256SUM
         bool "sha256sum"
-        default n
+        default y
         help
           Compute and check SHA256 message digest
 
 config SHA512SUM
         bool "sha512sum"
-        default n
+        default y
         help
           Compute and check SHA512 message digest
 
 config SLEEP
         bool "sleep"
-        default n
+        default y
         help
           sleep is used to pause for a specified number of seconds.
           It comes in 3 versions:
@@ -587,21 +543,21 @@ config SLEEP
 
 config FEATURE_FANCY_SLEEP
         bool "Enable multiple arguments and s/m/h/d suffixes"
-        default n
+        default y
         depends on SLEEP
         help
           Allow sleep to pause for specified minutes, hours, and days.
 
 config FEATURE_FLOAT_SLEEP
         bool "Enable fractional arguments"
-        default n
+        default y
         depends on FEATURE_FANCY_SLEEP
         help
           Allow for fractional numeric parameters.
 
 config SORT
         bool "sort"
-        default n
+        default y
         help
           sort is used to sort lines of text in specified files.
 
@@ -619,13 +575,13 @@ config FEATURE_SORT_BIG
 
 config SPLIT
         bool "split"
-        default n
+        default y
         help
           split a file into pieces.
 
 config FEATURE_SPLIT_FANCY
         bool "Fancy extensions"
-        default n
+        default y
         depends on SPLIT
         help
           Add support for features not required by SUSv3.
@@ -634,13 +590,13 @@ config FEATURE_SPLIT_FANCY
 
 config STAT
         bool "stat"
-        default n
+        default y
         help
           display file or filesystem status.
 
 config FEATURE_STAT_FORMAT
         bool "Enable custom formats (-c)"
-        default n
+        default y
         depends on STAT
         help
           Without this, stat will not support the '-c format' option where
@@ -649,31 +605,31 @@ config FEATURE_STAT_FORMAT
 
 config STTY
         bool "stty"
-        default n
+        default y
         help
           stty is used to change and print terminal line settings.
 
 config SUM
         bool "sum"
-        default n
+        default y
         help
           checksum and count the blocks in a file
 
 config SYNC
         bool "sync"
-        default n
+        default y
         help
           sync is used to flush filesystem buffers.
 
 config TAC
         bool "tac"
-        default n
+        default y
         help
           tac is used to concatenate and print files in reverse.
 
 config TAIL
         bool "tail"
-        default n
+        default y
         help
           tail is used to print the last specified number of lines
           from files.
@@ -692,153 +648,112 @@ config FEATURE_FANCY_TAIL
 
 config TEE
         bool "tee"
-        default n
+        default y
         help
           tee is used to read from standard input and write
           to standard output and files.
 
 config FEATURE_TEE_USE_BLOCK_IO
         bool "Enable block I/O (larger/faster) instead of byte I/O"
-        default n
+        default y
         depends on TEE
         help
           Enable this option for a faster tee, at expense of size.
 
-config TEST
-        bool "test"
-        default n
-        help
-          test is used to check file types and compare values,
-          returning an appropriate exit code. The bash shell
-          has test built in, ash can build it in optionally.
-
-config FEATURE_TEST_64
-        bool "Extend test to 64 bit"
-        default n
-        depends on TEST || ASH_BUILTIN_TEST || HUSH
-        help
-          Enable 64-bit support in test.
-
 config TOUCH
         bool "touch"
-        default n
+        default y
         help
           touch is used to create or change the access and/or
           modification timestamp of specified files.
 
-config TR
-        bool "tr"
-        default n
-        help
-          tr is used to squeeze, and/or delete characters from standard
-          input, writing to standard output.
-
-config FEATURE_TR_CLASSES
-        bool "Enable character classes (such as [:upper:])"
-        default n
-        depends on TR
-        help
-          Enable character classes, enabling commands such as:
-          tr [:upper:] [:lower:] to convert input into lowercase.
-
-config FEATURE_TR_EQUIV
-        bool "Enable equivalence classes"
-        default n
-        depends on TR
-        help
-          Enable equivalence classes, which essentially add the enclosed
-          character to the current set. For instance, tr [=a=] xyz would
-          replace all instances of 'a' with 'xyz'. This option is mainly
-          useful for cases when no other way of expressing a character
-          is possible.
-
 config TRUE
         bool "true"
-        default n
+        default y
         help
           true returns an exit code of TRUE (0).
 
 config TTY
         bool "tty"
-        default n
+        default y
         help
           tty is used to print the name of the current terminal to
           standard output.
 
 config UNAME
         bool "uname"
-        default n
+        default y
         help
           uname is used to print system information.
 
 config UNEXPAND
         bool "unexpand"
-        default n
+        default y
         help
           By default, convert only leading sequences of blanks to tabs.
 
 config FEATURE_UNEXPAND_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on UNEXPAND && LONG_OPTS
         help
           Support long options for the unexpand applet.
 
 config UNIQ
         bool "uniq"
-        default n
+        default y
         help
           uniq is used to remove duplicate lines from a sorted file.
 
 config USLEEP
         bool "usleep"
-        default n
+        default y
         help
           usleep is used to pause for a specified number of microseconds.
 
 config UUDECODE
         bool "uudecode"
-        default n
+        default y
         help
           uudecode is used to decode a uuencoded file.
 
 config UUENCODE
         bool "uuencode"
-        default n
+        default y
         help
           uuencode is used to uuencode a file.
 
 config WC
         bool "wc"
-        default n
+        default y
         help
           wc is used to print the number of bytes, words, and lines,
           in specified files.
 
 config FEATURE_WC_LARGE
         bool "Support very large files in wc"
-        default n
+        default y
         depends on WC
         help
           Use "unsigned long long" in wc for counter variables.
 
 config WHO
         bool "who"
-        default n
+        default y
         depends on FEATURE_UTMP
         help
           who is used to show who is logged on.
 
 config WHOAMI
         bool "whoami"
-        default n
+        default y
         help
           whoami is used to print the username of the current
           user id (same as id -un).
 
 config YES
         bool "yes"
-        default n
+        default y
         help
           yes is used to repeatedly output a specific string, or
           the default string `y'.
@@ -848,7 +763,7 @@ comment "Common options for cp and mv"
 
 config FEATURE_PRESERVE_HARDLINKS
         bool "Preserve hard links"
-        default n
+        default y
         depends on CP || MV
         help
           Allow cp and mv to preserve hard links.
@@ -872,7 +787,7 @@ comment "Common options for df, du, ls"
 
 config FEATURE_HUMAN_READABLE
         bool "Support for human readable output (example 13k, 23M, 235G)"
-        default n
+        default y
         depends on DF || DU || LS
         help
           Allow df, du, and ls to have human readable output.
@@ -882,7 +797,7 @@ comment "Common options for md5sum, sha1sum, sha256sum, sha512sum"
 
 config FEATURE_MD5_SHA1_SUM_CHECK
         bool "Enable -c, -s and -w options"
-        default n
+        default y
         depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM
         help
           Enabling the -c options allows files to be checked
diff --git a/coreutils/Kbuild b/coreutils/Kbuild.src
index ee22a3f7b..57ea7d6c4 100644
--- a/coreutils/Kbuild
+++ b/coreutils/Kbuild.src
@@ -7,12 +7,8 @@
 libs-y                  += libcoreutils/
 
 lib-y:=
-lib-$(CONFIG_BASENAME)  += basename.o
+INSERT
 lib-$(CONFIG_CAL)       += cal.o
-lib-$(CONFIG_CAT)       += cat.o
-lib-$(CONFIG_MORE)      += cat.o # more uses it if stdout isn't a tty
-lib-$(CONFIG_LESS)      += cat.o # less too
-lib-$(CONFIG_CRONTAB)   += cat.o # crontab -l
 lib-$(CONFIG_CATV)      += catv.o
 lib-$(CONFIG_CHGRP)     += chgrp.o chown.o
 lib-$(CONFIG_CHMOD)     += chmod.o
@@ -24,7 +20,6 @@ lib-$(CONFIG_CKSUM)     += cksum.o
 lib-$(CONFIG_COMM)      += comm.o
 lib-$(CONFIG_CP)        += cp.o
 lib-$(CONFIG_CUT)       += cut.o
-lib-$(CONFIG_DATE)      += date.o
 lib-$(CONFIG_DD)        += dd.o
 lib-$(CONFIG_DF)        += df.o
 lib-$(CONFIG_DIRNAME)   += dirname.o
@@ -78,12 +73,7 @@ lib-$(CONFIG_SYNC)      += sync.o
 lib-$(CONFIG_TAC)       += tac.o
 lib-$(CONFIG_TAIL)      += tail.o
 lib-$(CONFIG_TEE)       += tee.o
-lib-$(CONFIG_TEST)      += test.o test_ptr_hack.o
-lib-$(CONFIG_ASH)       += test.o test_ptr_hack.o # used by ash
-lib-$(CONFIG_HUSH)      += test.o test_ptr_hack.o # used by hush
-lib-$(CONFIG_MSH)       += test.o test_ptr_hack.o # used by msh
 lib-$(CONFIG_TOUCH)     += touch.o
-lib-$(CONFIG_TR)        += tr.o
 lib-$(CONFIG_TRUE)      += true.o
 lib-$(CONFIG_TTY)       += tty.o
 lib-$(CONFIG_UNAME)     += uname.o
diff --git a/coreutils/basename.c b/coreutils/basename.c
index 8a5597e65..d1ad91ba1 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -20,6 +20,16 @@
  * 3) Save some space by using strcmp().  Calling strncmp() here was silly.
  */
 
+//kbuild:lib-$(CONFIG_BASENAME) += basename.o
+
+//config:config BASENAME
+//config:       bool "basename"
+//config:       default y
+//config:       help
+//config:         basename is used to strip the directory and suffix from filenames,
+//config:         leaving just the filename itself. Enable this option if you wish
+//config:         to enable the 'basename' utility.
+
 #include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 0024eb8d5..ab682588f 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -10,6 +10,18 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
 
+//kbuild:lib-$(CONFIG_CAT)     += cat.o
+//kbuild:lib-$(CONFIG_MORE)    += cat.o # more uses it if stdout isn't a tty
+//kbuild:lib-$(CONFIG_LESS)    += cat.o # less too
+//kbuild:lib-$(CONFIG_CRONTAB) += cat.o # crontab -l
+
+//config:config CAT
+//config:       bool "cat"
+//config:       default y
+//config:       help
+//config:         cat is used to concatenate files and print them to the standard
+//config:         output. Enable this option if you wish to enable the 'cat' utility.
+
 #include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
diff --git a/coreutils/date.c b/coreutils/date.c
index 4e5b3b0b8..3d78a5336 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -51,6 +51,47 @@
  *    and does not support -Ins
  * -D FMT is a bbox extension for _input_ conversion of -d DATE
  */
+
+//kbuild:lib-$(CONFIG_DATE) += date.o
+
+//config:config DATE
+//config:       bool "date"
+//config:       default y
+//config:       help
+//config:         date is used to set the system date or display the
+//config:         current time in the given format.
+//config:
+//config:config FEATURE_DATE_ISOFMT
+//config:       bool "Enable ISO date format output (-I)"
+//config:       default y
+//config:       depends on DATE
+//config:       help
+//config:         Enable option (-I) to output an ISO-8601 compliant
+//config:         date/time string.
+//config:
+//config:config FEATURE_DATE_NANO
+//config:       bool "Support %[num]N nanosecond format specifier"
+//config:       default n
+//config:       depends on DATE
+//config:       help
+//config:         Support %[num]N format specifier. Adds ~250 bytes of code.
+//config:
+//config:config FEATURE_DATE_COMPAT
+//config:       bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format"
+//config:       default y
+//config:       depends on DATE
+//config:       help
+//config:         System time can be set by 'date -s DATE' and simply 'date DATE',
+//config:         but formats of DATE string are different. 'date DATE' accepts
+//config:         a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
+//config:         unnatural placement of year between minutes and seconds.
+//config:         date -s (and other commands like touch -d) use more sensible
+//config:         formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
+//config:
+//config:         With this option off, 'date DATE' is 'date -s DATE' support
+//config:         the same format. With it on, 'date DATE' additionally supports
+//config:         MMDDhhmm[[YY]YY][.ss] format.
+
 #include "libbb.h"
 
 enum {
@@ -84,9 +125,9 @@ static const char date_longopts[] ALIGN1 =
 int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int date_main(int argc UNUSED_PARAM, char **argv)
 {
+        struct timespec ts;
         struct tm tm_time;
         char buf_fmt_dt2str[64];
-        time_t tm;
         unsigned opt;
         int ifmt = -1;
         char *date_str;
@@ -161,11 +202,22 @@ int date_main(int argc UNUSED_PARAM, char **argv)
         if (opt & OPT_REFERENCE) {
                 struct stat statbuf;
                 xstat(filename, &statbuf);
-                tm = statbuf.st_mtime;
+                ts.tv_sec = statbuf.st_mtime;
+#if ENABLE_FEATURE_DATE_NANO
+# if defined __GLIBC__ && !defined __UCLIBC__
+                ts.tv_nsec = statbuf.st_mtim.tv_nsec;
+# else
+                ts.tv_nsec = statbuf.st_mtimensec;
+# endif
+#endif
         } else {
-                time(&tm);
+#if ENABLE_FEATURE_DATE_NANO
+                clock_gettime(CLOCK_REALTIME, &ts);
+#else
+                time(&ts.tv_nsec);
+#endif
         }
-        localtime_r(&tm, &tm_time);
+        localtime_r(&ts.tv_sec, &tm_time);
 
         /* If date string is given, update tm_time, and maybe set date */
         if (date_str != NULL) {
@@ -184,12 +236,12 @@ int date_main(int argc UNUSED_PARAM, char **argv)
 
                 /* Correct any day of week and day of year etc. fields */
                 tm_time.tm_isdst = -1;  /* Be sure to recheck dst */
-                tm = validate_tm_time(date_str, &tm_time);
+                ts.tv_sec = validate_tm_time(date_str, &tm_time);
 
                 maybe_set_utc(opt);
 
                 /* if setting time, set it */
-                if ((opt & OPT_SET) && stime(&tm) < 0) {
+                if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
                         bb_perror_msg("can't set date");
                 }
         }
@@ -222,6 +274,46 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                         fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y";
                 }
         }
+#if ENABLE_FEATURE_DATE_NANO
+        else {
+                /* User-specified fmt_dt2str */
+                /* Search for and process "%N" */
+                char *p = fmt_dt2str;
+                while ((p = strchr(p, '%')) != NULL) {
+                        int n, m;
+                        unsigned pres, scale;
+
+                        p++;
+                        if (*p == '%') {
+                                p++;
+                                continue;
+                        }
+                        n = strspn(p, "0123456789");
+                        if (p[n] != 'N') {
+                                p += n;
+                                continue;
+                        }
+                        /* We have "%[nnn]N" */
+                        p[-1] = '\0';
+                        p[n] = '\0';
+                        scale = 1;
+                        pres = 9;
+                        if (n) {
+                                pres = xatoi_u(p);
+                                if (pres == 0)
+                                        pres = 9;
+                                m = 9 - pres;
+                                while (--m >= 0)
+                                        scale *= 10;
+                        }
+
+                        m = p - fmt_dt2str;
+                        p += n + 1;
+                        fmt_dt2str = xasprintf("%s%0*u%s", fmt_dt2str, pres, (unsigned)ts.tv_nsec / scale, p);
+                        p = fmt_dt2str + m;
+                }
+        }
+#endif
 
 #define date_buf bb_common_bufsiz1
         if (*fmt_dt2str == '\0') {
diff --git a/coreutils/libcoreutils/Kbuild b/coreutils/libcoreutils/Kbuild.src
index 755d01f86..755d01f86 100644
--- a/coreutils/libcoreutils/Kbuild
+++ b/coreutils/libcoreutils/Kbuild.src
diff --git a/coreutils/test.c b/coreutils/test.c
index 0b9322316..fb5778760 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -19,6 +19,26 @@
  * Original copyright notice states:
  *     "This program is in the Public Domain."
  */
+
+//kbuild:lib-$(CONFIG_TEST)      += test.o test_ptr_hack.o
+//kbuild:lib-$(CONFIG_ASH)       += test.o test_ptr_hack.o
+//kbuild:lib-$(CONFIG_HUSH)      += test.o test_ptr_hack.o
+
+//config:config TEST
+//config:       bool "test"
+//config:       default y
+//config:       help
+//config:         test is used to check file types and compare values,
+//config:         returning an appropriate exit code. The bash shell
+//config:         has test built in, ash can build it in optionally.
+//config:
+//config:config FEATURE_TEST_64
+//config:       bool "Extend test to 64 bit"
+//config:       default y
+//config:       depends on TEST || ASH_BUILTIN_TEST || HUSH
+//config:       help
+//config:         Enable 64-bit support in test.
+
 #include "libbb.h"
 #include <setjmp.h>
 
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 6d4cb4a14..f3db3793f 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -18,6 +18,35 @@
 /* http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html
  * TODO: graph, print
  */
+
+//kbuild:lib-$(CONFIG_TR) += tr.o
+
+//config:config TR
+//config:       bool "tr"
+//config:       default y
+//config:       help
+//config:         tr is used to squeeze, and/or delete characters from standard
+//config:         input, writing to standard output.
+//config:
+//config:config FEATURE_TR_CLASSES
+//config:       bool "Enable character classes (such as [:upper:])"
+//config:       default y
+//config:       depends on TR
+//config:       help
+//config:         Enable character classes, enabling commands such as:
+//config:         tr [:upper:] [:lower:] to convert input into lowercase.
+//config:
+//config:config FEATURE_TR_EQUIV
+//config:       bool "Enable equivalence classes"
+//config:       default y
+//config:       depends on TR
+//config:       help
+//config:         Enable equivalence classes, which essentially add the enclosed
+//config:         character to the current set. For instance, tr [=a=] xyz would
+//config:         replace all instances of 'a' with 'xyz'. This option is mainly
+//config:         useful for cases when no other way of expressing a character
+//config:         is possible.
+
 #include "libbb.h"
 
 enum {
diff --git a/coreutils/yes.c b/coreutils/yes.c
index d757a4504..ead674b27 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -18,6 +18,11 @@
 
 /* This is a NOFORK applet. Be very careful! */
 
+//usage:#define yes_trivial_usage
+//usage:       "[STRING]"
+//usage:#define yes_full_usage "\n\n"
+//usage:       "Repeatedly output a line with STRING, or 'y'"
+
 int yes_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int yes_main(int argc UNUSED_PARAM, char **argv)
 {