108 files changed, 1571 insertions, 982 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 2beb92763..467996071 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -286,7 +286,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
-//usage:     "\n        -t      Test file integrity"
+//usage:     "\n        -t      Test integrity"
 //usage:
 //usage:#define gunzip_example_usage
 //usage:       "$ ls -la /tmp/BusyBox*\n"
@@ -409,6 +409,8 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
+//usage:     "\n        -t      Test integrity"
+//usage:
 //usage:#define bzcat_trivial_usage
 //usage:       "[FILE]..."
 //usage:#define bzcat_full_usage "\n\n"
@@ -467,6 +469,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
+//usage:     "\n        -t      Test integrity"
 //usage:
 //usage:#define lzma_trivial_usage
 //usage:       "-d [-cfk] [FILE]..."
@@ -476,6 +479,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
+//usage:     "\n        -t      Test integrity"
 //usage:
 //usage:#define lzcat_trivial_usage
 //usage:       "[FILE]..."
@@ -538,7 +542,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
-//usage:     "\n        -t      Test file integrity"
+//usage:     "\n        -t      Test integrity"
 //usage:
 //usage:#define xz_trivial_usage
 //usage:       "-d [-cfk] [FILE]..."
@@ -548,7 +552,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
-//usage:     "\n        -t      Test file integrity"
+//usage:     "\n        -t      Test integrity"
 //usage:
 //usage:#define xzcat_trivial_usage
 //usage:       "[FILE]..."
diff --git a/archival/bzip2.c b/archival/bzip2.c
index ac5db0880..bce13cf93 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -56,11 +56,13 @@
 //usage:     "\n        -1..9   Compression level"
 //usage:        IF_FEATURE_BZIP2_DECOMPRESS(
 //usage:     "\n        -d      Decompress"
-//usage:     "\n        -t      Test file integrity"
 //usage:        )
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
+//usage:        IF_FEATURE_BZIP2_DECOMPRESS(
+//usage:     "\n        -t      Test integrity"
+//usage:        )
 
 #include "libbb.h"
 #include "bb_archive.h"
diff --git a/archival/gzip.c b/archival/gzip.c
index d9c730f13..91bd4d09d 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -77,11 +77,13 @@ aa:      85.1% -- replaced with aa.gz
 //usage:        )
 //usage:        IF_FEATURE_GZIP_DECOMPRESS(
 //usage:     "\n        -d      Decompress"
-//usage:     "\n        -t      Test file integrity"
 //usage:        )
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
+//usage:        IF_FEATURE_GZIP_DECOMPRESS(
+//usage:     "\n        -t      Test integrity"
+//usage:        )
 //usage:
 //usage:#define gzip_example_usage
 //usage:       "$ ls -la /tmp/busybox*\n"
diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index 0744f231a..fb5aac8fe 100644
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -290,8 +290,11 @@ unpack_lzma_stream(transformer_state_t *xstate)
                                 uint32_t pos;
 
                                 pos = buffer_pos - rep0;
-                                if ((int32_t)pos < 0)
+                                if ((int32_t)pos < 0) {
                                         pos += header.dict_size;
+                                        if ((int32_t)pos < 0)
+                                                goto bad;
+                                }
                                 match_byte = buffer[pos];
                                 do {
                                         int bit;
diff --git a/archival/libarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index 4ad174732..9ad0557c2 100644
--- a/archival/libarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -20,7 +20,7 @@ typedef struct hardlinks_t {
 char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
 {
         file_header_t *file_header = archive_handle->file_header;
-        char cpio_header[110];
+        char cpio_header[111];
         int namesize;
         int major, minor, nlink, mode, inode;
         unsigned size, uid, gid, mtime;
@@ -43,6 +43,7 @@ char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
                 bb_simple_error_msg_and_die("unsupported cpio format, use newc or crc");
         }
 
+        cpio_header[110] = '\0'; /* sscanf may call strlen which may break without this */
         if (sscanf(cpio_header + 6,
                         "%8x" "%8x" "%8x" "%8x"
                         "%8x" "%8x" "%8x" /*maj,min:*/ "%*16c"
diff --git a/archival/lzop.c b/archival/lzop.c
index bdd21598c..74df8ff03 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -86,6 +86,7 @@
 //usage:     "\n        -f      Force"
 //usage:     "\n        -U      Delete input files"
 ///////:     "\n        -k      Keep input files" (default, so why bother documenting?)
+//usage:     "\n        -t      Test integrity"
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -F      Don't verify checksum"
 
diff --git a/archival/tar.c b/archival/tar.c
index 3b8777414..8cd371173 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -796,7 +796,7 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:        IF_FEATURE_TAR_NOPRESERVE_TIME("m")
 //usage:        "vokO] "
 //usage:        "[-f TARFILE] [-C DIR] "
-//usage:        IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[OPTION]... "))
+//usage:        IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[LONGOPT]... "))
 //usage:        "[FILE]..."
 //usage:#define tar_full_usage "\n\n"
 //usage:        IF_FEATURE_TAR_CREATE("Create, extract, ")
diff --git a/archival/unzip.c b/archival/unzip.c
index e02cf33e3..edfd73652 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -56,14 +56,14 @@
 //kbuild:lib-$(CONFIG_UNZIP) += unzip.o
 
 //usage:#define unzip_trivial_usage
-//usage:       "[-lnojpq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]"
+//usage:       "[-lnojpq] FILE[.zip] [FILE]... [-x FILE]... [-d DIR]"
 //usage:#define unzip_full_usage "\n\n"
 //usage:       "Extract FILEs from ZIP archive\n"
 //usage:     "\n        -l      List contents (with -q for short form)"
 //usage:     "\n        -n      Never overwrite files (default: ask)"
 //usage:     "\n        -o      Overwrite"
 //usage:     "\n        -j      Do not restore paths"
-//usage:     "\n        -p      Print to stdout"
+//usage:     "\n        -p      Write to stdout"
 //usage:     "\n        -t      Test"
 //usage:     "\n        -q      Quiet"
 //usage:     "\n        -x FILE Exclude FILEs"
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 7533b0aad..81a0e6aa8 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -399,7 +399,7 @@ setfont [-O font+umap.orig] [-o font.orig] [-om cmap.orig]
 -V     Version
 */
 //usage:#define setfont_trivial_usage
-//usage:       "FONT [-m MAPFILE] [-C TTY]"
+//usage:       "[-m MAPFILE] [-C TTY] FILE"
 //usage:#define setfont_full_usage "\n\n"
 //usage:       "Load a console font\n"
 //usage:     "\n        -m MAPFILE      Load console screen map"
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index 0c2060981..e6ac316e5 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -23,13 +23,17 @@
 //usage:#define chgrp_trivial_usage
 //usage:       "[-Rh"IF_DESKTOP("LHPcvf")"]... GROUP FILE..."
 //usage:#define chgrp_full_usage "\n\n"
-//usage:       "Change the group membership of FILEs to GROUP\n"
-//usage:     "\n        -R      Recurse"
+//usage:       "Change the group membership of FILEs to GROUP"
+//usage:     "\n"
 //usage:     "\n        -h      Affect symlinks instead of symlink targets"
 //usage:        IF_DESKTOP(
 //usage:     "\n        -L      Traverse all symlinks to directories"
 //usage:     "\n        -H      Traverse symlinks on command line only"
 //usage:     "\n        -P      Don't traverse symlinks (default)"
+//usage:        )
+//next 4 options are the same for chmod/chown/chgrp:
+//usage:     "\n        -R      Recurse"
+//usage:        IF_DESKTOP(
 //usage:     "\n        -c      List changed files"
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -f      Hide errors"
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index d2988c490..e260adab2 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -26,12 +26,13 @@
 //usage:#define chmod_trivial_usage
 //usage:       "[-R"IF_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
 //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:       "MODE is octal number (bit pattern sstrwxrwxrwx) or [ugoa]{+|-|=}[rwxXst]"
+//usage:     "\n"
+//next 4 options are the same for chmod/chown/chgrp:
 //usage:     "\n        -R      Recurse"
 //usage:        IF_DESKTOP(
 //usage:     "\n        -c      List changed files"
-//usage:     "\n        -v      List all files"
+//usage:     "\n        -v      Verbose"
 //usage:     "\n        -f      Hide errors"
 //usage:        )
 //usage:
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 170507147..528a2a05a 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -28,15 +28,19 @@
 //usage:#define chown_trivial_usage
 //usage:       "[-Rh"IF_DESKTOP("LHPcvf")"]... USER[:[GRP]] FILE..."
 //usage:#define chown_full_usage "\n\n"
-//usage:       "Change the owner and/or group of FILEs to USER and/or GRP\n"
-//usage:     "\n        -R      Recurse"
+//usage:       "Change the owner and/or group of FILEs to USER and/or GRP"
+//usage:     "\n"
 //usage:     "\n        -h      Affect symlinks instead of symlink targets"
 //usage:        IF_DESKTOP(
 //usage:     "\n        -L      Traverse all symlinks to directories"
 //usage:     "\n        -H      Traverse symlinks on command line only"
 //usage:     "\n        -P      Don't traverse symlinks (default)"
+//usage:        )
+//next 4 options are the same for chmod/chown/chgrp:
+//usage:     "\n        -R      Recurse"
+//usage:        IF_DESKTOP(
 //usage:     "\n        -c      List changed files"
-//usage:     "\n        -v      List all files"
+//usage:     "\n        -v      Verbose"
 //usage:     "\n        -f      Hide errors"
 //usage:        )
 //usage:
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index 633322bc7..83b7e3238 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -9,32 +9,40 @@
 //config:config CKSUM
 //config:       bool "cksum (4.1 kb)"
 //config:       default y
-//config:       help
-//config:       cksum is used to calculate the CRC32 checksum of a file.
+//config:
+//config:config CRC32
+//config:       bool "crc32 (4.1 kb)"
+//config:       default y
 
+//                APPLET_NOEXEC:name   main   location        suid_type     help
 //applet:IF_CKSUM(APPLET_NOEXEC(cksum, cksum, BB_DIR_USR_BIN, BB_SUID_DROP, cksum))
+//applet:IF_CRC32(APPLET_NOEXEC(crc32, cksum, BB_DIR_USR_BIN, BB_SUID_DROP, cksum))
 /* bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed. */
 
 //kbuild:lib-$(CONFIG_CKSUM) += cksum.o
+//kbuild:lib-$(CONFIG_CRC32) += cksum.o
 
 //usage:#define cksum_trivial_usage
 //usage:       "FILE..."
 //usage:#define cksum_full_usage "\n\n"
-//usage:       "Calculate the CRC32 checksums of FILEs"
+//usage:       "Calculate CRC32 checksum of FILEs"
 
 #include "libbb.h"
 #include "common_bufsiz.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
+#define IS_CKSUM (ENABLE_CKSUM && (!ENABLE_CRC32 || applet_name[1] == 'k'))
+#define IS_CRC32 (ENABLE_CRC32 && (!ENABLE_CKSUM || applet_name[1] == 'r'))
+
 int cksum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cksum_main(int argc UNUSED_PARAM, char **argv)
 {
-        uint32_t *crc32_table = crc32_filltable(NULL, 1);
+        uint32_t *crc32_table = crc32_filltable(NULL, IS_CKSUM);
         int exit_code = EXIT_SUCCESS;
 
 #if ENABLE_DESKTOP
-        getopt32(argv, ""); /* coreutils 6.9 compat */
+        getopt32(argv, ""); /* cksum coreutils 6.9 compat */
         argv += optind;
 #else
         argv++;
@@ -43,41 +51,55 @@ int cksum_main(int argc UNUSED_PARAM, char **argv)
         setup_common_bufsiz();
         do {
                 uint32_t crc;
-                off_t filesize;
-                int fd = open_or_warn_stdin(*argv ? *argv : bb_msg_standard_input);
+                IF_CKSUM(off_t filesize;)
+                const char *fname = *argv ? *argv : bb_msg_standard_input;
+                int fd = open_or_warn_stdin(fname);
 
                 if (fd < 0) {
                         exit_code = EXIT_FAILURE;
                         continue;
                 }
 
-                crc = 0;
-                filesize = 0;
+                crc = IS_CKSUM ? 0 : 0xffffffff;
+                IF_CKSUM(filesize = 0;)
 #define read_buf bb_common_bufsiz1
                 for (;;) {
-                        uoff_t t;
                         int bytes_read = safe_read(fd, read_buf, COMMON_BUFSIZE);
+                        if (bytes_read < 0)
+                                bb_simple_perror_msg_and_die(fname);
                         if (bytes_read > 0) {
-                                filesize += bytes_read;
+                                IF_CKSUM(filesize += bytes_read;)
                         } else {
-                                /* Checksum filesize bytes, LSB first, and exit */
+                                IF_CKSUM(uoff_t t;)
+
                                 close(fd);
+                                if (IS_CRC32)
+                                        break;
+#if ENABLE_CKSUM
                                 fd = -1; /* break flag */
+                                /* Checksum filesize bytes, LSB first */
                                 t = filesize;
-                                bytes_read = 0;
+                                /*bytes_read = 0; - already is */
                                 while (t != 0) {
                                         read_buf[bytes_read++] = (uint8_t)t;
                                         t >>= 8;
                                 }
+#endif
                         }
-                        crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table);
-                        if (fd < 0)
+                        crc = (IS_CKSUM ? crc32_block_endian1 : crc32_block_endian0)(crc, read_buf, bytes_read, crc32_table);
+                        if (ENABLE_CKSUM && fd < 0)
                                 break;
                 }
 
                 crc = ~crc;
-                printf((*argv ? "%u %"OFF_FMT"u %s\n" : "%u %"OFF_FMT"u\n"),
+#if ENABLE_CKSUM
+                if (IS_CKSUM)
+                        printf((*argv ? "%u %"OFF_FMT"u %s\n" : "%u %"OFF_FMT"u\n"),
                                 (unsigned)crc, filesize, *argv);
+                else
+#endif
+                        printf((*argv ? "%08x %s\n" : "%08x\n"),
+                                (unsigned)crc, *argv);
         } while (*argv && *++argv);
 
         fflush_stdout_and_exit(exit_code);
diff --git a/coreutils/cp.c b/coreutils/cp.c
index f92ba6886..50ca1ccea 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -37,8 +37,55 @@
 
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cp.html */
 
+// Options of cp from GNU coreutils 6.10:
+// -a, --archive
+// -f, --force
+// -i, --interactive
+// -l, --link
+// -L, --dereference
+// -P, --no-dereference
+// -R, -r, --recursive
+// -s, --symbolic-link
+// -v, --verbose
+// -H   follow command-line symbolic links in SOURCE
+// -d   same as --no-dereference --preserve=links
+// -p   same as --preserve=mode,ownership,timestamps
+// -c   same as --preserve=context
+// -u, --update
+//      copy only when the SOURCE file is newer than the destination
+//      file or when the destination file is missing
+// --remove-destination
+//      remove each existing destination file before attempting to open
+// --parents
+//      use full source file name under DIRECTORY
+// -T, --no-target-directory
+//      treat DEST as a normal file
+// NOT SUPPORTED IN BBOX:
+// --backup[=CONTROL]
+//      make a backup of each existing destination file
+// -b   like --backup but does not accept an argument
+// --copy-contents
+//      copy contents of special files when recursive
+// --preserve[=ATTR_LIST]
+//      preserve attributes (default: mode,ownership,timestamps),
+//      if possible additional attributes: security context,links,all
+// --no-preserve=ATTR_LIST
+// --sparse=WHEN
+//      control creation of sparse files
+// --strip-trailing-slashes
+//      remove any trailing slashes from each SOURCE argument
+// -S, --suffix=SUFFIX
+//      override the usual backup suffix
+// -t, --target-directory=DIRECTORY
+//      copy all SOURCE arguments into DIRECTORY
+// -x, --one-file-system
+//      stay on this file system
+// -Z, --context=CONTEXT
+//      (SELinux) set SELinux security context of copy to CONTEXT
+
 //usage:#define cp_trivial_usage
-//usage:       "[-arPLHpfilsTu] SOURCE... DEST"
+//usage:       "[-arPLHpfinlsTu] SOURCE DEST\n"
+//usage:       "or: cp [-arPLHpfinlsu] SOURCE... { -t DIRECTORY | DIRECTORY }"
 //usage:#define cp_full_usage "\n\n"
 //usage:       "Copy SOURCEs to DEST\n"
 //usage:     "\n        -a      Same as -dpR"
@@ -52,8 +99,10 @@
 //usage:     "\n        -p      Preserve file attributes if possible"
 //usage:     "\n        -f      Overwrite"
 //usage:     "\n        -i      Prompt before overwrite"
+//usage:     "\n        -n      Don't overwrite"
 //usage:     "\n        -l,-s   Create (sym)links"
-//usage:     "\n        -T      Treat DEST as a normal file"
+//usage:     "\n        -T      Refuse to copy if DEST is a directory"
+//usage:     "\n        -t DIR  Copy all SOURCEs into DIR"
 //usage:     "\n        -u      Copy only newer files"
 
 #include "libbb.h"
@@ -73,14 +122,12 @@ int cp_main(int argc, char **argv)
         int flags;
         int status;
         enum {
-                FILEUTILS_CP_OPTNUM = sizeof(FILEUTILS_CP_OPTSTR)-1,
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
-                /*OPT_rmdest  = FILEUTILS_RMDEST = 1 << FILEUTILS_CP_OPTNUM */
-                OPT_parents = 1 << (FILEUTILS_CP_OPTNUM+1),
-                OPT_reflink = 1 << (FILEUTILS_CP_OPTNUM+2),
+                /*OPT_rmdest  = FILEUTILS_RMDEST = 1 << FILEUTILS_CP_OPTBITS */
+                OPT_parents = 1 << (FILEUTILS_CP_OPTBITS+1),
+                OPT_reflink = 1 << (FILEUTILS_CP_OPTBITS+2),
 #endif
         };
-
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
 # if ENABLE_FEATURE_CP_REFLINK
         char *reflink = NULL;
@@ -88,28 +135,34 @@ int cp_main(int argc, char **argv)
         flags = getopt32long(argv, "^"
                 FILEUTILS_CP_OPTSTR
                 "\0"
-                // Need at least two arguments
+                // Need at least one argument. (Usually two+, but -t DIR can have only one)
                 // Soft- and hardlinking doesn't mix
                 // -P and -d are the same (-P is POSIX, -d is GNU)
                 // -r and -R are the same
                 // -R (and therefore -r) turns on -d (coreutils does this)
                 // -a = -pdR
-                "-2:l--s:s--l:Pd:rRd:Rd:apdR",
+                // -i overrides -n and vice versa (last wins)
+                "-1:l--s:s--l:Pd:rRd:Rd:apdR:i-n:n-i",
                 "archive\0"        No_argument "a"
                 "force\0"          No_argument "f"
                 "interactive\0"    No_argument "i"
+                "no-clobber\0"     No_argument "n"
                 "link\0"           No_argument "l"
                 "dereference\0"    No_argument "L"
                 "no-dereference\0" No_argument "P"
                 "recursive\0"      No_argument "R"
                 "symbolic-link\0"  No_argument "s"
                 "no-target-directory\0" No_argument "T"
+                "target-directory\0" Required_argument "t"
                 "verbose\0"        No_argument "v"
                 "update\0"         No_argument "u"
                 "remove-destination\0" No_argument "\xff"
                 "parents\0"        No_argument "\xfe"
 # if ENABLE_FEATURE_CP_REFLINK
                 "reflink\0"        Optional_argument "\xfd"
+# endif
+                , &last
+# if ENABLE_FEATURE_CP_REFLINK
                 , &reflink
 # endif
         );
@@ -128,55 +181,10 @@ int cp_main(int argc, char **argv)
         flags = getopt32(argv, "^"
                 FILEUTILS_CP_OPTSTR
                 "\0"
-                "-2:l--s:s--l:Pd:rRd:Rd:apdR"
+                "-1:l--s:s--l:Pd:rRd:Rd:apdR"
+                , &last
         );
 #endif
-        /* Options of cp from GNU coreutils 6.10:
-         * -a, --archive
-         * -f, --force
-         * -i, --interactive
-         * -l, --link
-         * -L, --dereference
-         * -P, --no-dereference
-         * -R, -r, --recursive
-         * -s, --symbolic-link
-         * -v, --verbose
-         * -H   follow command-line symbolic links in SOURCE
-         * -d   same as --no-dereference --preserve=links
-         * -p   same as --preserve=mode,ownership,timestamps
-         * -c   same as --preserve=context
-         * -u, --update
-         *      copy only when the SOURCE file is newer than the destination
-         *      file or when the destination file is missing
-         * --remove-destination
-         *      remove each existing destination file before attempting to open
-         * --parents
-         *      use full source file name under DIRECTORY
-         * -T, --no-target-directory
-         *      treat DEST as a normal file
-         * NOT SUPPORTED IN BBOX:
-         * --backup[=CONTROL]
-         *      make a backup of each existing destination file
-         * -b   like --backup but does not accept an argument
-         * --copy-contents
-         *      copy contents of special files when recursive
-         * --preserve[=ATTR_LIST]
-         *      preserve attributes (default: mode,ownership,timestamps),
-         *      if possible additional attributes: security context,links,all
-         * --no-preserve=ATTR_LIST
-         * --sparse=WHEN
-         *      control creation of sparse files
-         * --strip-trailing-slashes
-         *      remove any trailing slashes from each SOURCE argument
-         * -S, --suffix=SUFFIX
-         *      override the usual backup suffix
-         * -t, --target-directory=DIRECTORY
-         *      copy all SOURCE arguments into DIRECTORY
-         * -x, --one-file-system
-         *      stay on this file system
-         * -Z, --context=CONTEXT
-         *      (SELinux) set SELinux security context of copy to CONTEXT
-         */
         argc -= optind;
         argv += optind;
         /* Reverse this bit. If there is -d, bit is not set: */
@@ -195,49 +203,56 @@ int cp_main(int argc, char **argv)
 #endif
 
         status = EXIT_SUCCESS;
-        last = argv[argc - 1];
-        /* If there are only two arguments and...  */
-        if (argc == 2) {
-                s_flags = cp_mv_stat2(*argv, &source_stat,
-                                (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
-                if (s_flags < 0)
-                        return EXIT_FAILURE;
-                d_flags = cp_mv_stat(last, &dest_stat);
-                if (d_flags < 0)
-                        return EXIT_FAILURE;
+        if (!(flags & FILEUTILS_TARGET_DIR)) {
+                last = argv[argc - 1];
+                if (argc < 2)
+                        bb_show_usage();
+                if (argc != 2) {
+                        if (flags & FILEUTILS_NO_TARGET_DIR)
+                                bb_show_usage();
+                        /* "cp A B C... DIR" - target must be dir */
+                } else /* argc == 2 */ {
+                        /* "cp A B" - only case where target can be not a dir */
+                        s_flags = cp_mv_stat2(*argv, &source_stat,
+                                        (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
+                        if (s_flags < 0) /* error other than ENOENT */
+                                return EXIT_FAILURE;
+                        d_flags = cp_mv_stat(last, &dest_stat);
+                        if (d_flags < 0) /* error other than ENOENT */
+                                return EXIT_FAILURE;
 
-                if (flags & FILEUTILS_NO_TARGET_DIR) { /* -T */
-                        if (!(s_flags & 2) && (d_flags & 2))
-                                /* cp -T NOTDIR DIR */
-                                bb_error_msg_and_die("'%s' is a directory", last);
-                }
+                        if (flags & FILEUTILS_NO_TARGET_DIR) { /* -T */
+                                if (!(s_flags & 2) && (d_flags & 2))
+                                        /* cp -T NOTDIR DIR */
+                                        bb_error_msg_and_die("'%s' is a directory", last);
+                        }
 
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
-                //bb_error_msg("flags:%x FILEUTILS_RMDEST:%x OPT_parents:%x",
-                //      flags, FILEUTILS_RMDEST, OPT_parents);
-                if (flags & OPT_parents) {
-                        if (!(d_flags & 2)) {
-                                bb_simple_error_msg_and_die("with --parents, the destination must be a directory");
+                        //bb_error_msg("flags:%x FILEUTILS_RMDEST:%x OPT_parents:%x",
+                        //      flags, FILEUTILS_RMDEST, OPT_parents);
+                        if (flags & OPT_parents) {
+                                if (!(d_flags & 2)) {
+                                        bb_simple_error_msg_and_die("with --parents, the destination must be a directory");
+                                }
+                        }
+                        if (flags & FILEUTILS_RMDEST) {
+                                flags |= FILEUTILS_FORCE;
                         }
-                }
-                if (flags & FILEUTILS_RMDEST) {
-                        flags |= FILEUTILS_FORCE;
-                }
 #endif
 
-                /* ...if neither is a directory...  */
-                if (!((s_flags | d_flags) & 2)
-                    /* ...or: recursing, the 1st is a directory, and the 2nd doesn't exist... */
-                 || ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags)
-                 || (flags & FILEUTILS_NO_TARGET_DIR)
-                ) {
-                        /* Do a simple copy */
-                        dest = last;
-                        goto DO_COPY; /* NB: argc==2 -> *++argv==last */
+                        /* ...if neither is a directory...  */
+                        if (!((s_flags | d_flags) & 2)
+                            /* ...or: recursing, the 1st is a directory, and the 2nd doesn't exist... */
+                         || ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags)
+                         || (flags & FILEUTILS_NO_TARGET_DIR)
+                        ) {
+                                /* Do a simple copy */
+                                dest = last;
+                                goto DO_COPY; /* NB: argc==2 -> *++argv==last */
+                        }
                 }
-        } else if (flags & FILEUTILS_NO_TARGET_DIR) {
-                bb_simple_error_msg_and_die("too many arguments");
         }
+        /* else: last is DIR from "-t DIR" */
 
         while (1) {
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
@@ -259,7 +274,7 @@ int cp_main(int argc, char **argv)
                 if (copy_file(*argv, dest, flags) < 0) {
                         status = EXIT_FAILURE;
                 }
-                if (*++argv == last) {
+                if (!*++argv || *argv == last) {
                         /* possibly leaking dest... */
                         break;
                 }
diff --git a/coreutils/cut.c b/coreutils/cut.c
index 5897d82b6..cc3c32576 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -29,6 +29,7 @@
 //usage:     "\n        -s      Output only lines containing delimiter"
 //usage:     "\n        -f LIST Print only these fields"
 //usage:     "\n        -n      Ignored"
+//(manpage:-n   with -b: don't split multibyte characters)
 //usage:
 //usage:#define cut_example_usage
 //usage:       "$ echo \"Hello world\" | cut -f 1 -d ' '\n"
diff --git a/coreutils/df.c b/coreutils/df.c
index debb86867..e8d4bc8f2 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -45,7 +45,7 @@
 //usage:        IF_FEATURE_HUMAN_READABLE("mh")
 //usage:        "T"
 //usage:        IF_FEATURE_DF_FANCY("ai] [-B SIZE")
-//usage:        "] [FILESYSTEM]..."
+//usage:        "] [-t TYPE] [FILESYSTEM]..."
 //usage:#define df_full_usage "\n\n"
 //usage:       "Print filesystem usage statistics\n"
 //usage:     "\n        -P      POSIX output format"
@@ -55,6 +55,7 @@
 //usage:     "\n        -h      Human readable (e.g. 1K 243M 2G)"
 //usage:        )
 //usage:     "\n        -T      Print filesystem type"
+//usage:     "\n        -t TYPE Print only mounts of this type"
 //usage:        IF_FEATURE_DF_FANCY(
 //usage:     "\n        -a      Show all filesystems"
 //usage:     "\n        -i      Inodes"
@@ -97,24 +98,31 @@ int df_main(int argc UNUSED_PARAM, char **argv)
         FILE *mount_table;
         struct mntent *mount_entry;
         struct statvfs s;
-
         enum {
-                OPT_KILO  = (1 << 0),
-                OPT_POSIX = (1 << 1),
-                OPT_FSTYPE  = (1 << 2),
-                OPT_ALL   = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
-                OPT_INODE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
-                OPT_BSIZE = (1 << 5) * ENABLE_FEATURE_DF_FANCY,
-                OPT_HUMAN = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
-                OPT_MEGA  = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+                OPT_KILO   = (1 << 0),
+                OPT_POSIX  = (1 << 1),
+                OPT_FSTYPE = (1 << 2),
+                OPT_t      = (1 << 3),
+                OPT_ALL    = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
+                OPT_INODE  = (1 << 5) * ENABLE_FEATURE_DF_FANCY,
+                OPT_BSIZE  = (1 << 6) * ENABLE_FEATURE_DF_FANCY,
+                OPT_HUMAN  = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+                OPT_MEGA   = (1 << (5 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
         };
         const char *disp_units_hdr = NULL;
-        char *chp;
+        char *chp, *opt_t;
 
         init_unicode();
 
+        /* From the manpage of df from coreutils-6.10:
+         * Disk space is shown in 1K blocks by default, unless the environment
+         * variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
+         */
+        if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */
+                df_disp_hr = 512;
+
         opt = getopt32(argv, "^"
-                        "kPT"
+                        "kPTt:"
                         IF_FEATURE_DF_FANCY("aiB:")
                         IF_FEATURE_HUMAN_READABLE("hm")
                         "\0"
@@ -123,6 +131,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
 #elif ENABLE_FEATURE_HUMAN_READABLE
                         "k-m:m-k"
 #endif
+                        , &opt_t
                         IF_FEATURE_DF_FANCY(, &chp)
         );
         if (opt & OPT_MEGA)
@@ -142,13 +151,6 @@ int df_main(int argc UNUSED_PARAM, char **argv)
  got_it: ;
         }
 
-        /* From the manpage of df from coreutils-6.10:
-         * Disk space is shown in 1K blocks by default, unless the environment
-         * variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
-         */
-        if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */
-                df_disp_hr = 512;
-
         if (opt & OPT_HUMAN) {
                 df_disp_hr = 0;
                 disp_units_hdr = "     Size";
@@ -214,6 +216,11 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                 mount_point = mount_entry->mnt_dir;
                 fs_type = mount_entry->mnt_type;
 
+                if (opt & OPT_t) {
+                        if (strcmp(fs_type, opt_t) != 0)
+                                continue;
+                }
+
                 if (statvfs(mount_point, &s) != 0) {
                         bb_simple_perror_msg(mount_point);
                         goto set_error;
diff --git a/coreutils/du.c b/coreutils/du.c
index 247a08c95..092647468 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -42,6 +42,7 @@
 //usage:#define du_full_usage "\n\n"
 //usage:       "Summarize disk space used for FILEs (or directories)\n"
 //usage:     "\n        -a      Show file sizes too"
+//usage:     "\n        -b      Apparent size (including holes)"
 //usage:     "\n        -L      Follow all symlinks"
 //usage:     "\n        -H      Follow symlinks on command line"
 //usage:     "\n        -d N    Limit output to directories (and files with -a) of depth < N"
@@ -84,8 +85,9 @@ enum {
         OPT_d_maxdepth     = (1 << 6),
         OPT_l_hardlinks    = (1 << 7),
         OPT_c_total        = (1 << 8),
-        OPT_h_for_humans   = (1 << 9),
-        OPT_m_mbytes       = (1 << 10),
+        OPT_b              = (1 << 9),
+        OPT_h_for_humans   = (1 << 10),
+        OPT_m_mbytes       = (1 << 11),
 };
 
 struct globals {
@@ -109,7 +111,7 @@ static void print(unsigned long long size, const char *filename)
         /* TODO - May not want to defer error checking here. */
 #if ENABLE_FEATURE_HUMAN_READABLE
 # if ENABLE_DESKTOP
-        /* ~30 bytes of code for extra comtat:
+        /* ~30 bytes of code for extra compat:
          * coreutils' du rounds sizes up:
          * for example,  1025k file is shown as "2" by du -m.
          * We round to nearest if human-readable [too hard to fix],
@@ -124,12 +126,16 @@ static void print(unsigned long long size, const char *filename)
                          * If G.disp_unit == 0, show one fractional
                          * and use suffixes
                          */
-                        make_human_readable_str(size, 512, G.disp_unit),
+                        make_human_readable_str(size, (option_mask32 & OPT_b) ? 1 : 512, G.disp_unit),
                         filename);
 #else
         if (G.disp_k) {
-                size++;
-                size >>= 1;
+                if (!(option_mask32 & OPT_b)) {
+                        size++;
+                        size >>= 1;
+                } else {
+                        size >>= 10;
+                }
         }
         printf("%"LL_FMT"u\t%s\n", size, filename);
 #endif
@@ -155,7 +161,7 @@ static unsigned long long du(const char *filename)
                 }
         }
 
-        sum = statbuf.st_blocks;
+        sum = ((option_mask32 & OPT_b) ? statbuf.st_size : statbuf.st_blocks);
 
         if (S_ISLNK(statbuf.st_mode)) {
                 if (G.slink_depth > G.du_depth) { /* -H or -L */
@@ -164,7 +170,7 @@ static unsigned long long du(const char *filename)
                                 G.status = EXIT_FAILURE;
                                 return 0;
                         }
-                        sum = statbuf.st_blocks;
+                        sum = ((option_mask32 & OPT_b) ? statbuf.st_size : statbuf.st_blocks);
                         if (G.slink_depth == 1) {
                                 /* Convert -H to -L */
                                 G.slink_depth = INT_MAX;
@@ -241,11 +247,14 @@ int du_main(int argc UNUSED_PARAM, char **argv)
          */
 #if ENABLE_FEATURE_HUMAN_READABLE
         opt = getopt32(argv, "^"
-                        "aHkLsxd:+lchm"
+                        "aHkLsxd:+lcbhm"
                         "\0" "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s",
                         &G.max_print_depth
         );
         argv += optind;
+        if (opt & OPT_b) {
+                G.disp_unit = 1;
+        }
         if (opt & OPT_h_for_humans) {
                 G.disp_unit = 0;
         }
@@ -257,16 +266,16 @@ int du_main(int argc UNUSED_PARAM, char **argv)
         }
 #else
         opt = getopt32(argv, "^"
-                        "aHkLsxd:+lc"
+                        "aHkLsxd:+lcb"
                         "\0" "H-L:L-H:s-d:d-s",
                         &G.max_print_depth
         );
         argv += optind;
-#if !ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+# if !ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
         if (opt & OPT_k_kbytes) {
                 G.disp_k = 1;
         }
-#endif
+# endif
 #endif
         if (opt & OPT_H_follow_links) {
                 G.slink_depth = 1;
diff --git a/coreutils/echo.c b/coreutils/echo.c
index aab177cee..82f0358b6 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -43,10 +43,10 @@
 //usage:#define echo_trivial_usage
 //usage:        IF_FEATURE_FANCY_ECHO("[-neE] ") "[ARG]..."
 //usage:#define echo_full_usage "\n\n"
-//usage:       "Print the specified ARGs to stdout"
+//usage:       "Print ARGs to stdout"
 //usage:        IF_FEATURE_FANCY_ECHO( "\n"
-//usage:     "\n        -n      Suppress trailing newline"
-//usage:     "\n        -e      Interpret backslash escapes (i.e., \\t=tab)"
+//usage:     "\n        -n      No trailing newline"
+//usage:     "\n        -e      Interpret backslash escapes (\\t=tab etc)"
 //usage:     "\n        -E      Don't interpret backslash escapes (default)"
 //usage:        )
 //usage:
diff --git a/coreutils/env.c b/coreutils/env.c
index c37c0c2df..a0ea4dd27 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -39,12 +39,15 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/env.html */
 
 //usage:#define env_trivial_usage
-//usage:       "[-iu] [-] [name=value]... [PROG ARGS]"
+//usage:       "[-i0] [-u NAME]... [-] [NAME=VALUE]... [PROG ARGS]"
+// The "-" can occur only once (unlike, say, -i): it terminates option processing,
+// so if it is followed by another "-" arg (or any option-looking arg),
+// that arg will be taken as PROG (or even as NAME=VALUE, example: "-z=QWE").
 //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:     "\n        -, -i   Start with an empty environment"
-//usage:     "\n        -u      Remove variable from the environment"
+//usage:       "Print current environment or run PROG after setting up environment\n"
+//usage:     "\n        -, -i   Start with empty environment"
+//usage:     "\n        -0      NUL terminated output"
+//usage:     "\n        -u NAME Remove variable from environment"
 
 #include "libbb.h"
 
@@ -54,8 +57,9 @@ int env_main(int argc UNUSED_PARAM, char **argv)
         unsigned opts;
         llist_t *unset_env = NULL;
 
-        opts = getopt32long(argv, "+iu:*",
+        opts = getopt32long(argv, "+i0u:*",
                         "ignore-environment\0" No_argument       "i"
+                        "null\0"               No_argument       "0"
                         "unset\0"              Required_argument "u"
                         , &unset_env
         );
@@ -90,8 +94,9 @@ int env_main(int argc UNUSED_PARAM, char **argv)
 
         if (environ) { /* clearenv() may set environ == NULL! */
                 char **ep;
+                opts = (opts & 2) ? 0 : '\n';
                 for (ep = environ; *ep; ep++) {
-                        puts(*ep);
+                        printf("%s%c", *ep, opts);
                 }
         }
 
diff --git a/coreutils/expr.c b/coreutils/expr.c
index c11505d13..b896acd44 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -45,7 +45,7 @@
 //usage:#define expr_trivial_usage
 //usage:       "EXPRESSION"
 //usage:#define expr_full_usage "\n\n"
-//usage:       "Print the value of EXPRESSION to stdout\n"
+//usage:       "Print the value of EXPRESSION\n"
 //usage:    "\n"
 //usage:       "EXPRESSION may be:\n"
 //usage:       "        ARG1 | ARG2     ARG1 if it is neither null nor 0, otherwise ARG2\n"
@@ -63,7 +63,7 @@
 //usage:       "        ARG1 % ARG2\n"
 //usage:       "        STRING : REGEXP         Anchored pattern match of REGEXP in STRING\n"
 //usage:       "        match STRING REGEXP     Same as STRING : REGEXP\n"
-//usage:       "        substr STRING POS LENGTH Substring of STRING, POS counted from 1\n"
+//usage:       "        substr STRING POS LEN   Substring of STRING, POS counts from 1\n"
 //usage:       "        index STRING CHARS      Index in STRING where any CHARS is found, or 0\n"
 //usage:       "        length STRING           Length of STRING\n"
 //usage:       "        quote TOKEN             Interpret TOKEN as a string, even if\n"
diff --git a/coreutils/id.c b/coreutils/id.c
index f453a87ae..18bda3c55 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -52,7 +52,7 @@
 //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:       "Print the groups USER is in"
 //usage:
 //usage:#define groups_example_usage
 //usage:       "$ groups\n"
diff --git a/coreutils/mv.c b/coreutils/mv.c
index f5ed9fcfc..fd2422683 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -23,13 +23,15 @@
 //kbuild:lib-$(CONFIG_MV) += mv.o
 
 //usage:#define mv_trivial_usage
-//usage:       "[-fin] SOURCE DEST\n"
-//usage:       "or: mv [-fin] SOURCE... DIRECTORY"
+//usage:       "[-finT] SOURCE DEST\n"
+//usage:       "or: mv [-fin] SOURCE... { -t DIRECTORY | DIRECTORY }"
 //usage:#define mv_full_usage "\n\n"
 //usage:       "Rename SOURCE to DEST, or move SOURCEs to DIRECTORY\n"
 //usage:     "\n        -f      Don't prompt before overwriting"
 //usage:     "\n        -i      Interactive, prompt before overwrite"
 //usage:     "\n        -n      Don't overwrite an existing file"
+//usage:     "\n        -T      Refuse to move if DEST is a directory"
+//usage:     "\n        -t DIR  Move all SOURCEs into DIR"
 //usage:
 //usage:#define mv_example_usage
 //usage:       "$ mv /tmp/foo /bin/bar\n"
@@ -40,7 +42,7 @@
 int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mv_main(int argc, char **argv)
 {
-        struct stat dest_stat;
+        struct stat statbuf;
         const char *last;
         const char *dest;
         unsigned flags;
@@ -51,41 +53,66 @@ int mv_main(int argc, char **argv)
 #define OPT_FORCE       (1 << 0)
 #define OPT_INTERACTIVE (1 << 1)
 #define OPT_NOCLOBBER   (1 << 2)
-#define OPT_VERBOSE     ((1 << 3) * ENABLE_FEATURE_VERBOSE)
-        /* Need at least two arguments.
-         * If more than one of -f, -i, -n is specified , only the final one
-         * takes effect (it unsets previous options).
-         */
+#define OPT_DESTNOTDIR  (1 << 3)
+#define OPT_DESTDIR     (1 << 4)
+#define OPT_VERBOSE     ((1 << 5) * ENABLE_FEATURE_VERBOSE)
         flags = getopt32long(argv, "^"
-                        "finv"
+                        "finTt:v"
                         "\0"
-                        "-2:f-in:i-fn:n-fi",
+        /* At least one argument. (Usually two+, but -t DIR can have only one) */
+                        "-1"
+        /* only the final one of -f, -i, -n takes effect */
+                        ":f-in:i-fn:n-fi"
+        /* -t and -T don't mix */
+                        ":t--T:T--t",
                         "interactive\0" No_argument "i"
                         "force\0"       No_argument "f"
                         "no-clobber\0"  No_argument "n"
+                        "no-target-directory\0" No_argument "T"
+                        "target-directory\0" Required_argument "t"
                         IF_FEATURE_VERBOSE(
-                        "verbose\0"     No_argument "v"
+                        "verbose\0"     No_argument "v",
+                        &last
                         )
         );
         argc -= optind;
         argv += optind;
-        last = argv[argc - 1];
 
-        if (argc == 2) {
-                dest_exists = cp_mv_stat(last, &dest_stat);
-                if (dest_exists < 0) {
-                        return EXIT_FAILURE;
-                }
-
-                if (!(dest_exists & 2)) { /* last is not a directory */
-                        dest = last;
-                        goto DO_MOVE;
+        if (!(flags & OPT_DESTDIR)) {
+                last = argv[argc - 1];
+                if (argc < 2)
+                        bb_show_usage();
+                if (argc != 2) {
+                        if (flags & OPT_DESTNOTDIR)
+                                bb_show_usage();
+                        /* "mv A B C... DIR" - target must be dir */
+                } else /* argc == 2 */ {
+                        /* "mv A B" - only case where target can be not a dir */
+                        dest_exists = cp_mv_stat(last, &statbuf);
+                        if (dest_exists < 0) { /* error other than ENOENT */
+                                return EXIT_FAILURE;
+                        }
+                        if (!(dest_exists & 2)) {
+                                /* last is not a directory */
+                                dest = last;
+                                goto DO_MOVE;
+                        }
+                        /* last is a directory */
+                        if (flags & OPT_DESTNOTDIR) {
+                                if (stat(argv[0], &statbuf) == 0 && !S_ISDIR(statbuf.st_mode))
+                                        bb_error_msg_and_die("'%s' is a directory", last);
+                                /* "mv -T DIR1 DIR2" is allowed (renames a dir) */
+                                dest = last;
+                                goto DO_MOVE;
+                        }
+                        /* else: fall through into "do { move SRC to DIR/SRC } while" loop */
                 }
         }
+        /* else: last is DIR from "-t DIR" */
 
         do {
                 dest = concat_path_file(last, bb_get_last_path_component_strip(*argv));
-                dest_exists = cp_mv_stat(dest, &dest_stat);
+                dest_exists = cp_mv_stat(dest, &statbuf);
                 if (dest_exists < 0) {
                         goto RET_1;
                 }
@@ -108,11 +135,10 @@ int mv_main(int argc, char **argv)
                 }
 
                 if (rename(*argv, dest) < 0) {
-                        struct stat source_stat;
                         int source_exists;
 
                         if (errno != EXDEV
-                         || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1
+                         || (source_exists = cp_mv_stat2(*argv, &statbuf, lstat)) < 1
                         ) {
                                 bb_perror_msg("can't rename '%s'", *argv);
                         } else {
@@ -159,7 +185,7 @@ int mv_main(int argc, char **argv)
                 if (dest != last) {
                         free((void *) dest);
                 }
-        } while (*++argv != last);
+        } while (*++argv && *argv != last);
 
         return status;
 }
diff --git a/coreutils/nproc.c b/coreutils/nproc.c
index 7025765c5..b345255a7 100644
--- a/coreutils/nproc.c
+++ b/coreutils/nproc.c
@@ -14,7 +14,7 @@
 //kbuild:lib-$(CONFIG_NPROC) += nproc.o
 
 //usage:#define nproc_trivial_usage
-//usage:        ""IF_LONG_OPTS("--all --ignore=N")
+//usage:        ""IF_LONG_OPTS("[--all] [--ignore=N]")
 //usage:#define nproc_full_usage "\n\n"
 //usage:        "Print number of available CPUs"
 //usage:        IF_LONG_OPTS(
@@ -49,7 +49,7 @@ int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                                 if (cpuid && isdigit(cpuid[strlen(cpuid) - 1]))
                                         count++;
                         }
-                        closedir(cpusd);
+                        IF_FEATURE_CLEAN_UP(closedir(cpusd);)
                 }
         } else
 #endif
diff --git a/coreutils/shred.c b/coreutils/shred.c
index 0b11b9491..794d7b815 100644
--- a/coreutils/shred.c
+++ b/coreutils/shred.c
@@ -15,14 +15,15 @@
 //kbuild:lib-$(CONFIG_SHRED) += shred.o
 
 //usage:#define shred_trivial_usage
-//usage:       "FILE..."
+//usage:       "[-fuz] [-n N] [-s SIZE] FILE..."
 //usage:#define shred_full_usage "\n\n"
 //usage:       "Overwrite/delete FILEs\n"
 //usage:     "\n        -f      Chmod to ensure writability"
+//usage:     "\n        -s SIZE Size to write"
 //usage:     "\n        -n N    Overwrite N times (default 3)"
 //usage:     "\n        -z      Final overwrite with zeros"
 //usage:     "\n        -u      Remove file"
-//-x and -v are accepted but have no effect
+//-x (exact: don't round up to 4k) and -v (verbose) are accepted but have no effect
 
 /* shred (GNU coreutils) 8.25:
 -f, --force             change permissions to allow writing if necessary
@@ -41,6 +42,7 @@
 int shred_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int shred_main(int argc UNUSED_PARAM, char **argv)
 {
+        char *opt_s;
         int rand_fd = rand_fd; /* for compiler */
         int zero_fd;
         unsigned num_iter = 3;
@@ -52,18 +54,16 @@ int shred_main(int argc UNUSED_PARAM, char **argv)
                 OPT_n = (1 << 3),
                 OPT_v = (1 << 4),
                 OPT_x = (1 << 5),
+                OPT_s = (1 << 6),
         };
 
-        opt = getopt32(argv, "fuzn:+vx", &num_iter);
+        opt = getopt32(argv, "^" "fuzn:+vxs:" "\0" "-1"/*min 1 arg*/, &num_iter, &opt_s);
         argv += optind;
 
         zero_fd = MINGW_SPECIAL(xopen)("/dev/zero", O_RDONLY);
         if (num_iter != 0)
                 rand_fd = MINGW_SPECIAL(xopen)("/dev/urandom", O_RDONLY);
 
-        if (!*argv)
-                bb_show_usage();
-
         for (;;) {
                 struct stat sb;
                 const char *fname;
@@ -85,6 +85,11 @@ int shred_main(int argc UNUSED_PARAM, char **argv)
                 if (fstat(fd, &sb) == 0 && sb.st_size > 0) {
                         off_t size = sb.st_size;
 
+                        if (opt & OPT_s) {
+                                size = BB_STRTOOFF(opt_s, NULL, 0); /* accepts oct/hex */
+                                if (errno || size < 0) bb_show_usage();
+                        }
+
                         for (i = 0; i < num_iter; i++) {
                                 bb_copyfd_size(rand_fd, fd, size);
                                 fdatasync(fd);
@@ -94,18 +99,18 @@ int shred_main(int argc UNUSED_PARAM, char **argv)
                                 bb_copyfd_size(zero_fd, fd, size);
                                 fdatasync(fd);
                         }
-                        if (opt & OPT_u) {
-                                ftruncate(fd, 0);
+                }
+                if (opt & OPT_u) {
+                        ftruncate(fd, 0);
 #if ENABLE_PLATFORM_MINGW32
-                                xclose(fd);
+                        xclose(fd);
 #endif
-                                xunlink(fname);
-                        }
+                        xunlink(fname);
+                }
 #if ENABLE_PLATFORM_MINGW32
-                        else
+                else
 #endif
-                        xclose(fd);
-                }
+                xclose(fd);
         }
 
         return EXIT_SUCCESS;
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 6c4e3038c..32a06e40a 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -67,7 +67,7 @@
 //usage:     "\n        -r      Reverse sort order"
 //usage:     "\n        -s      Stable (don't sort ties alphabetically)"
 //usage:     "\n        -u      Suppress duplicate lines"
-//usage:     "\n        -z      Lines are terminated by NUL, not newline"
+//usage:     "\n        -z      NUL terminated input and output"
 ///////:     "\n        -m      Ignored for GNU compatibility"
 ///////:     "\n        -S BUFSZ Ignored for GNU compatibility"
 ///////:     "\n        -T TMPDIR Ignored for GNU compatibility"
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 2b225dd16..ec12eb7cf 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -31,7 +31,7 @@
 //kbuild:lib-$(CONFIG_TOUCH) += touch.o
 
 //usage:#define touch_trivial_usage
-//usage:       "[-c" IF_FEATURE_TOUCH_SUSV3("am") "]"
+//usage:       "[-ch" IF_FEATURE_TOUCH_SUSV3("am") "]"
 //usage:       IF_FEATURE_TOUCH_SUSV3(" [-d DATE] [-t DATE] [-r FILE]")
 //usage:       " FILE..."
 //usage:#define touch_full_usage "\n\n"
diff --git a/coreutils/tty.c b/coreutils/tty.c
index ff6f2bb3b..e448c27ec 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -21,7 +21,7 @@
 /* http://www.opengroup.org/onlinepubs/9699919799/utilities/tty.html */
 
 //usage:#define tty_trivial_usage
-//usage:       ""
+//usage:       "" IF_INCLUDE_SUSv2("[-s]")
 //usage:#define tty_full_usage "\n\n"
 //usage:       "Print file name of stdin's terminal"
 //usage:        IF_INCLUDE_SUSv2( "\n"
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 2a1602b4c..da785ab4c 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -79,13 +79,13 @@
 //usage:#define uname_full_usage "\n\n"
 //usage:       "Print system information\n"
 //usage:     "\n        -a      Print all"
-//usage:     "\n        -m      The machine (hardware) type"
+//usage:     "\n        -m      Machine (hardware) type"
 //usage:     "\n        -n      Hostname"
 //usage:     "\n        -r      Kernel release"
 //usage:     "\n        -s      Kernel name (default)"
 //usage:     "\n        -p      Processor type"
 //usage:     "\n        -v      Kernel version"
-//usage:     "\n        -i      The hardware platform"
+//usage:     "\n        -i      Hardware platform"
 //usage:     "\n        -o      OS name"
 //usage:
 //usage:#define uname_example_usage
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index e1594286f..a3058ac07 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -20,13 +20,14 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */
 
 //usage:#define uniq_trivial_usage
-//usage:       "[-cdui] [-f,s,w N] [INPUT [OUTPUT]]"
+//usage:       "[-cduiz] [-f,s,w N] [FILE [OUTFILE]]"
 //usage:#define uniq_full_usage "\n\n"
 //usage:       "Discard duplicate lines\n"
 //usage:     "\n        -c      Prefix lines by the number of occurrences"
 //usage:     "\n        -d      Only print duplicate lines"
 //usage:     "\n        -u      Only print unique lines"
 //usage:     "\n        -i      Ignore case"
+//usage:     "\n        -z      NUL terminated output"
 //usage:     "\n        -f N    Skip first N fields"
 //usage:     "\n        -s N    Skip first N chars (after any skipped fields)"
 //usage:     "\n        -w N    Compare N characters in line"
@@ -45,23 +46,25 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
         const char *input_filename;
         unsigned skip_fields, skip_chars, max_chars;
         unsigned opt;
+        char eol;
         char *cur_line;
         const char *cur_compare;
 
         enum {
-                OPT_c = 0x1,
-                OPT_d = 0x2, /* print only dups */
-                OPT_u = 0x4, /* print only uniq */
-                OPT_f = 0x8,
-                OPT_s = 0x10,
-                OPT_w = 0x20,
-                OPT_i = 0x40,
+                OPT_c = 1 << 0,
+                OPT_d = 1 << 1, /* print only dups */
+                OPT_u = 1 << 2, /* print only uniq */
+                OPT_f = 1 << 3,
+                OPT_s = 1 << 4,
+                OPT_w = 1 << 5,
+                OPT_i = 1 << 6,
+                OPT_z = 1 << 7,
         };
 
         skip_fields = skip_chars = 0;
         max_chars = INT_MAX;
 
-        opt = getopt32(argv, "cduf:+s:+w:+i", &skip_fields, &skip_chars, &max_chars);
+        opt = getopt32(argv, "cduf:+s:+w:+iz", &skip_fields, &skip_chars, &max_chars);
         argv += optind;
 
         input_filename = argv[0];
@@ -86,6 +89,7 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
         }
 
         cur_compare = cur_line = NULL; /* prime the pump */
+        eol = (opt & OPT_z) ? 0 : '\n';
 
         do {
                 unsigned i;
@@ -127,7 +131,7 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
                                         /* %7lu matches GNU coreutils 6.9 */
                                         printf("%7lu ", dups + 1);
                                 }
-                                puts(old_line);
+                                printf("%s%c", old_line, eol);
                         }
                         free(old_line);
                 }
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 02b037276..a607977e9 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -183,7 +183,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define base32_trivial_usage
 //usage:        "[-d] [-w COL] [FILE]"
 //usage:#define base32_full_usage "\n\n"
-//usage:       "Base32 encode or decode FILE to standard output"
+//usage:       "Base32 encode or decode FILE to standard output\n"
 //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"
@@ -191,10 +191,12 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define base64_trivial_usage
 //usage:        "[-d] [-w COL] [FILE]"
 //usage:#define base64_full_usage "\n\n"
-//usage:       "Base64 encode or decode FILE to standard output"
+//usage:       "Base64 encode or decode FILE to standard output\n"
 //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"
+///////:     "\n        -i      When decoding, ignore non-alphabet characters"
+// -i is accepted but has no effect: currently, decode_base32/64() functions
+// (called via read_base64()) skip invalid chars unconditionally.
 
 //                 APPLET_ODDNAME:name    main     location    suid_type     help
 //applet:IF_BASE32(APPLET_ODDNAME(base32, baseNUM, BB_DIR_BIN, BB_SUID_DROP, base32))
@@ -272,7 +274,7 @@ int baseNUM_main(int argc UNUSED_PARAM, char **argv)
         unsigned opts;
         unsigned col = 76;
 
-        opts = getopt32(argv, "^" "dw:+" "\0" "?1"/* 1 arg max*/, &col);
+        opts = getopt32(argv, "^" "diw:+" "\0" "?1"/* 1 arg max*/, &col);
         argv += optind;
 
         if (!argv[0])
diff --git a/coreutils/who.c b/coreutils/who.c
index be9c3ccca..3725d77f5 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -78,7 +78,7 @@
 // root     pts/1     Mon13    3:24m  1:01   0.01s w
 
 //usage:#define who_trivial_usage
-//usage:       "[-a]"
+//usage:       "[-aH]"
 //usage:#define who_full_usage "\n\n"
 //usage:       "Show who is logged on\n"
 //usage:     "\n        -a      Show all"
diff --git a/coreutils/yes.c b/coreutils/yes.c
index 38ffff46c..64dfa500c 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -27,7 +27,7 @@
 //usage:#define yes_trivial_usage
 //usage:       "[STRING]"
 //usage:#define yes_full_usage "\n\n"
-//usage:       "Repeatedly output a line with STRING, or 'y'"
+//usage:       "Repeatedly print a line with STRING, or 'y'"
 
 #include "libbb.h"
 
diff --git a/docs/busybox_footer.pod b/docs/busybox_footer.pod
index 92748eb72..0f4810bd3 100644
--- a/docs/busybox_footer.pod
+++ b/docs/busybox_footer.pod
@@ -37,6 +37,7 @@ incorrect, please send in an update.
 =for html <br>
 
 Emanuele Aina <emanuele.aina@tiscali.it>
+
     run-parts
 
 =for html <br>
diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c
index e1a798727..c1e90d13f 100644
--- a/e2fsprogs/chattr.c
+++ b/e2fsprogs/chattr.c
@@ -21,7 +21,7 @@
 
 //usage:#define chattr_trivial_usage
 //usage:     IF_NOT_PLATFORM_MINGW32(
-//usage:       "[-R] [-v VERSION] [-+=AacDdijsStTu] FILE..."
+//usage:       "[-R] [-v VERSION] [-p PROJID] [-+=AacDdijsStTu] FILE..."
 //usage:     )
 //usage:     IF_PLATFORM_MINGW32(
 //usage:       "[-R] [-+rhsatn] FILE..."
@@ -35,24 +35,34 @@
 //usage:     )
 //usage:     "\n        -R      Recurse"
 //usage:     IF_NOT_PLATFORM_MINGW32(
-//usage:     "\n        -v VER  Set version/generation number"
+//usage:     "\n        -v NUM  Set version/generation number"
+//usage:     "\n        -p NUM  Set project number"
 //usage:     )
 //-V, -f accepted but ignored
 //usage:     "\nModifiers:"
 //usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:     "\n        -,+,=   Remove/add/set attributes"
 //usage:     "\nAttributes:"
-//usage:     "\n        A       Don't track atime"
-//usage:     "\n        a       Append mode only"
-//usage:     "\n        c       Enable compress"
-//usage:     "\n        D       Write dir contents synchronously"
+//usage:     "\n        A       No atime"
+//usage:     "\n        a       Append only"
+//usage:     "\n        C       No copy-on-write"
+//usage:     "\n        c       Compressed"
+//usage:     "\n        D       Synchronous dir updates"
 //usage:     "\n        d       Don't backup with dump"
-//usage:     "\n        i       Cannot be modified (immutable)"
-//usage:     "\n        j       Write all data to journal first"
-//usage:     "\n        s       Zero disk storage when deleted"
-//usage:     "\n        S       Write synchronously"
-//usage:     "\n        t       Disable tail-merging of partial blocks with other files"
-//usage:     "\n        u       Allow file to be undeleted"
+//usage:     "\n        E       Encrypted"
+//usage:     "\n        e       File uses extents"
+//usage:     "\n        F       Case-insensitive dir"
+//usage:     "\n        I       Indexed dir"
+//usage:     "\n        i       Immutable"
+//usage:     "\n        j       Write data to journal first"
+//usage:     "\n        N       File is stored in inode"
+//usage:     "\n        P       Hierarchical project ID dir"
+//usage:     "\n        S       Synchronous file updates"
+//usage:     "\n        s       Zero storage when deleted"
+//usage:     "\n        T       Top of dir hierarchy"
+//usage:     "\n        t       Don't tail-merge with other files"
+//usage:     "\n        u       Allow undelete"
+//usage:     "\n        V       Verity"
 //usage:     )
 //usage:     IF_PLATFORM_MINGW32(
 //usage:     "\n        -,+     Remove/add attributes"
@@ -68,18 +78,22 @@
 #include "libbb.h"
 #include "e2fs_lib.h"
 
-#define OPT_ADD 1
-#define OPT_REM 2
-#define OPT_SET 4
-#define OPT_SET_VER 8
+#define OPT_ADD      (1 << 0)
+#define OPT_REM      (1 << 1)
+#define OPT_SET      (1 << 2)
+#define OPT_SET_VER  (1 << 3)
+#define OPT_SET_PROJ (1 << 4)
 
 struct globals {
 #if !ENABLE_PLATFORM_MINGW32
-        unsigned long version;
+        unsigned version;
 #endif
-        unsigned long af;
-        unsigned long rf;
+        unsigned af;
+        unsigned rf;
         int flags;
+#if !ENABLE_PLATFORM_MINGW32
+        uint32_t projid;
+#endif
         smallint recursive;
 };
 
@@ -93,13 +107,15 @@ static unsigned long get_flag(char c)
 
 static char** decode_arg(char **argv, struct globals *gp)
 {
-        unsigned long *fl;
+        unsigned *fl;
         const char *arg = *argv;
         char opt = *arg;
 
         fl = &gp->af;
         if (opt == '-') {
-                gp->flags |= OPT_REM;
+                /* gp->flags |= OPT_REM; - WRONG, it can be an option */
+                /* testcase: chattr =ae -R FILE should not complain "= is incompatible with - and +" */
+                /* (and should not read flags, with =FLAGS they can be just set directly) */
                 fl = &gp->rf;
 #if ENABLE_PLATFORM_MINGW32
         } else { /* if (opt == '+') */
@@ -136,15 +152,22 @@ static char** decode_arg(char **argv, struct globals *gp)
                         if (*arg == 'v') {
                                 if (!*++argv)
                                         bb_show_usage();
-                                gp->version = xatoul(*argv);
+                                gp->version = xatou(*argv);
                                 gp->flags |= OPT_SET_VER;
                                 continue;
                         }
-//TODO: "-p PROJECT_NUM" ?
+                        if (*arg == 'p') {
+                                if (!*++argv)
+                                        bb_show_usage();
+                                gp->projid = xatou32(*argv);
+                                gp->flags |= OPT_SET_PROJ;
+                                continue;
+                        }
 #endif
                         /* not a known option, try as an attribute */
+                        gp->flags |= OPT_REM;
                 }
-                *fl |= get_flag(*arg);
+                *fl |= get_flag(*arg); /* aborts on bad flag letter */
         }
 
         return argv;
@@ -154,6 +177,8 @@ static void change_attributes(const char *name, struct globals *gp);
 
 static int FAST_FUNC chattr_dir_proc(const char *dir_name, struct dirent *de, void *gp)
 {
+//TODO: use de->d_type (if it's not DT_UNKNOWN) to skip !(REG || DIR || LNK) entries without lstat?
+
         char *path = concat_subpath_file(dir_name, de->d_name);
         /* path is NULL if de->d_name is "." or "..", else... */
         if (path) {
@@ -165,15 +190,16 @@ static int FAST_FUNC chattr_dir_proc(const char *dir_name, struct dirent *de, vo
 
 static void change_attributes(const char *name, struct globals *gp)
 {
-        unsigned long fsflags;
+        unsigned fsflags;
+#if !ENABLE_PLATFORM_MINGW32
+        int fd;
+#endif
         struct stat st;
 
         if (lstat(name, &st) != 0) {
-                bb_perror_msg("stat %s", name);
+                bb_perror_msg("can't stat '%s'", name);
                 return;
         }
-        if (S_ISLNK(st.st_mode) && gp->recursive)
-                return;
 
         /* Don't try to open device files, fifos etc.  We probably
          * ought to display an error if the file was explicitly given
@@ -183,11 +209,58 @@ static void change_attributes(const char *name, struct globals *gp)
                 return;
 
 #if !ENABLE_PLATFORM_MINGW32
-        if (gp->flags & OPT_SET_VER)
-                if (fsetversion(name, gp->version) != 0)
-                        bb_perror_msg("setting version on %s", name);
-#endif
+        /* There is no way to run needed ioctls on a symlink.
+         * open(O_PATH | O_NOFOLLOW) _can_ be used to get a fd referring to the symlink,
+         * but ioctls fail on such a fd (tried on 4.12.0 kernel).
+         * e2fsprogs-1.46.2 uses open(O_NOFOLLOW), it fails on symlinks.
+         */
+        fd = open_or_warn(name, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOFOLLOW);
+        if (fd >= 0) {
+                int r;
+
+                if (gp->flags & OPT_SET_VER) {
+                        r = ioctl(fd, EXT2_IOC_SETVERSION, &gp->version);
+                        if (r != 0)
+                                bb_perror_msg("setting %s on %s", "version", name);
+                }
 
+                if (gp->flags & OPT_SET_PROJ) {
+                        struct ext2_fsxattr fsxattr;
+                        r = ioctl(fd, EXT2_IOC_FSGETXATTR, &fsxattr);
+                        /* note: ^^^ may fail in 32-bit userspace on 64-bit kernel (seen on 4.12.0) */
+                        if (r != 0) {
+                                bb_perror_msg("getting %s on %s", "project ID", name);
+                        } else {
+                                fsxattr.fsx_projid = gp->projid;
+                                r = ioctl(fd, EXT2_IOC_FSSETXATTR, &fsxattr);
+                                if (r != 0)
+                                        bb_perror_msg("setting %s on %s", "project ID", name);
+                        }
+                }
+
+                if (gp->flags & OPT_SET) {
+                        fsflags = gp->af;
+                } else {
+                        r = ioctl(fd, EXT2_IOC_GETFLAGS, &fsflags);
+                        if (r != 0) {
+                                bb_perror_msg("getting %s on %s", "flags", name);
+                                goto skip_setflags;
+                        }
+                        /*if (gp->flags & OPT_REM) - not needed, rf is zero otherwise */
+                                fsflags &= ~gp->rf;
+                        /*if (gp->flags & OPT_ADD) - not needed, af is zero otherwise */
+                                fsflags |= gp->af;
+// What is this? And why it's not done for SET case?
+                        if (!S_ISDIR(st.st_mode))
+                                fsflags &= ~EXT2_DIRSYNC_FL;
+                }
+                r = ioctl(fd, EXT2_IOC_SETFLAGS, &fsflags);
+                if (r != 0)
+                        bb_perror_msg("setting %s on %s", "flags", name);
+ skip_setflags:
+                close(fd);
+        }
+#else /* ENABLE_PLATFORM_MINGW32 */
         if (gp->flags & OPT_SET) {
                 fsflags = gp->af;
         } else {
@@ -199,16 +272,13 @@ static void change_attributes(const char *name, struct globals *gp)
                         fsflags &= ~gp->rf;
                 /*if (gp->flags & OPT_ADD) - not needed, af is zero otherwise */
                         fsflags |= gp->af;
-#if !ENABLE_PLATFORM_MINGW32
-// What is this? And why it's not done for SET case?
-                if (!S_ISDIR(st.st_mode))
-                        fsflags &= ~EXT2_DIRSYNC_FL;
-#endif
         }
         if (fsetflags(name, fsflags) != 0)
                 bb_perror_msg("setting flags on %s", name);
 
  skip_setflags:
+#endif
+
         if (gp->recursive && S_ISDIR(st.st_mode))
                 iterate_on_dir(name, chattr_dir_proc, gp);
 }
@@ -245,7 +315,7 @@ int chattr_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_PLATFORM_MINGW32
                 bb_simple_error_msg_and_die("must use - or +");
 #else
-                bb_simple_error_msg_and_die("must use '-v', =, - or +");
+                bb_simple_error_msg_and_die("must use -v, -p, =, - or +");
 #endif
 
         /* now run chattr on all the files passed to us */
diff --git a/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c
index d0cacf14c..48c3b68b5 100644
--- a/e2fsprogs/e2fs_lib.c
+++ b/e2fsprogs/e2fs_lib.c
@@ -8,125 +8,7 @@
 #include "libbb.h"
 #include "e2fs_lib.h"
 
-#if !ENABLE_PLATFORM_MINGW32
-#define HAVE_EXT2_IOCTLS 1
-
-#if INT_MAX == LONG_MAX
-#define IF_LONG_IS_SAME(...) __VA_ARGS__
-#define IF_LONG_IS_WIDER(...)
-#else
-#define IF_LONG_IS_SAME(...)
-#define IF_LONG_IS_WIDER(...) __VA_ARGS__
-#endif
-
-static void close_silently(int fd)
-{
-        int e = errno;
-        close(fd);
-        errno = e;
-}
-#endif
-
-
-/* Iterate a function on each entry of a directory */
-int iterate_on_dir(const char *dir_name,
-                int FAST_FUNC (*func)(const char *, struct dirent *, void *),
-                void *private)
-{
-        DIR *dir;
-        struct dirent *de;
-
-        dir = opendir(dir_name);
-        if (dir == NULL) {
-                return -1;
-        }
-        while ((de = readdir(dir)) != NULL) {
-                func(dir_name, de, private);
-        }
-        closedir(dir);
-        return 0;
-}
-
-
-#if !ENABLE_PLATFORM_MINGW32
-/* Get/set a file version on an ext2 file system */
-int fgetsetversion(const char *name, unsigned long *get_version, unsigned long set_version)
-{
-#if HAVE_EXT2_IOCTLS
-        int fd, r;
-        IF_LONG_IS_WIDER(int ver;)
-
-        fd = open(name, O_RDONLY | O_NONBLOCK);
-        if (fd == -1)
-                return -1;
-        if (!get_version) {
-                IF_LONG_IS_WIDER(
-                        ver = (int) set_version;
-                        r = ioctl(fd, EXT2_IOC_SETVERSION, &ver);
-                )
-                IF_LONG_IS_SAME(
-                        r = ioctl(fd, EXT2_IOC_SETVERSION, (void*)&set_version);
-                )
-        } else {
-                IF_LONG_IS_WIDER(
-                        r = ioctl(fd, EXT2_IOC_GETVERSION, &ver);
-                        *get_version = ver;
-                )
-                IF_LONG_IS_SAME(
-                        r = ioctl(fd, EXT2_IOC_GETVERSION, (void*)get_version);
-                )
-        }
-        close_silently(fd);
-        return r;
-#else /* ! HAVE_EXT2_IOCTLS */
-        errno = EOPNOTSUPP;
-        return -1;
-#endif /* ! HAVE_EXT2_IOCTLS */
-}
-
-/* Get/set a file flags on an ext2 file system */
-int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_flags)
-{
-#if HAVE_EXT2_IOCTLS
-        struct stat buf;
-        int fd, r;
-        IF_LONG_IS_WIDER(int f;)
-
-        if (stat(name, &buf) == 0 /* stat is ok */
-         && !S_ISREG(buf.st_mode) && !S_ISDIR(buf.st_mode)
-        ) {
-                goto notsupp;
-        }
-        fd = open(name, O_RDONLY | O_NONBLOCK); /* neither read nor write asked for */
-        if (fd == -1)
-                return -1;
-
-        if (!get_flags) {
-                IF_LONG_IS_WIDER(
-                        f = (int) set_flags;
-                        r = ioctl(fd, EXT2_IOC_SETFLAGS, &f);
-                )
-                IF_LONG_IS_SAME(
-                        r = ioctl(fd, EXT2_IOC_SETFLAGS, (void*)&set_flags);
-                )
-        } else {
-                IF_LONG_IS_WIDER(
-                        r = ioctl(fd, EXT2_IOC_GETFLAGS, &f);
-                        *get_flags = f;
-                )
-                IF_LONG_IS_SAME(
-                        r = ioctl(fd, EXT2_IOC_GETFLAGS, (void*)get_flags);
-                )
-        }
-
-        close_silently(fd);
-        return r;
- notsupp:
-#endif /* HAVE_EXT2_IOCTLS */
-        errno = EOPNOTSUPP;
-        return -1;
-}
-#else /* ENABLE_PLATFORM_MINGW32 */
+#if ENABLE_PLATFORM_MINGW32
 /* Only certain attributes can be set using SetFileAttributes() */
 #define CHATTR_MASK (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \
                         FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE | \
@@ -134,7 +16,7 @@ int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_f
                         FILE_ATTRIBUTE_OFFLINE)
 
 /* Get/set file attributes on a Windows file system */
-int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_flags)
+int fgetsetflags(const char *name, unsigned *get_flags, unsigned set_flags)
 {
         struct stat buf;
 
@@ -156,7 +38,6 @@ int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_f
 }
 #endif
 
-
 #if !ENABLE_PLATFORM_MINGW32
 /* Print file attributes on an ext2 file system */
 const uint32_t e2attr_flags_value[] ALIGN4 = {
@@ -164,9 +45,7 @@ const uint32_t e2attr_flags_value[] ALIGN4 = {
         EXT2_COMPRBLK_FL,
         EXT2_DIRTY_FL,
         EXT2_NOCOMPR_FL,
-        EXT2_ECOMPR_FL,
 #endif
-        EXT2_INDEX_FL,
         EXT2_SECRM_FL,
         EXT2_UNRM_FL,
         EXT2_SYNC_FL,
@@ -176,26 +55,31 @@ const uint32_t e2attr_flags_value[] ALIGN4 = {
         EXT2_NODUMP_FL,
         EXT2_NOATIME_FL,
         EXT2_COMPR_FL,
+        EXT2_ECOMPR_FL,
         EXT3_JOURNAL_DATA_FL,
+        EXT2_INDEX_FL,
         EXT2_NOTAIL_FL,
-        EXT2_TOPDIR_FL
+        EXT2_TOPDIR_FL,
+        EXT2_EXTENT_FL,
+        EXT2_NOCOW_FL,
+        EXT2_CASEFOLD_FL,
+        EXT2_INLINE_DATA_FL,
+        EXT2_PROJINHERIT_FL,
+        EXT2_VERITY_FL,
 };
 
 const char e2attr_flags_sname[] ALIGN1 =
 #ifdef ENABLE_COMPRESSION
-        "BZXE"
+        "BZX"
 #endif
-        "I"
-        "suSDiadAcjtT";
+        "suSDiadAcEjItTeCFNPV";
 
 static const char e2attr_flags_lname[] ALIGN1 =
 #ifdef ENABLE_COMPRESSION
         "Compressed_File" "\0"
         "Compressed_Dirty_File" "\0"
         "Compression_Raw_Access" "\0"
-        "Compression_Error" "\0"
 #endif
-        "Indexed_directory" "\0"
         "Secure_Deletion" "\0"
         "Undelete" "\0"
         "Synchronous_Updates" "\0"
@@ -205,9 +89,17 @@ static const char e2attr_flags_lname[] ALIGN1 =
         "No_Dump" "\0"
         "No_Atime" "\0"
         "Compression_Requested" "\0"
+        "Encrypted" "\0"
         "Journaled_Data" "\0"
+        "Indexed_directory" "\0"
         "No_Tailmerging" "\0"
         "Top_of_Directory_Hierarchies" "\0"
+        "Extents" "\0"
+        "No_COW" "\0"
+        "Casefold" "\0"
+        "Inline_Data" "\0"
+        "Project_Hierarchy" "\0"
+        "Verity" "\0"
         /* Another trailing NUL is added by compiler */;
 #else /* ENABLE_PLATFORM_MINGW32 */
 /* Print file attributes on a Windows file system */
@@ -243,36 +135,41 @@ static const char e2attr_flags_lname[] ALIGN1 =
         /* Another trailing NUL is added by compiler */;
 #endif
 
-void print_e2flags(FILE *f, unsigned long flags, unsigned options)
+void print_e2flags_long(unsigned flags)
 {
         const uint32_t *fv;
         const char *fn;
+        int first = 1;
 
         fv = e2attr_flags_value;
-        if (options & PFOPT_LONG) {
-                int first = 1;
-                fn = e2attr_flags_lname;
-                do {
-                        if (flags & *fv) {
-                                if (!first)
-                                        fputs(", ", f);
-                                fputs(fn, f);
-                                first = 0;
-                        }
-                        fv++;
-                        fn += strlen(fn) + 1;
-                } while (*fn);
-                if (first)
-                        fputs("---", f);
-        } else {
-                fn = e2attr_flags_sname;
-                do  {
-                        char c = '-';
-                        if (flags & *fv)
-                                c = *fn;
-                        fputc(c, f);
-                        fv++;
-                        fn++;
-                } while (*fn);
-        }
+        fn = e2attr_flags_lname;
+        do {
+                if (flags & *fv) {
+                        if (!first)
+                                fputs(", ", stdout);
+                        fputs(fn, stdout);
+                        first = 0;
+                }
+                fv++;
+                fn += strlen(fn) + 1;
+        } while (*fn);
+        if (first)
+                fputs("---", stdout);
+}
+
+void print_e2flags(unsigned flags)
+{
+        const uint32_t *fv;
+        const char *fn;
+
+        fv = e2attr_flags_value;
+        fn = e2attr_flags_sname;
+        do  {
+                char c = '-';
+                if (flags & *fv)
+                        c = *fn;
+                putchar(c);
+                fv++;
+                fn++;
+        } while (*fn);
 }
diff --git a/e2fsprogs/e2fs_lib.h b/e2fsprogs/e2fs_lib.h
index 4a4d4cc27..aa92e63af 100644
--- a/e2fsprogs/e2fs_lib.h
+++ b/e2fsprogs/e2fs_lib.h
@@ -11,25 +11,16 @@
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-/* Iterate a function on each entry of a directory */
-int iterate_on_dir(const char *dir_name,
-                int FAST_FUNC (*func)(const char *, struct dirent *, void *),
-                void *private);
-
-/* Get/set a file version on an ext2 file system */
-int fgetsetversion(const char *name, unsigned long *get_version, unsigned long set_version);
-#define fgetversion(name, version) fgetsetversion(name, version, 0)
-#define fsetversion(name, version) fgetsetversion(name, NULL, version)
-
-/* Get/set a file flags on an ext2 file system */
-int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_flags);
+#if ENABLE_PLATFORM_MINGW32
+/* Get/set a file flags */
+int fgetsetflags(const char *name, unsigned *get_flags, unsigned set_flags);
 #define fgetflags(name, flags) fgetsetflags(name, flags, 0)
 #define fsetflags(name, flags) fgetsetflags(name, NULL, flags)
+#endif
 
-/* Must be 1 for compatibility with 'int long_format'. */
-#define PFOPT_LONG  1
 /* Print file attributes on an ext2 file system */
-void print_e2flags(FILE *f, unsigned long flags, unsigned options);
+void print_e2flags_long(unsigned flags);
+void print_e2flags(unsigned flags);
 
 extern const uint32_t e2attr_flags_value[];
 extern const char e2attr_flags_sname[];
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index ed7b67c6f..d82861e14 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -22,7 +22,7 @@
 
 //usage:#define lsattr_trivial_usage
 //usage:     IF_NOT_PLATFORM_MINGW32(
-//usage:       "[-Radlv] [FILE]..."
+//usage:       "[-Radlpv] [FILE]..."
 //usage:     )
 //usage:     IF_PLATFORM_MINGW32(
 //usage:       "[-Radl] [FILE]..."
@@ -30,10 +30,12 @@
 //usage:#define lsattr_full_usage "\n\n"
 //usage:       "List ext2 file attributes\n"
 //usage:     "\n        -R      Recurse"
-//usage:     "\n        -a      Don't hide entries starting with ."
-//usage:     "\n        -d      List directory entries instead of contents"
+//usage:     "\n        -a      Include names starting with ."
+//usage:     "\n        -d      List directory names, not contents"
+// -a,-d text should match ls --help
 //usage:     "\n        -l      List long flag names"
 //usage:     IF_NOT_PLATFORM_MINGW32(
+//usage:     "\n        -p      List project ID"
 //usage:     "\n        -v      List version/generation number"
 //usage:     )
 
@@ -41,43 +43,71 @@
 #include "e2fs_lib.h"
 
 enum {
-        OPT_RECUR      = 0x1,
-        OPT_ALL        = 0x2,
-        OPT_DIRS_OPT   = 0x4,
-        OPT_PF_LONG    = 0x8,
-        OPT_GENERATION = 0x10,
+        OPT_RECUR      = 1 << 0,
+        OPT_ALL        = 1 << 1,
+        OPT_DIRS_OPT   = 1 << 2,
+        OPT_PF_LONG    = 1 << 3,
+        OPT_GENERATION = 1 << 4,
+        OPT_PROJID     = 1 << 5,
 };
 
 static void list_attributes(const char *name)
 {
-        unsigned long fsflags;
+        unsigned fsflags;
 #if !ENABLE_PLATFORM_MINGW32
-        unsigned long generation;
-#endif
-
-        if (fgetflags(name, &fsflags) != 0)
-                goto read_err;
+        int fd, r;
+
+        /* There is no way to run needed ioctls on a symlink.
+         * open(O_PATH | O_NOFOLLOW) _can_ be used to get a fd referring to the symlink,
+         * but ioctls fail on such a fd (tried on 4.12.0 kernel).
+         * e2fsprogs-1.46.2 uses open(O_NOFOLLOW), it fails on symlinks.
+         */
+        fd = open_or_warn(name, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOFOLLOW);
+        if (fd < 0)
+                return;
+
+        if (option_mask32 & OPT_PROJID) {
+                struct ext2_fsxattr fsxattr;
+                r = ioctl(fd, EXT2_IOC_FSGETXATTR, &fsxattr);
+                /* note: ^^^ may fail in 32-bit userspace on 64-bit kernel (seen on 4.12.0) */
+                if (r != 0)
+                        goto read_err;
+                printf("%5u ", (unsigned)fsxattr.fsx_projid);
+        }
 
-#if !ENABLE_PLATFORM_MINGW32
         if (option_mask32 & OPT_GENERATION) {
-                if (fgetversion(name, &generation) != 0)
+                unsigned generation;
+                r = ioctl(fd, EXT2_IOC_GETVERSION, &generation);
+                if (r != 0)
                         goto read_err;
-                printf("%5lu ", generation);
+                printf("%-10u ", generation);
         }
+
+        r = ioctl(fd, EXT2_IOC_GETFLAGS, &fsflags);
+        if (r != 0)
+                goto read_err;
+
+        close(fd);
+#else /* ENABLE_PLATFORM_MINGW32 */
+        if (fgetflags(name, &fsflags) != 0)
+                goto read_err;
 #endif
 
         if (option_mask32 & OPT_PF_LONG) {
                 printf("%-28s ", name);
-                print_e2flags(stdout, fsflags, PFOPT_LONG);
+                print_e2flags_long(fsflags);
                 bb_putchar('\n');
         } else {
-                print_e2flags(stdout, fsflags, 0);
+                print_e2flags(fsflags);
                 printf(" %s\n", name);
         }
 
         return;
  read_err:
         bb_perror_msg("reading %s", name);
+#if !ENABLE_PLATFORM_MINGW32
+        close(fd);
+#endif
 }
 
 static int FAST_FUNC lsattr_dir_proc(const char *dir_name,
@@ -90,9 +120,13 @@ static int FAST_FUNC lsattr_dir_proc(const char *dir_name,
         path = concat_path_file(dir_name, de->d_name);
 
         if (lstat(path, &st) != 0)
-                bb_perror_msg("stat %s", path);
+                bb_perror_msg("can't stat '%s'", path);
+
         else if (de->d_name[0] != '.' || (option_mask32 & OPT_ALL)) {
-                list_attributes(path);
+                /* Don't try to open device files, fifos etc */
+                if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode) || S_ISDIR(st.st_mode))
+                        list_attributes(path);
+
                 if (S_ISDIR(st.st_mode) && (option_mask32 & OPT_RECUR)
                  && !DOT_OR_DOTDOT(de->d_name)
                 ) {
@@ -111,7 +145,7 @@ static void lsattr_args(const char *name)
         struct stat st;
 
         if (lstat(name, &st) == -1) {
-                bb_perror_msg("stat %s", name);
+                bb_perror_msg("can't stat '%s'", name);
         } else if (S_ISDIR(st.st_mode) && !(option_mask32 & OPT_DIRS_OPT)) {
                 iterate_on_dir(name, lsattr_dir_proc, NULL);
         } else {
@@ -125,7 +159,7 @@ int lsattr_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_PLATFORM_MINGW32
         getopt32(argv, "Radl");
 #else
-        getopt32(argv, "Radlv");
+        getopt32(argv, "Radlvp");
 #endif
         argv += optind;
 
diff --git a/editors/awk.c b/editors/awk.c
index 41a57ea0c..9b9b202db 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -66,6 +66,8 @@
 #endif
 #ifndef debug_printf_parse
 # define debug_printf_parse(...) (fprintf(stderr, __VA_ARGS__))
+#else
+# define debug_parse_print_tc(...) ((void)0)
 #endif
 
 
@@ -210,13 +212,13 @@ typedef struct tsplitter_s {
 #define TC_SEQTERM      (1 << 1)                /* ) */
 #define TC_REGEXP       (1 << 2)                /* /.../ */
 #define TC_OUTRDR       (1 << 3)                /* | > >> */
-#define TC_UOPPOST      (1 << 4)                /* unary postfix operator */
-#define TC_UOPPRE1      (1 << 5)                /* unary prefix operator */
+#define TC_UOPPOST      (1 << 4)                /* unary postfix operator ++ -- */
+#define TC_UOPPRE1      (1 << 5)                /* unary prefix operator ++ -- $ */
 #define TC_BINOPX       (1 << 6)                /* two-opnd operator */
 #define TC_IN           (1 << 7)
 #define TC_COMMA        (1 << 8)
 #define TC_PIPE         (1 << 9)                /* input redirection pipe */
-#define TC_UOPPRE2      (1 << 10)               /* unary prefix operator */
+#define TC_UOPPRE2      (1 << 10)               /* unary prefix operator + - ! */
 #define TC_ARRTERM      (1 << 11)               /* ] */
 #define TC_GRPSTART     (1 << 12)               /* { */
 #define TC_GRPTERM      (1 << 13)               /* } */
@@ -243,14 +245,51 @@ typedef struct tsplitter_s {
 #define TC_STRING       (1 << 29)
 #define TC_NUMBER       (1 << 30)
 
-#define TC_UOPPRE  (TC_UOPPRE1 | TC_UOPPRE2)
+#ifndef debug_parse_print_tc
+#define debug_parse_print_tc(n) do { \
+if ((n) & TC_SEQSTART) debug_printf_parse(" SEQSTART"); \
+if ((n) & TC_SEQTERM ) debug_printf_parse(" SEQTERM" ); \
+if ((n) & TC_REGEXP  ) debug_printf_parse(" REGEXP"  ); \
+if ((n) & TC_OUTRDR  ) debug_printf_parse(" OUTRDR"  ); \
+if ((n) & TC_UOPPOST ) debug_printf_parse(" UOPPOST" ); \
+if ((n) & TC_UOPPRE1 ) debug_printf_parse(" UOPPRE1" ); \
+if ((n) & TC_BINOPX  ) debug_printf_parse(" BINOPX"  ); \
+if ((n) & TC_IN      ) debug_printf_parse(" IN"      ); \
+if ((n) & TC_COMMA   ) debug_printf_parse(" COMMA"   ); \
+if ((n) & TC_PIPE    ) debug_printf_parse(" PIPE"    ); \
+if ((n) & TC_UOPPRE2 ) debug_printf_parse(" UOPPRE2" ); \
+if ((n) & TC_ARRTERM ) debug_printf_parse(" ARRTERM" ); \
+if ((n) & TC_GRPSTART) debug_printf_parse(" GRPSTART"); \
+if ((n) & TC_GRPTERM ) debug_printf_parse(" GRPTERM" ); \
+if ((n) & TC_SEMICOL ) debug_printf_parse(" SEMICOL" ); \
+if ((n) & TC_NEWLINE ) debug_printf_parse(" NEWLINE" ); \
+if ((n) & TC_STATX   ) debug_printf_parse(" STATX"   ); \
+if ((n) & TC_WHILE   ) debug_printf_parse(" WHILE"   ); \
+if ((n) & TC_ELSE    ) debug_printf_parse(" ELSE"    ); \
+if ((n) & TC_BUILTIN ) debug_printf_parse(" BUILTIN" ); \
+if ((n) & TC_LENGTH  ) debug_printf_parse(" LENGTH"  ); \
+if ((n) & TC_GETLINE ) debug_printf_parse(" GETLINE" ); \
+if ((n) & TC_FUNCDECL) debug_printf_parse(" FUNCDECL"); \
+if ((n) & TC_BEGIN   ) debug_printf_parse(" BEGIN"   ); \
+if ((n) & TC_END     ) debug_printf_parse(" END"     ); \
+if ((n) & TC_EOF     ) debug_printf_parse(" EOF"     ); \
+if ((n) & TC_VARIABLE) debug_printf_parse(" VARIABLE"); \
+if ((n) & TC_ARRAY   ) debug_printf_parse(" ARRAY"   ); \
+if ((n) & TC_FUNCTION) debug_printf_parse(" FUNCTION"); \
+if ((n) & TC_STRING  ) debug_printf_parse(" STRING"  ); \
+if ((n) & TC_NUMBER  ) debug_printf_parse(" NUMBER"  ); \
+} while (0)
+#endif
 
 /* combined token classes */
+#define TC_UOPPRE  (TC_UOPPRE1 | TC_UOPPRE2)
+
 #define TC_BINOP   (TC_BINOPX | TC_COMMA | TC_PIPE | TC_IN)
 //#define       TC_UNARYOP (TC_UOPPRE | TC_UOPPOST)
 #define TC_OPERAND (TC_VARIABLE | TC_ARRAY | TC_FUNCTION \
                    | TC_BUILTIN | TC_LENGTH | TC_GETLINE \
                    | TC_SEQSTART | TC_STRING | TC_NUMBER)
+#define TC_LVALUE (TC_VARIABLE | TC_ARRAY)
 
 #define TC_STATEMNT (TC_STATX | TC_WHILE)
 #define TC_OPTERM  (TC_SEMICOL | TC_NEWLINE)
@@ -284,7 +323,6 @@ typedef struct tsplitter_s {
 #define OF_CHECKED  0x200000
 #define OF_REQUIRED 0x400000
 
-
 /* combined operator flags */
 #define xx      0
 #define xV      OF_RES2
@@ -313,10 +351,8 @@ typedef struct tsplitter_s {
 #define PRIMASK2  0x7E000000
 
 /* Operation classes */
-
 #define SHIFT_TIL_THIS  0x0600
 #define RECUR_FROM_THIS 0x1000
-
 enum {
         OC_DELETE = 0x0100,     OC_EXEC = 0x0200,       OC_NEWSOURCE = 0x0300,
         OC_PRINT = 0x0400,      OC_PRINTF = 0x0500,     OC_WALKINIT = 0x0600,
@@ -411,13 +447,16 @@ static const uint32_t tokeninfo[] ALIGN4 = {
         OC_REGEXP,
         xS|'a',                  xS|'w',                  xS|'|',
         OC_UNARY|xV|P(9)|'p',    OC_UNARY|xV|P(9)|'m',
-        OC_UNARY|xV|P(9)|'P',    OC_UNARY|xV|P(9)|'M',    OC_FIELD|xV|P(5),
+#define TI_PREINC (OC_UNARY|xV|P(9)|'P')
+#define TI_PREDEC (OC_UNARY|xV|P(9)|'M')
+        TI_PREINC,               TI_PREDEC,               OC_FIELD|xV|P(5),
         OC_COMPARE|VV|P(39)|5,   OC_MOVE|VV|P(74),        OC_REPLACE|NV|P(74)|'+', OC_REPLACE|NV|P(74)|'-',
         OC_REPLACE|NV|P(74)|'*', OC_REPLACE|NV|P(74)|'/', OC_REPLACE|NV|P(74)|'%', OC_REPLACE|NV|P(74)|'&',
         OC_BINARY|NV|P(29)|'+',  OC_BINARY|NV|P(29)|'-',  OC_REPLACE|NV|P(74)|'&', OC_BINARY|NV|P(15)|'&',
         OC_BINARY|NV|P(25)|'/',  OC_BINARY|NV|P(25)|'%',  OC_BINARY|NV|P(15)|'&',  OC_BINARY|NV|P(25)|'*',
         OC_COMPARE|VV|P(39)|4,   OC_COMPARE|VV|P(39)|3,   OC_COMPARE|VV|P(39)|0,   OC_COMPARE|VV|P(39)|1,
-        OC_COMPARE|VV|P(39)|2,   OC_MATCH|Sx|P(45)|'!',   OC_MATCH|Sx|P(45)|'~',   OC_LAND|Vx|P(55),
+#define TI_LESS (OC_COMPARE|VV|P(39)|2)
+        TI_LESS,                 OC_MATCH|Sx|P(45)|'!',   OC_MATCH|Sx|P(45)|'~',   OC_LAND|Vx|P(55),
         OC_LOR|Vx|P(59),         OC_TERNARY|Vx|P(64)|'?', OC_COLON|xx|P(67)|':',
         OC_IN|SV|P(49), /* TC_IN */
         OC_COMMA|SS|P(80),
@@ -1074,6 +1113,10 @@ static uint32_t next_token(uint32_t expected)
         uint32_t tc;
         const uint32_t *ti;
 
+        debug_printf_parse("%s() expected(%x):", __func__, expected);
+        debug_parse_print_tc(expected);
+        debug_printf_parse("\n");
+
         if (t_rollback) {
                 debug_printf_parse("%s: using rolled-back token\n", __func__);
                 t_rollback = FALSE;
@@ -1178,6 +1221,8 @@ static uint32_t next_token(uint32_t expected)
                         if (!isalnum_(*p))
                                 syntax_error(EMSG_UNEXP_TOKEN); /* no */
                         /* yes */
+/* "move name one char back" trick: we need a byte for NUL terminator */
+/* NB: this results in argv[i][-1] being used (!!!) in e.g. "awk -e 'NAME'" case */
                         t_string = --p;
                         while (isalnum_(*++p)) {
                                 p[-1] = *p;
@@ -1230,7 +1275,9 @@ static uint32_t next_token(uint32_t expected)
                                 EMSG_UNEXP_EOS : EMSG_UNEXP_TOKEN);
         }
 
-        debug_printf_parse("%s: returning, ltclass:%x t_double:%f\n", __func__, ltclass, t_double);
+        debug_printf_parse("%s: returning, t_double:%f ltclass:", __func__, t_double);
+        debug_parse_print_tc(ltclass);
+        debug_printf_parse("\n");
         return ltclass;
 #undef concat_inserted
 #undef save_tclass
@@ -1270,7 +1317,7 @@ static node *condition(void)
 
 /* parse expression terminated by given argument, return ptr
  * to built subtree. Terminator is eaten by parse_expr */
-static node *parse_expr(uint32_t iexp)
+static node *parse_expr(uint32_t term_tc)
 {
         node sn;
         node *cn = &sn;
@@ -1278,15 +1325,17 @@ static node *parse_expr(uint32_t iexp)
         uint32_t tc, xtc;
         var *v;
 
-        debug_printf_parse("%s(%x)\n", __func__, iexp);
+        debug_printf_parse("%s() term_tc(%x):", __func__, term_tc);
+        debug_parse_print_tc(term_tc);
+        debug_printf_parse("\n");
 
         sn.info = PRIMASK;
         sn.r.n = sn.a.n = glptr = NULL;
-        xtc = TC_OPERAND | TC_UOPPRE | TC_REGEXP | iexp;
+        xtc = TC_OPERAND | TC_UOPPRE | TC_REGEXP | term_tc;
 
-        while (!((tc = next_token(xtc)) & iexp)) {
+        while (!((tc = next_token(xtc)) & term_tc)) {
 
-                if (glptr && (t_info == (OC_COMPARE | VV | P(39) | 2))) {
+                if (glptr && (t_info == TI_LESS)) {
                         /* input redirection (<) attached to glptr node */
                         debug_printf_parse("%s: input redir\n", __func__);
                         cn = glptr->l.n = new_node(OC_CONCAT | SS | P(37));
@@ -1317,25 +1366,28 @@ static node *parse_expr(uint32_t iexp)
                                         next_token(TC_GETLINE);
                                         /* give maximum priority to this pipe */
                                         cn->info &= ~PRIMASK;
-                                        xtc = TC_OPERAND | TC_UOPPRE | TC_BINOP | iexp;
+                                        xtc = TC_OPERAND | TC_UOPPRE | TC_BINOP | term_tc;
                                 }
                         } else {
                                 cn->r.n = vn;
-                                xtc = TC_OPERAND | TC_UOPPRE | TC_BINOP | iexp;
+                                xtc = TC_OPERAND | TC_UOPPRE | TC_BINOP | term_tc;
                         }
                         vn->a.n = cn;
 
                 } else {
-                        debug_printf_parse("%s: other\n", __func__);
+                        debug_printf_parse("%s: other, t_info:%x\n", __func__, t_info);
                         /* for operands and prefix-unary operators, attach them
                          * to last node */
                         vn = cn;
                         cn = vn->r.n = new_node(t_info);
                         cn->a.n = vn;
+
                         xtc = TC_OPERAND | TC_UOPPRE | TC_REGEXP;
+                        if (t_info == TI_PREINC || t_info == TI_PREDEC)
+                                xtc = TC_LVALUE | TC_UOPPRE1;
                         if (tc & (TC_OPERAND | TC_REGEXP)) {
                                 debug_printf_parse("%s: TC_OPERAND | TC_REGEXP\n", __func__);
-                                xtc = TC_UOPPRE | TC_UOPPOST | TC_BINOP | TC_OPERAND | iexp;
+                                xtc = TC_UOPPRE | TC_UOPPOST | TC_BINOP | TC_OPERAND | term_tc;
                                 /* one should be very careful with switch on tclass -
                                  * only simple tclasses should be used! */
                                 switch (tc) {
@@ -1392,7 +1444,7 @@ static node *parse_expr(uint32_t iexp)
                                 case TC_GETLINE:
                                         debug_printf_parse("%s: TC_GETLINE\n", __func__);
                                         glptr = cn;
-                                        xtc = TC_OPERAND | TC_UOPPRE | TC_BINOP | iexp;
+                                        xtc = TC_OPERAND | TC_UOPPRE | TC_BINOP | term_tc;
                                         break;
 
                                 case TC_BUILTIN:
@@ -1607,6 +1659,8 @@ static void parse_program(char *p)
         func *f;
         var *v;
 
+        debug_printf_parse("%s()\n", __func__);
+
         g_pos = p;
         t_lineno = 1;
         while ((tclass = next_token(TC_EOF | TC_OPSEQ | TC_GRPSTART |
@@ -1749,12 +1803,22 @@ static char* qrealloc(char *b, int n, int *size)
 /* resize field storage space */
 static void fsrealloc(int size)
 {
-        int i;
+        int i, newsize;
 
         if (size >= maxfields) {
+                /* Sanity cap, easier than catering for overflows */
+                if (size > 0xffffff)
+                        bb_die_memory_exhausted();
+
                 i = maxfields;
                 maxfields = size + 16;
-                Fields = xrealloc(Fields, maxfields * sizeof(Fields[0]));
+
+                newsize = maxfields * sizeof(Fields[0]);
+                debug_printf_eval("fsrealloc: xrealloc(%p, %u)\n", Fields, newsize);
+                Fields = xrealloc(Fields, newsize);
+                debug_printf_eval("fsrealloc: Fields=%p..%p\n", Fields, (char*)Fields + newsize - 1);
+                /* ^^^ did Fields[] move? debug aid for L.v getting "upstaged" by R.v in evaluate() */
+
                 for (; i < maxfields; i++) {
                         Fields[i].type = VF_SPECIAL;
                         Fields[i].string = NULL;
@@ -2633,20 +2697,30 @@ static var *evaluate(node *op, var *res)
                 /* execute inevitable things */
                 if (opinfo & OF_RES1)
                         L.v = evaluate(op1, v1);
-                if (opinfo & OF_RES2)
-                        R.v = evaluate(op->r.n, v1+1);
                 if (opinfo & OF_STR1) {
                         L.s = getvar_s(L.v);
                         debug_printf_eval("L.s:'%s'\n", L.s);
                 }
-                if (opinfo & OF_STR2) {
-                        R.s = getvar_s(R.v);
-                        debug_printf_eval("R.s:'%s'\n", R.s);
-                }
                 if (opinfo & OF_NUM1) {
                         L_d = getvar_i(L.v);
                         debug_printf_eval("L_d:%f\n", L_d);
                 }
+                /* NB: Must get string/numeric values of L (done above)
+                 * _before_ evaluate()'ing R.v: if both L and R are $NNNs,
+                 * and right one is large, then L.v points to Fields[NNN1],
+                 * second evaluate() reallocates and moves (!) Fields[],
+                 * R.v points to Fields[NNN2] but L.v now points to freed mem!
+                 * (Seen trying to evaluate "$444 $44444")
+                 */
+                if (opinfo & OF_RES2) {
+                        R.v = evaluate(op->r.n, v1+1);
+                        //TODO: L.v may be invalid now, set L.v to NULL to catch bugs?
+                        //L.v = NULL;
+                }
+                if (opinfo & OF_STR2) {
+                        R.s = getvar_s(R.v);
+                        debug_printf_eval("R.s:'%s'\n", R.s);
+                }
 
                 debug_printf_eval("switch(0x%x)\n", XC(opinfo & OPCLSMASK));
                 switch (XC(opinfo & OPCLSMASK)) {
@@ -2655,6 +2729,7 @@ static var *evaluate(node *op, var *res)
 
                 /* test pattern */
                 case XC( OC_TEST ):
+                        debug_printf_eval("TEST\n");
                         if ((op1->info & OPCLSMASK) == OC_COMMA) {
                                 /* it's range pattern */
                                 if ((opinfo & OF_CHECKED) || ptest(op1->l.n)) {
@@ -2672,25 +2747,32 @@ static var *evaluate(node *op, var *res)
 
                 /* just evaluate an expression, also used as unconditional jump */
                 case XC( OC_EXEC ):
+                        debug_printf_eval("EXEC\n");
                         break;
 
                 /* branch, used in if-else and various loops */
                 case XC( OC_BR ):
+                        debug_printf_eval("BR\n");
                         op = istrue(L.v) ? op->a.n : op->r.n;
                         break;
 
                 /* initialize for-in loop */
                 case XC( OC_WALKINIT ):
+                        debug_printf_eval("WALKINIT\n");
                         hashwalk_init(L.v, iamarray(R.v));
                         break;
 
                 /* get next array item */
                 case XC( OC_WALKNEXT ):
+                        debug_printf_eval("WALKNEXT\n");
                         op = hashwalk_next(L.v) ? op->a.n : op->r.n;
                         break;
 
                 case XC( OC_PRINT ):
-                case XC( OC_PRINTF ): {
+                        debug_printf_eval("PRINT /\n");
+                case XC( OC_PRINTF ):
+                        debug_printf_eval("PRINTF\n");
+                {
                         FILE *F = stdout;
                         IF_FEATURE_AWK_GNU_EXTENSIONS(int len;)
 
@@ -2745,22 +2827,28 @@ static var *evaluate(node *op, var *res)
                 /* case XC( OC_DELETE ): - moved to happen before arg evaluation */
 
                 case XC( OC_NEWSOURCE ):
+                        debug_printf_eval("NEWSOURCE\n");
                         g_progname = op->l.new_progname;
                         break;
 
                 case XC( OC_RETURN ):
+                        debug_printf_eval("RETURN\n");
                         copyvar(res, L.v);
                         break;
 
                 case XC( OC_NEXTFILE ):
+                        debug_printf_eval("NEXTFILE\n");
                         nextfile = TRUE;
                 case XC( OC_NEXT ):
+                        debug_printf_eval("NEXT\n");
                         nextrec = TRUE;
                 case XC( OC_DONE ):
+                        debug_printf_eval("DONE\n");
                         clrvar(res);
                         break;
 
                 case XC( OC_EXIT ):
+                        debug_printf_eval("EXIT\n");
                         awk_exit(L_d);
 
                 /* -- recursive node type -- */
@@ -2780,15 +2868,18 @@ static var *evaluate(node *op, var *res)
                         break;
 
                 case XC( OC_IN ):
+                        debug_printf_eval("IN\n");
                         setvar_i(res, hash_search(iamarray(R.v), L.s) ? 1 : 0);
                         break;
 
                 case XC( OC_REGEXP ):
+                        debug_printf_eval("REGEXP\n");
                         op1 = op;
                         L.s = getvar_s(intvar[F0]);
                         goto re_cont;
 
                 case XC( OC_MATCH ):
+                        debug_printf_eval("MATCH\n");
                         op1 = op->r.n;
  re_cont:
                         {
@@ -2814,6 +2905,7 @@ static var *evaluate(node *op, var *res)
                         break;
 
                 case XC( OC_TERNARY ):
+                        debug_printf_eval("TERNARY\n");
                         if ((op->r.n->info & OPCLSMASK) != OC_COLON)
                                 syntax_error(EMSG_POSSIBLE_ERROR);
                         res = evaluate(istrue(L.v) ? op->r.n->l.n : op->r.n->r.n, res);
@@ -2822,6 +2914,7 @@ static var *evaluate(node *op, var *res)
                 case XC( OC_FUNC ): {
                         var *vbeg, *v;
                         const char *sv_progname;
+                        debug_printf_eval("FUNC\n");
 
                         /* The body might be empty, still has to eval the args */
                         if (!op->r.n->info && !op->r.f->body.first)
@@ -2851,7 +2944,10 @@ static var *evaluate(node *op, var *res)
                 }
 
                 case XC( OC_GETLINE ):
-                case XC( OC_PGETLINE ): {
+                        debug_printf_eval("GETLINE /\n");
+                case XC( OC_PGETLINE ):
+                        debug_printf_eval("PGETLINE\n");
+                {
                         rstream *rsm;
                         int i;
 
@@ -2892,6 +2988,7 @@ static var *evaluate(node *op, var *res)
                 /* simple builtins */
                 case XC( OC_FBLTIN ): {
                         double R_d = R_d; /* for compiler */
+                        debug_printf_eval("FBLTIN\n");
 
                         switch (opn) {
                         case F_in:
@@ -3005,14 +3102,18 @@ static var *evaluate(node *op, var *res)
                 }
 
                 case XC( OC_BUILTIN ):
+                        debug_printf_eval("BUILTIN\n");
                         res = exec_builtin(op, res);
                         break;
 
                 case XC( OC_SPRINTF ):
+                        debug_printf_eval("SPRINTF\n");
                         setvar_p(res, awk_printf(op1, NULL));
                         break;
 
-                case XC( OC_UNARY ): {
+                case XC( OC_UNARY ):
+                        debug_printf_eval("UNARY\n");
+                {
                         double Ld, R_d;
 
                         Ld = R_d = getvar_i(R.v);
@@ -3042,7 +3143,9 @@ static var *evaluate(node *op, var *res)
                         break;
                 }
 
-                case XC( OC_FIELD ): {
+                case XC( OC_FIELD ):
+                        debug_printf_eval("FIELD\n");
+                {
                         int i = (int)getvar_i(R.v);
                         if (i < 0)
                                 syntax_error(EMSG_NEGATIVE_FIELD);
@@ -3059,8 +3162,10 @@ static var *evaluate(node *op, var *res)
 
                 /* concatenation (" ") and index joining (",") */
                 case XC( OC_CONCAT ):
+                        debug_printf_eval("CONCAT /\n");
                 case XC( OC_COMMA ): {
                         const char *sep = "";
+                        debug_printf_eval("COMMA\n");
                         if ((opinfo & OPCLSMASK) == OC_COMMA)
                                 sep = getvar_s(intvar[SUBSEP]);
                         setvar_p(res, xasprintf("%s%s%s", L.s, sep, R.s));
@@ -3068,17 +3173,22 @@ static var *evaluate(node *op, var *res)
                 }
 
                 case XC( OC_LAND ):
+                        debug_printf_eval("LAND\n");
                         setvar_i(res, istrue(L.v) ? ptest(op->r.n) : 0);
                         break;
 
                 case XC( OC_LOR ):
+                        debug_printf_eval("LOR\n");
                         setvar_i(res, istrue(L.v) ? 1 : ptest(op->r.n));
                         break;
 
                 case XC( OC_BINARY ):
-                case XC( OC_REPLACE ): {
+                        debug_printf_eval("BINARY /\n");
+                case XC( OC_REPLACE ):
+                        debug_printf_eval("REPLACE\n");
+                {
                         double R_d = getvar_i(R.v);
-                        debug_printf_eval("BINARY/REPLACE: R_d:%f opn:%c\n", R_d, opn);
+                        debug_printf_eval("R_d:%f opn:%c\n", R_d, opn);
                         switch (opn) {
                         case '+':
                                 L_d += R_d;
@@ -3114,6 +3224,7 @@ static var *evaluate(node *op, var *res)
                 case XC( OC_COMPARE ): {
                         int i = i; /* for compiler */
                         double Ld;
+                        debug_printf_eval("COMPARE\n");
 
                         if (is_numeric(L.v) && is_numeric(R.v)) {
                                 Ld = getvar_i(L.v) - getvar_i(R.v);
@@ -3162,20 +3273,19 @@ static var *evaluate(node *op, var *res)
 
 static int awk_exit(int r)
 {
-        var tv;
         unsigned i;
-        hash_item *hi;
-
-        zero_out_var(&tv);
 
         if (!exiting) {
+                var tv;
                 exiting = TRUE;
                 nextrec = FALSE;
+                zero_out_var(&tv);
                 evaluate(endseq.first, &tv);
         }
 
         /* waiting for children */
         for (i = 0; i < fdhash->csize; i++) {
+                hash_item *hi;
                 hi = fdhash->items[i];
                 while (hi) {
                         if (hi->data.rs.F && hi->data.rs.is_pipe)
@@ -3255,12 +3365,8 @@ int awk_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_AWK_GNU_EXTENSIONS
         llist_t *list_e = NULL;
 #endif
-        int i, j;
-        var *v;
+        int i;
         var tv;
-        char **envp;
-        char *vnames = (char *)vNames; /* cheat */
-        char *vvalues = (char *)vValues;
 
         INIT_G();
 
@@ -3269,8 +3375,6 @@ int awk_main(int argc UNUSED_PARAM, char **argv)
         if (ENABLE_LOCALE_SUPPORT)
                 setlocale(LC_NUMERIC, "C");
 
-        zero_out_var(&tv);
-
         /* allocate global buffer */
         g_buf = xmalloc(MAXVARFMT + 1);
 
@@ -3280,16 +3384,21 @@ int awk_main(int argc UNUSED_PARAM, char **argv)
         fnhash = hash_init();
 
         /* initialize variables */
-        for (i = 0; *vnames; i++) {
-                intvar[i] = v = newvar(nextword(&vnames));
-                if (*vvalues != '\377')
-                        setvar_s(v, nextword(&vvalues));
-                else
-                        setvar_i(v, 0);
-
-                if (*vnames == '*') {
-                        v->type |= VF_SPECIAL;
-                        vnames++;
+        {
+                char *vnames = (char *)vNames; /* cheat */
+                char *vvalues = (char *)vValues;
+                for (i = 0; *vnames; i++) {
+                        var *v;
+                        intvar[i] = v = newvar(nextword(&vnames));
+                        if (*vvalues != '\377')
+                                setvar_s(v, nextword(&vvalues));
+                        else
+                                setvar_i(v, 0);
+
+                        if (*vnames == '*') {
+                                v->type |= VF_SPECIAL;
+                                vnames++;
+                        }
                 }
         }
 
@@ -3301,16 +3410,19 @@ int awk_main(int argc UNUSED_PARAM, char **argv)
         newfile("/dev/stderr")->F = stderr;
 
         /* Huh, people report that sometimes environ is NULL. Oh well. */
-        if (environ) for (envp = environ; *envp; envp++) {
-                /* environ is writable, thus we don't strdup it needlessly */
-                char *s = *envp;
-                char *s1 = strchr(s, '=');
-                if (s1) {
-                        *s1 = '\0';
-                        /* Both findvar and setvar_u take const char*
-                         * as 2nd arg -> environment is not trashed */
-                        setvar_u(findvar(iamarray(intvar[ENVIRON]), s), s1 + 1);
-                        *s1 = '=';
+        if (environ) {
+                char **envp;
+                for (envp = environ; *envp; envp++) {
+                        /* environ is writable, thus we don't strdup it needlessly */
+                        char *s = *envp;
+                        char *s1 = strchr(s, '=');
+                        if (s1) {
+                                *s1 = '\0';
+                                /* Both findvar and setvar_u take const char*
+                                 * as 2nd arg -> environment is not trashed */
+                                setvar_u(findvar(iamarray(intvar[ENVIRON]), s), s1 + 1);
+                                *s1 = '=';
+                        }
                 }
         }
         opt = getopt32(argv, OPTSTR_AWK, &opt_F, &list_v, &list_f, IF_FEATURE_AWK_GNU_EXTENSIONS(&list_e,) NULL);
@@ -3327,30 +3439,43 @@ int awk_main(int argc UNUSED_PARAM, char **argv)
                         bb_show_usage();
         }
         while (list_f) {
-                char *s = NULL;
-                FILE *from_file;
+                int fd;
+                char *s;
 
                 g_progname = llist_pop(&list_f);
-                from_file = xfopen_stdin(g_progname);
-                /* one byte is reserved for some trick in next_token */
-                for (i = j = 1; j > 0; i += j) {
-                        s = xrealloc(s, i + 4096);
-                        j = fread(s + i, 1, 4094, from_file);
+                fd = xopen_stdin(g_progname);
+                /* 1st byte is reserved for "move name one char back" trick in next_token */
+                i = 1;
+                s = NULL;
+                for (;;) {
+                        int sz;
+                        s = xrealloc(s, i + 1000);
+                        sz = safe_read(fd, s + i, 1000);
+                        if (sz <= 0)
+                                break;
+                        i += sz;
                 }
+                s = xrealloc(s, i + 1); /* trim unused 999 bytes */
                 s[i] = '\0';
-                fclose(from_file);
+                close(fd);
                 parse_program(s + 1);
                 free(s);
         }
         g_progname = "cmd. line";
 #if ENABLE_FEATURE_AWK_GNU_EXTENSIONS
         while (list_e) {
+                /* NB: "move name one char back" trick in next_token
+                 * can use argv[i][-1] here.
+                 */
                 parse_program(llist_pop(&list_e));
         }
 #endif
         if (!(opt & (OPT_f | OPT_e))) {
                 if (!*argv)
                         bb_show_usage();
+                /* NB: "move name one char back" trick in next_token
+                 * can use argv[i][-1] here.
+                 */
                 parse_program(*argv++);
         }
 
@@ -3361,6 +3486,7 @@ int awk_main(int argc UNUSED_PARAM, char **argv)
                 setari_u(intvar[ARGV], ++i, *argv++);
         setvar_i(intvar[ARGC], i + 1);
 
+        zero_out_var(&tv);
         evaluate(beginseq.first, &tv);
         if (!mainseq.first && !endseq.first)
                 awk_exit(EXIT_SUCCESS);
diff --git a/editors/cmp.c b/editors/cmp.c
index 6e27a841a..e106d814e 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -18,7 +18,7 @@
 //kbuild:lib-$(CONFIG_CMP) += cmp.o
 
 //usage:#define cmp_trivial_usage
-//usage:       "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
+//usage:       "[-ls] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
 //usage:#define cmp_full_usage "\n\n"
 //usage:       "Compare FILE1 with FILE2 (or stdin)\n"
 //usage:     "\n        -l      Write the byte numbers (decimal) and values (octal)"
diff --git a/editors/sed.c b/editors/sed.c
index b269b58d8..523fb8dba 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -70,7 +70,7 @@
 //usage:#define sed_full_usage "\n\n"
 //usage:       "        -e CMD  Add CMD to sed commands to be executed"
 //usage:     "\n        -f FILE Add FILE contents to sed commands to be executed"
-//usage:     "\n        -i[SFX] Edit files in-place (otherwise sends to stdout)"
+//usage:     "\n        -i[SFX] Edit files in-place (otherwise write to stdout)"
 //usage:     "\n                Optionally back files up, appending SFX"
 //usage:     "\n        -n      Suppress automatic printing of pattern space"
 //usage:     "\n        -r,-E   Use extended regex syntax"
diff --git a/editors/vi.c b/editors/vi.c
index a4d6b21b4..89c567f10 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -181,7 +181,7 @@
 //kbuild:lib-$(CONFIG_VI) += vi.o
 
 //usage:#define vi_trivial_usage
-//usage:       IF_FEATURE_VI_COLON("[-c CMD] ")IF_FEATURE_VI_READONLY("[-R] ")"[FILE]..."
+//usage:       IF_FEATURE_VI_COLON("[-c CMD] ")IF_FEATURE_VI_READONLY("[-R] ")"[-H] [FILE]..."
 //usage:#define vi_full_usage "\n\n"
 //usage:       "Edit FILE\n"
 //usage:        IF_FEATURE_VI_COLON(
@@ -191,6 +191,7 @@
 //usage:     "\n        -R      Read-only"
 //usage:        )
 //usage:     "\n        -H      List available features"
+// note: non-standard, "vim -H" is Hebrew mode (bidi support)
 
 #include "libbb.h"
 // Should be after libbb.h: on some systems regex.h needs sys/types.h:
@@ -377,6 +378,7 @@ struct globals {
 #if ENABLE_FEATURE_VI_SETOPTS
         int indentcol;          // column of recently autoindent, 0 or -1
 #endif
+        smallint cmd_error;
 
         // former statics
 #if ENABLE_FEATURE_VI_YANKMARK
@@ -503,6 +505,7 @@ struct globals {
 #define dotcnt                  (G.dotcnt             )
 #define last_search_pattern     (G.last_search_pattern)
 #define indentcol               (G.indentcol          )
+#define cmd_error               (G.cmd_error          )
 
 #define edit_file__cur_line     (G.edit_file__cur_line)
 #define refresh__old_offset     (G.refresh__old_offset)
@@ -537,6 +540,7 @@ struct globals {
         last_modified_count = -1; \
         /* "" but has space for 2 chars: */ \
         IF_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \
+        tabstop = 8; \
 } while (0)
 
 #if ENABLE_FEATURE_VI_CRASHME
@@ -1122,6 +1126,7 @@ static void indicate_error(void)
         if (crashme > 0)
                 return;
 #endif
+        cmd_error = TRUE;
         if (!err_method) {
                 write1(ESC_BELL);
         } else {
@@ -2191,13 +2196,13 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
                 cmdcnt = 0;
                 end_cmd_q();    // stop adding to q
                 last_status_cksum = 0;  // force status update
-                if ((p[-1] != '\n') && (dot > text)) {
+                if ((dot > text) && (p[-1] != '\n')) {
                         p--;
                 }
 #if ENABLE_FEATURE_VI_SETOPTS
                 if (autoindent) {
                         len = indent_len(bol);
-                        if (len && get_column(bol + len) == indentcol) {
+                        if (len && get_column(bol + len) == indentcol && bol[len] == '\n') {
                                 // remove autoindent from otherwise empty line
                                 text_hole_delete(bol, bol + len - 1, undo);
                                 p = bol;
@@ -2437,9 +2442,7 @@ static char *char_search(char *p, const char *pat, int dir_and_range)
         struct re_pattern_buffer preg;
         const char *err;
         char *q;
-        int i;
-        int size;
-        int range;
+        int i, size, range, start;
 
         re_syntax_options = RE_SYNTAX_POSIX_EXTENDED;
         if (ignorecase)
@@ -2464,31 +2467,26 @@ static char *char_search(char *p, const char *pat, int dir_and_range)
 
         // RANGE could be negative if we are searching backwards
         range = q - p;
-        q = p;
-        size = range;
         if (range < 0) {
-                size = -size;
-                q = p - size;
-                if (q < text)
-                        q = text;
+                size = -range;
+                start = size;
+        } else {
+                size = range;
+                start = 0;
         }
+        q = p - start;
+        if (q < text)
+                q = text;
         // search for the compiled pattern, preg, in p[]
-        // range < 0: search backward
-        // range > 0: search forward
-        // 0 < start < size
+        // range < 0, start == size: search backward
+        // range > 0, start == 0: search forward
         // re_search() < 0: not found or error
         // re_search() >= 0: index of found pattern
         //           struct pattern   char     int   int    int    struct reg
         // re_search(*pattern_buffer, *string, size, start, range, *regs)
-        i = re_search(&preg, q, size, /*start:*/ 0, range, /*struct re_registers*:*/ NULL);
+        i = re_search(&preg, q, size, start, range, /*struct re_registers*:*/ NULL);
         regfree(&preg);
-        if (i < 0)
-                return NULL;
-        if (dir_and_range > 0) // FORWARD?
-                p = p + i;
-        else
-                p = p - i;
-        return p;
+        return i < 0 ? NULL : q + i;
 }
 # else
 #  if ENABLE_FEATURE_VI_SETOPTS
@@ -3063,12 +3061,10 @@ static void colon(char *buf)
                         status_line_bold("No current filename");
                         goto ret;
                 }
-                if (e < 0) {    // no addr given- read after current line
-                        q = begin_line(dot);
-                } else if (e == 0) {    // user said ":0r foo"
+                if (e == 0) {   // user said ":0r foo"
                         q = text;
-                } else {        // addr given- read after that line
-                        q = next_line(find_line(e));
+                } else {        // read after given line or current line if none given
+                        q = next_line(e > 0 ? find_line(e) : dot);
                         // read after last line
                         if (q == end-1)
                                 ++q;
@@ -3170,6 +3166,18 @@ static void colon(char *buf)
                 }
                 len_R = strlen(R);
 
+                if (len_F) {    // save "find" as last search pattern
+                        free(last_search_pattern);
+                        last_search_pattern = xstrdup(F - 1);
+                        last_search_pattern[0] = '/';
+                } else if (last_search_pattern[1] == '\0') {
+                        status_line_bold("No previous search");
+                        goto ret;
+                } else {
+                        F = last_search_pattern + 1;
+                        len_F = strlen(F);
+                }
+
                 if (e < 0) {    // no addr given
                         q = begin_line(dot);      // start with cur line
                         r = end_line(dot);
@@ -3465,8 +3473,11 @@ static int find_range(char **start, char **stop, int cmd)
 #endif
                 // these cmds operate on whole lines
                 buftype = WHOLE;
-                if (--cmdcnt > 0)
+                if (--cmdcnt > 0) {
                         do_cmd('j');
+                        if (cmd_error)
+                                buftype = -1;
+                }
         } else if (strchr("^%$0bBeEfFtThnN/?|{}\b\177", c)) {
                 // Most operate on char positions within a line.  Of those that
                 // don't '%' needs no special treatment, search commands are
@@ -3496,6 +3507,8 @@ static int find_range(char **start, char **stop, int cmd)
                 // these operate on whole lines
                 buftype = WHOLE;
                 do_cmd(c);              // execute movement cmd
+                if (cmd_error)
+                        buftype = -1;
         } else if (c == ' ' || c == 'l') {
                 // forward motion by character
                 int tmpcnt = (cmdcnt ?: 1);
@@ -3581,6 +3594,7 @@ static void do_cmd(int c)
 //      p = q = save_dot = buf; // quiet the compiler
         memset(buf, '\0', sizeof(buf));
         keep_index = FALSE;
+        cmd_error = FALSE;
 
         show_status_line();
 
@@ -3701,24 +3715,30 @@ static void do_cmd(int c)
         case 10:                        // Newline ^J
         case 'j':                       // j- goto next line, same col
         case KEYCODE_DOWN:      // cursor key Down
+        case 13:                        // Carriage Return ^M
+        case '+':                       // +- goto next line
+                q = dot;
                 do {
-                        dot_next();             // go to next B-o-l
+                        p = next_line(q);
+                        if (p == end_line(q)) {
+                                indicate_error();
+                                goto dc1;
+                        }
+                        q = p;
                 } while (--cmdcnt > 0);
-                // try to stay in saved column
-                dot = cindex == C_END ? end_line(dot) : move_to_col(dot, cindex);
-                keep_index = TRUE;
+                dot = q;
+                if (c == 13 || c == '+') {
+                        dot_skip_over_ws();
+                } else {
+                        // try to stay in saved column
+                        dot = cindex == C_END ? end_line(dot) : move_to_col(dot, cindex);
+                        keep_index = TRUE;
+                }
                 break;
         case 12:                        // ctrl-L  force redraw whole screen
         case 18:                        // ctrl-R  force redraw
                 redraw(TRUE);   // this will redraw the entire display
                 break;
-        case 13:                        // Carriage Return ^M
-        case '+':                       // +- goto next line
-                do {
-                        dot_next();
-                } while (--cmdcnt > 0);
-                dot_skip_over_ws();
-                break;
         case 21:                        // ctrl-U  scroll up half screen
                 dot_scroll((rows - 2) / 2, -1);
                 break;
@@ -3759,6 +3779,8 @@ static void do_cmd(int c)
                                 dot = q;
                                 dot_begin();    // go to B-o-l
                                 dot_skip_over_ws();
+                        } else {
+                                indicate_error();
                         }
                 } else if (c1 == '\'') {        // goto previous context
                         dot = swap_context(dot);        // swap current and previous context
@@ -3884,12 +3906,6 @@ static void do_cmd(int c)
         case ',':           // ,- repeat latest search in opposite direction
                 dot_to_char(c != ',' ? last_search_cmd : last_search_cmd ^ 0x20);
                 break;
-        case '-':                       // -- goto prev line
-                do {
-                        dot_prev();
-                } while (--cmdcnt > 0);
-                dot_skip_over_ws();
-                break;
 #if ENABLE_FEATURE_VI_DOT_CMD
         case '.':                       // .- repeat the last modifying command
                 // Stuff the last_modifying_cmd back into stdin
@@ -4095,9 +4111,10 @@ static void do_cmd(int c)
                 if (cmdcnt > (rows - 1)) {
                         cmdcnt = (rows - 1);
                 }
-                if (--cmdcnt > 0) {
-                        do_cmd('+');
+                while (--cmdcnt > 0) {
+                        dot_next();
                 }
+                dot_begin();
                 dot_skip_over_ws();
                 break;
         case 'I':                       // I- insert before first non-blank
@@ -4134,8 +4151,8 @@ static void do_cmd(int c)
                 if (cmdcnt > (rows - 1)) {
                         cmdcnt = (rows - 1);
                 }
-                if (--cmdcnt > 0) {
-                        do_cmd('-');
+                while (--cmdcnt > 0) {
+                        dot_prev();
                 }
                 dot_begin();
                 dot_skip_over_ws();
@@ -4300,12 +4317,24 @@ static void do_cmd(int c)
         }
         case 'k':                       // k- goto prev line, same col
         case KEYCODE_UP:                // cursor key Up
+        case '-':                       // -- goto prev line
+                q = dot;
                 do {
-                        dot_prev();
+                        p = prev_line(q);
+                        if (p == begin_line(q)) {
+                                indicate_error();
+                                goto dc1;
+                        }
+                        q = p;
                 } while (--cmdcnt > 0);
-                // try to stay in saved column
-                dot = cindex == C_END ? end_line(dot) : move_to_col(dot, cindex);
-                keep_index = TRUE;
+                dot = q;
+                if (c == '-') {
+                        dot_skip_over_ws();
+                } else {
+                        // try to stay in saved column
+                        dot = cindex == C_END ? end_line(dot) : move_to_col(dot, cindex);
+                        keep_index = TRUE;
+                }
                 break;
         case 'r':                       // r- replace the current char with user input
                 c1 = get_one_char();    // get the replacement char
@@ -4686,7 +4715,6 @@ static void edit_file(char *fn)
 
         cmd_mode = 0;           // 0=command  1=insert  2='R'eplace
         cmdcnt = 0;
-        tabstop = 8;
         offset = 0;                     // no horizontal offset
         c = '\0';
 #if ENABLE_FEATURE_VI_DOT_CMD
@@ -4814,7 +4842,11 @@ int vi_main(int argc, char **argv)
                         initial_cmds[0] = xstrndup(p, MAX_INPUT_LEN);
         }
 #endif
-        while ((c = getopt(argc, argv, "hCRH" IF_FEATURE_VI_COLON("c:"))) != -1) {
+        while ((c = getopt(argc, argv,
+#if ENABLE_FEATURE_VI_CRASHME
+                        "C"
+#endif
+                        "RHh" IF_FEATURE_VI_COLON("c:"))) != -1) {
                 switch (c) {
 #if ENABLE_FEATURE_VI_CRASHME
                 case 'C':
diff --git a/findutils/grep.c b/findutils/grep.c
index 10cca83e7..be4362ed0 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -57,14 +57,12 @@
 #include "common_bufsiz.h"
 #include "xregex.h"
 
-
-/* options */
 //usage:#define grep_trivial_usage
 //usage:       "[-HhnlLoqvsrRiwFE"
 //usage:        IF_EXTRA_COMPAT("z")
 //usage:       "] [-m N] "
-//usage:        IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ")
-//usage:       "PATTERN/-e PATTERN.../-f FILE [FILE]..."
+//usage:        IF_FEATURE_GREP_CONTEXT("[-A|B|C N] ")
+//usage:       "{ PATTERN | -e PATTERN... | -f FILE... } [FILE]..."
 //usage:#define grep_full_usage "\n\n"
 //usage:       "Search for PATTERN in FILEs (or stdin)\n"
 //usage:     "\n        -H      Add 'filename:' prefix"
diff --git a/include/bb_e2fs_defs.h b/include/bb_e2fs_defs.h
index 3f5e3c45b..608cbf0b0 100644
--- a/include/bb_e2fs_defs.h
+++ b/include/bb_e2fs_defs.h
@@ -182,11 +182,12 @@ struct ext2_dx_countlimit {
 #define EXT2_NOTAIL_FL                  0x00008000 /* file tail should not be merged */
 #define EXT2_DIRSYNC_FL                 0x00010000 /* Synchronous directory modifications */
 #define EXT2_TOPDIR_FL                  0x00020000 /* Top of directory hierarchies*/
-#define EXT3_EXTENTS_FL                 0x00080000 /* Inode uses extents */
-#define EXT2_RESERVED_FL                0x80000000 /* reserved for ext2 lib */
-
-#define EXT2_FL_USER_VISIBLE            0x0003DFFF /* User visible flags */
-#define EXT2_FL_USER_MODIFIABLE         0x000080FF /* User modifiable flags */
+#define EXT2_EXTENT_FL                  0x00080000 /* Extents */
+#define EXT2_VERITY_FL                  0x00100000
+#define EXT2_NOCOW_FL                   0x00800000 /* Do not cow file */
+#define EXT2_INLINE_DATA_FL             0x10000000
+#define EXT2_PROJINHERIT_FL             0x20000000
+#define EXT2_CASEFOLD_FL                0x40000000
 
 /*
  * ioctl commands
@@ -195,6 +196,18 @@ struct ext2_dx_countlimit {
 #define EXT2_IOC_SETFLAGS               _IOW('f', 2, long)
 #define EXT2_IOC_GETVERSION             _IOR('v', 1, long)
 #define EXT2_IOC_SETVERSION             _IOW('v', 2, long)
+//NB: despite "long" in defs above, these ioctls use an _int_!
+//passing them a pointer to long will read/write only int-sized data!
+struct ext2_fsxattr {
+        uint32_t        fsx_xflags;     /* xflags field value (get/set) */
+        uint32_t        fsx_extsize;    /* extsize field value (get/set)*/
+        uint32_t        fsx_nextents;   /* nextents field value (get)   */
+        uint32_t        fsx_projid;     /* project identifier (get/set) */
+        uint32_t        fsx_cowextsize; /* CoW extsize field value (get/set)*/
+        unsigned char   fsx_pad[8];
+};
+#define EXT2_IOC_FSGETXATTR             _IOR('X', 31, struct ext2_fsxattr)
+#define EXT2_IOC_FSSETXATTR             _IOW('X', 32, struct ext2_fsxattr)
 
 /*
  * Structure of an inode on the disk
diff --git a/include/dump.h b/include/dump.h
index 9193a6925..10fc5d900 100644
--- a/include/dump.h
+++ b/include/dump.h
@@ -32,8 +32,10 @@ typedef struct dumper_t {
         off_t dump_skip;                /* bytes to skip */
         int dump_length;                /* max bytes to read */
         smallint dump_vflag;            /*enum dump_vflag_t*/
-        const char *eofstring;
         FS *fshead;
+        const char *xxd_eofstring;
+        off_t address;           /* address/offset in stream */
+        long long xxd_displayoff;
 } dumper_t;
 
 dumper_t* alloc_dumper(void) FAST_FUNC;
diff --git a/include/libbb.h b/include/libbb.h
index e80ed1e32..7a43967cb 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -469,23 +469,29 @@ enum {	/* cp.c, mv.c, install.c depend on these values. CAREFUL when changing th
         FILEUTILS_RECUR           = 1 << 2, /* -R */
         FILEUTILS_FORCE           = 1 << 3, /* -f */
         FILEUTILS_INTERACTIVE     = 1 << 4, /* -i */
-        FILEUTILS_MAKE_HARDLINK   = 1 << 5, /* -l */
-        FILEUTILS_MAKE_SOFTLINK   = 1 << 6, /* -s */
-        FILEUTILS_DEREF_SOFTLINK  = 1 << 7, /* -L */
-        FILEUTILS_DEREFERENCE_L0  = 1 << 8, /* -H */
+        FILEUTILS_NO_OVERWRITE    = 1 << 5, /* -n */
+        FILEUTILS_MAKE_HARDLINK   = 1 << 6, /* -l */
+        FILEUTILS_MAKE_SOFTLINK   = 1 << 7, /* -s */
+        FILEUTILS_DEREF_SOFTLINK  = 1 << 8, /* -L */
+        FILEUTILS_DEREFERENCE_L0  = 1 << 9, /* -H */
         /* -a = -pdR (mapped in cp.c) */
         /* -r = -dR  (mapped in cp.c) */
         /* -P = -d   (mapped in cp.c) */
-        FILEUTILS_VERBOSE         = (1 << 12) * ENABLE_FEATURE_VERBOSE, /* -v */
-        FILEUTILS_UPDATE          = 1 << 13, /* -u */
-        FILEUTILS_NO_TARGET_DIR   = 1 << 14, /* -T */
+        FILEUTILS_VERBOSE         = (1 << 13) * ENABLE_FEATURE_VERBOSE, /* -v */
+        FILEUTILS_UPDATE          = 1 << 14, /* -u */
+        FILEUTILS_NO_TARGET_DIR   = 1 << 15, /* -T */
+        FILEUTILS_TARGET_DIR      = 1 << 16, /* -t DIR */
 #if ENABLE_SELINUX
-        FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 15, /* -c */
+        FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 17, /* -c */
 #endif
-        FILEUTILS_RMDEST          = 1 << (16 - !ENABLE_SELINUX), /* --remove-destination */
-        /* bit 17 skipped for "cp --parents" */
-        FILEUTILS_REFLINK         = 1 << (18 - !ENABLE_SELINUX), /* cp --reflink=auto */
-        FILEUTILS_REFLINK_ALWAYS  = 1 << (19 - !ENABLE_SELINUX), /* cp --reflink[=always] */
+#define FILEUTILS_CP_OPTSTR "pdRfinlsLHarPvuTt:" IF_SELINUX("c")
+/* How many bits in FILEUTILS_CP_OPTSTR? */
+        FILEUTILS_CP_OPTBITS      = 18 - !ENABLE_SELINUX,
+
+        FILEUTILS_RMDEST          = 1 << (19 - !ENABLE_SELINUX), /* cp --remove-destination */
+        /* bit 18 skipped for "cp --parents" */
+        FILEUTILS_REFLINK         = 1 << (20 - !ENABLE_SELINUX), /* cp --reflink=auto */
+        FILEUTILS_REFLINK_ALWAYS  = 1 << (21 - !ENABLE_SELINUX), /* cp --reflink[=always] */
         /*
          * Hole. cp may have some bits set here,
          * they should not affect remove_file()/copy_file()
@@ -495,7 +501,7 @@ enum {	/* cp.c, mv.c, install.c depend on these values. CAREFUL when changing th
 #endif
         FILEUTILS_IGNORE_CHMOD_ERR = 1 << 31,
 };
-#define FILEUTILS_CP_OPTSTR "pdRfilsLHarPvuT" IF_SELINUX("c")
+
 extern int remove_file(const char *path, int flags) FAST_FUNC;
 /* NB: without FILEUTILS_RECUR in flags, it will basically "cat"
  * the source, not copy (unless "source" is a directory).
@@ -525,6 +531,11 @@ int recursive_action(const char *fileName, unsigned flags,
         void *userData
 ) FAST_FUNC;
 
+/* Simpler version: call a function on each dirent in a directory */
+int iterate_on_dir(const char *dir_name,
+                int FAST_FUNC (*func)(const char *, struct dirent *, void *),
+                void *private) FAST_FUNC;
+
 extern int device_open(const char *device, int mode) FAST_FUNC;
 enum { GETPTY_BUFSIZE = 16 }; /* more than enough for "/dev/ttyXXX" */
 extern int xgetpty(char *line) FAST_FUNC;
@@ -1105,10 +1116,10 @@ char *smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale) FAST_
 /* If block_size == 0, display size without fractional part,
  * else display (size * block_size) with one decimal digit.
  * If display_unit == 0, show value no bigger than 1024 with suffix (K,M,G...),
- * else divide by display_unit and do not use suffix. */
+ * else divide by display_unit and do not use suffix.
+ * Returns "auto pointer" */
 #define HUMAN_READABLE_MAX_WIDTH      7  /* "1024.0G" */
 #define HUMAN_READABLE_MAX_WIDTH_STR "7"
-//TODO: provide pointer to buf (avoid statics)?
 const char *make_human_readable_str(unsigned long long size,
                 unsigned long block_size, unsigned long display_unit) FAST_FUNC;
 /* Put a string of hex bytes ("1b2e66fe"...), return advanced pointer */
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 9b10dda1f..c0928a5a8 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -117,6 +117,8 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                         return -1;
                 }
 #endif
+                if (flags & FILEUTILS_NO_OVERWRITE) /* cp -n */
+                        return 0;
                 dest_exists = 1;
         }
 
diff --git a/libbb/dump.c b/libbb/dump.c
index 196ccfe65..ffae04786 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -34,7 +34,6 @@ typedef struct priv_dumper_t {
         FU *endfu;
         off_t savaddress;        /* saved address/offset in stream */
         off_t eaddress;          /* end address */
-        off_t address;           /* address/offset in stream */
         int blocksize;
         smallint exitval;        /* final exit value */
 #if ENABLE_PLATFORM_MINGW32
@@ -217,7 +216,7 @@ static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs)
                                 pr->bcnt = fu->bcnt;
                                 if (fu->bcnt == 0) {
                                         if (!prec)
-                                                bb_simple_error_msg_and_die("%%s needs precision or byte count");
+                                                bb_simple_error_msg_and_die("%s needs precision or byte count");
                                         pr->bcnt = atoi(prec);
                                 }
                         } else
@@ -234,7 +233,8 @@ static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs)
                                         if ((p1[2] != 'd') && (p1[2] != 'o') && (p1[2] != 'x')) {
                                                 goto DO_BAD_CONV_CHAR;
                                         }
-                                        *p1 = p1[2];
+                                        *p1++ = 'l';
+                                        *p1++ = 'l';
                                         break;
                                 case 'c':       /* %_c: chars, \ooo, \n \r \t etc */
                                         pr->flags = F_C;
@@ -344,7 +344,7 @@ static void do_skip(priv_dumper_t *dumper, const char *fname)
         ) {
                 /* If st_size is valid and pub.dump_skip >= st_size */
                 dumper->pub.dump_skip -= sbuf.st_size;
-                dumper->address += sbuf.st_size;
+                dumper->pub.address += sbuf.st_size;
                 return;
         }
 #if ENABLE_PLATFORM_MINGW32
@@ -354,8 +354,8 @@ static void do_skip(priv_dumper_t *dumper, const char *fname)
 #endif
                 bb_simple_perror_msg_and_die(fname);
         }
-        dumper->address += dumper->pub.dump_skip;
-        dumper->savaddress = dumper->address;
+        dumper->pub.address += dumper->pub.dump_skip;
+        dumper->savaddress = dumper->pub.address;
         dumper->pub.dump_skip = 0;
 }
 
@@ -375,6 +375,7 @@ static NOINLINE int next(priv_dumper_t *dumper)
 #endif
                                         bb_simple_perror_msg(fname);
                                         dumper->exitval = 1;
+                                        dumper->next__done = 1;
                                         continue;
                                 }
                         }
@@ -403,7 +404,7 @@ static unsigned char *get(priv_dumper_t *dumper)
         int blocksize = dumper->blocksize;
 
         if (!dumper->get__curp) {
-                dumper->address = (off_t)0; /*DBU:[dave@cray.com] initialize,initialize..*/
+                dumper->pub.address = (off_t)0; /*DBU:[dave@cray.com] initialize,initialize..*/
                 dumper->get__curp = xmalloc(blocksize);
                 dumper->get__savp = xzalloc(blocksize); /* need to be initialized */
         } else {
@@ -411,7 +412,7 @@ static unsigned char *get(priv_dumper_t *dumper)
                 dumper->get__curp = dumper->get__savp;
                 dumper->get__savp = tmp;
                 dumper->savaddress += blocksize;
-                dumper->address = dumper->savaddress;
+                dumper->pub.address = dumper->savaddress;
         }
         need = blocksize;
         nread = 0;
@@ -434,7 +435,7 @@ static unsigned char *get(priv_dumper_t *dumper)
                                 }
                         }
                         memset(dumper->get__curp + nread, 0, need);
-                        dumper->eaddress = dumper->address + nread;
+                        dumper->eaddress = dumper->pub.address + nread;
                         return dumper->get__curp;
                 }
 #if ENABLE_PLATFORM_MINGW32
@@ -478,7 +479,7 @@ static unsigned char *get(priv_dumper_t *dumper)
                         }
                         dumper->pub.dump_vflag = DUP;
                         dumper->savaddress += blocksize;
-                        dumper->address = dumper->savaddress;
+                        dumper->pub.address = dumper->savaddress;
                         need = blocksize;
                         nread = 0;
                 } else {
@@ -579,8 +580,8 @@ static void display(priv_dumper_t* dumper)
 
                 fs = dumper->pub.fshead;
                 savebp = bp;
-                saveaddress = dumper->address;
-                for (; fs; fs = fs->nextfs, bp = savebp, dumper->address = saveaddress) {
+                saveaddress = dumper->pub.address;
+                for (; fs; fs = fs->nextfs, bp = savebp, dumper->pub.address = saveaddress) {
                         FU *fu;
                         for (fu = fs->nextfu; fu; fu = fu->nextfu) {
                                 int cnt;
@@ -589,14 +590,14 @@ static void display(priv_dumper_t* dumper)
                                 }
                                 for (cnt = fu->reps; cnt; --cnt) {
                                         PR *pr;
-                                        for (pr = fu->nextpr; pr; dumper->address += pr->bcnt,
+                                        for (pr = fu->nextpr; pr; dumper->pub.address += pr->bcnt,
                                                                 bp += pr->bcnt, pr = pr->nextpr) {
                                                 if (dumper->eaddress
-                                                 && dumper->address >= dumper->eaddress
+                                                 && dumper->pub.address >= dumper->eaddress
                                                 ) {
-                                                        if (dumper->pub.eofstring) {
+                                                        if (dumper->pub.xxd_eofstring) {
                                                                 /* xxd support: requested to not pad incomplete blocks */
-                                                                fputs_stdout(dumper->pub.eofstring);
+                                                                fputs_stdout(dumper->pub.xxd_eofstring);
                                                                 return;
                                                         }
                                                         if (!(pr->flags & (F_TEXT | F_BPAD)))
@@ -608,7 +609,7 @@ static void display(priv_dumper_t* dumper)
                                                 }
                                                 switch (pr->flags) {
                                                 case F_ADDRESS:
-                                                        printf(pr->fmt, (unsigned) dumper->address);
+                                                        printf(pr->fmt, (unsigned long long) dumper->pub.address + dumper->pub.xxd_displayoff);
                                                         break;
                                                 case F_BPAD:
                                                         printf(pr->fmt, "");
@@ -702,15 +703,15 @@ static void display(priv_dumper_t* dumper)
                  * of blocksize, and no partial block ever found.
                  */
                 if (!dumper->eaddress) {
-                        if (!dumper->address) {
+                        if (!dumper->pub.address) {
                                 return;
                         }
-                        dumper->eaddress = dumper->address;
+                        dumper->eaddress = dumper->pub.address;
                 }
                 for (pr = dumper->endfu->nextpr; pr; pr = pr->nextpr) {
                         switch (pr->flags) {
                         case F_ADDRESS:
-                                printf(pr->fmt, (unsigned) dumper->eaddress);
+                                printf(pr->fmt, (unsigned long long) dumper->eaddress + dumper->pub.xxd_displayoff);
                                 break;
                         case F_TEXT:
                                 printf(pr->fmt);
diff --git a/libbb/iterate_on_dir.c b/libbb/iterate_on_dir.c
new file mode 100644
index 000000000..deef72ebf
--- /dev/null
+++ b/libbb/iterate_on_dir.c
@@ -0,0 +1,28 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * See README for additional information
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//kbuild:lib-y += iterate_on_dir.o
+
+#include "libbb.h"
+
+/* Iterate a function on each entry of a directory */
+int FAST_FUNC iterate_on_dir(const char *dir_name,
+                int FAST_FUNC (*func)(const char *, struct dirent *, void *),
+                void *private)
+{
+        DIR *dir;
+        struct dirent *de;
+
+        dir = opendir(dir_name);
+        if (dir == NULL) {
+                return -1;
+        }
+        while ((de = readdir(dir)) != NULL) {
+                func(dir_name, de, private);
+        }
+        closedir(dir);
+        return 0;
+}
diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index cea5d47e6..1505e6218 100644
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -60,11 +60,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
                                 status = -1;
                         free(new_path);
                 }
-
-                if (closedir(dp) < 0) {
-                        bb_perror_msg("can't close '%s'", path);
-                        return -1;
-                }
+                closedir(dp);
 
                 if (flags & FILEUTILS_INTERACTIVE) {
                         fprintf(stderr, "%s: remove directory '%s'? ",
diff --git a/loginutils/su.c b/loginutils/su.c
index e46bbf78b..647c97fb1 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -36,7 +36,7 @@
 //kbuild:lib-$(CONFIG_SU) += su.o
 
 //usage:#define su_trivial_usage
-//usage:       "[-lmp] [-] [-s SH] [USER [SCRIPT ARGS / -c 'CMD' ARG0 ARGS]]"
+//usage:       "[-lmp] [-s SH] [-] [USER [FILE ARGS | -c 'CMD' [ARG0 ARGS]]]"
 //usage:#define su_full_usage "\n\n"
 //usage:       "Run shell under USER (by default, root)\n"
 //usage:     "\n        -,-l    Clear environment, go to home dir, run shell as login shell"
diff --git a/miscutils/ascii.c b/miscutils/ascii.c
new file mode 100644
index 000000000..98c11fa51
--- /dev/null
+++ b/miscutils/ascii.c
@@ -0,0 +1,51 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2021 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config ASCII
+//config:       bool "ascii"
+//config:       default y
+//config:       help
+//config:       Print ascii table.
+//config:
+
+//applet:IF_ASCII(APPLET(ascii, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_ASCII) += ascii.o
+
+//usage:#define ascii_trivial_usage NOUSAGE_STR
+//usage:#define ascii_full_usage ""
+
+#include "libbb.h"
+
+int ascii_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ascii_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+        const char *ctrl =
+                "NUL""SOH""STX""ETX""EOT""ENQ""ACK""BEL"
+                "BS ""HT ""NL ""VT ""FF ""CR ""SO ""SI "
+                "DLE""DC1""DC2""DC3""DC4""NAK""SYN""ETB"
+                "CAN""EM ""SUB""ESC""FS ""GS ""RS ""US "
+        ;
+//TODO: od has a similar table, can we reuse it?
+        char last[2];
+        unsigned i;
+
+        last[1] = '\0';
+        printf("Dec Hex    Dec Hex    Dec Hex  Dec Hex  Dec Hex  Dec Hex   Dec Hex   Dec Hex\n");
+        for (i = 0; i < 16; i++) {
+                printf("%3u %02x %.3s%4u %02x %.3s%4u %02x %c%4u %02x %c%4u %02x %c%4u %02x %c%5u %02x %c%5u %02x %s\n",
+                        i+0x00, i+0x00, ctrl + i*3,
+                        i+0x10, i+0x10, ctrl + i*3 + 16*3,
+                        i+0x20, i+0x20, i+0x20,
+                        i+0x30, i+0x30, i+0x30,
+                        i+0x40, i+0x40, i+0x40,
+                        i+0x50, i+0x50, i+0x50,
+                        i+0x60, i+0x60, i+0x60,
+                        i+0x70, i+0x70, (i+0x70 == 0x7f ? "DEL" : (last[0] = i+0x70, last))
+                );
+        }
+        return EXIT_SUCCESS;
+}
diff --git a/miscutils/bc.c b/miscutils/bc.c
index d74ab1da2..f931be5cc 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -5,7 +5,7 @@
  * Original code copyright (c) 2018 Gavin D. Howard and contributors.
  */
 //TODO:
-// maybe implement a^b for non-integer b?
+// maybe implement a^b for non-integer b? (see zbc_num_p())
 
 #define DEBUG_LEXER   0
 #define DEBUG_COMPILE 0
@@ -108,7 +108,7 @@
 
 //See www.gnu.org/software/bc/manual/bc.html
 //usage:#define bc_trivial_usage
-//usage:       "[-sqlw] [FILE...]"
+//usage:       "[-sqlw] [FILE]..."
 //usage:
 //usage:#define bc_full_usage "\n"
 //usage:     "\nArbitrary precision calculator"
@@ -1386,6 +1386,12 @@ static void bc_num_copy(BcNum *d, BcNum *s)
         }
 }
 
+static void bc_num_init_and_copy(BcNum *d, BcNum *s)
+{
+        bc_num_init(d, s->len);
+        bc_num_copy(d, s);
+}
+
 static BC_STATUS zbc_num_ulong_abs(BcNum *n, unsigned long *result_p)
 {
         size_t i;
@@ -1985,11 +1991,8 @@ static FAST_FUNC BC_STATUS zbc_num_m(BcNum *a, BcNum *b, BcNum *restrict c, size
         scale = BC_MIN(a->rdx + b->rdx, scale);
         maxrdx = BC_MAX(maxrdx, scale);
 
-        bc_num_init(&cpa, a->len);
-        bc_num_init(&cpb, b->len);
-
-        bc_num_copy(&cpa, a);
-        bc_num_copy(&cpb, b);
+        bc_num_init_and_copy(&cpa, a);
+        bc_num_init_and_copy(&cpb, b);
         cpa.neg = cpb.neg = false;
 
         s = zbc_num_shift(&cpa, maxrdx);
@@ -2152,6 +2155,7 @@ static FAST_FUNC BC_STATUS zbc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size
         BcNum copy;
         unsigned long pow;
         size_t i, powrdx, resrdx;
+        size_t a_rdx;
         bool neg;
 
         // GNU bc does not allow 2^2.0 - we do
@@ -2159,6 +2163,9 @@ static FAST_FUNC BC_STATUS zbc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size
                 if (b->num[i] != 0)
                         RETURN_STATUS(bc_error("not an integer"));
 
+// a^b for non-integer b (for a>0) can be implemented as exp(ln(a)*b).
+// Possibly better precision would be given by a^int(b) * exp(ln(a)*frac(b)).
+
         if (b->len == 0) {
                 bc_num_one(c);
                 RETURN_STATUS(BC_STATUS_SUCCESS);
@@ -2180,18 +2187,31 @@ static FAST_FUNC BC_STATUS zbc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size
         if (s) RETURN_STATUS(s);
         // b is not used beyond this point
 
-        bc_num_init(&copy, a->len);
-        bc_num_copy(&copy, a);
+        bc_num_init_and_copy(&copy, a);
+        a_rdx = a->rdx; // pull it into a CPU register (hopefully)
+        // a is not used beyond this point
 
         if (!neg) {
-                if (a->rdx > scale)
-                        scale = a->rdx;
-                if (a->rdx * pow < scale)
-                        scale = a->rdx * pow;
-        }
-
-
-        for (powrdx = a->rdx; !(pow & 1); pow >>= 1) {
+                unsigned long new_scale;
+                if (a_rdx > scale)
+                        scale = a_rdx;
+                new_scale = a_rdx * pow;
+                // Don't fall for multiplication overflow. Example:
+                // 0.01^2147483648 a_rdx:2 pow:0x80000000, 32bit mul is 0.
+//not that it matters with current algorithm, it would OOM on such large powers,
+//but it can be improved to detect zero results etc. Example: with scale=0,
+//result of 0.01^N for any N>1 is 0: 0.01^2 = 0.0001 ~= 0.00 (trunc to scale)
+//then this would matter:
+                // if a_rdx != 0 and new_scale < pow, we had overflow,
+                // correct "new_scale" value is larger than ULONG_MAX,
+                // thus larger than any possible current value of "scale",
+                // thus "scale = new_scale" should not be done:
+                if (a_rdx == 0 || new_scale >= pow)
+                        if (new_scale < scale)
+                                scale = new_scale;
+        }
+
+        for (powrdx = a_rdx; !(pow & 1); pow >>= 1) {
                 powrdx <<= 1;
                 s = zbc_num_mul(&copy, &copy, &copy, powrdx);
                 if (s) goto err;
@@ -2493,8 +2513,7 @@ static void bc_array_copy(BcVec *d, const BcVec *s)
         dnum = (void*)d->v;
         snum = (void*)s->v;
         for (i = 0; i < s->len; i++, dnum++, snum++) {
-                bc_num_init(dnum, snum->len);
-                bc_num_copy(dnum, snum);
+                bc_num_init_and_copy(dnum, snum);
         }
 }
 
@@ -2508,8 +2527,7 @@ static void dc_result_copy(BcResult *d, BcResult *src)
                 case XC_RESULT_IBASE:
                 case XC_RESULT_SCALE:
                 case XC_RESULT_OBASE:
-                        bc_num_init(&d->d.n, src->d.n.len);
-                        bc_num_copy(&d->d.n, &src->d.n);
+                        bc_num_init_and_copy(&d->d.n, &src->d.n);
                         break;
                 case XC_RESULT_VAR:
                 case XC_RESULT_ARRAY:
@@ -5611,11 +5629,10 @@ static BC_STATUS zxc_num_printNum(BcNum *n, unsigned base_t, size_t width, BcNum
         }
 
         bc_vec_init(&stack, sizeof(long), NULL);
-        bc_num_init(&intp, n->len);
+        bc_num_init_and_copy(&intp, n);
         bc_num_init(&fracp, n->rdx);
         bc_num_init(&digit, width);
         bc_num_init(&frac_len, BC_NUM_INT(n));
-        bc_num_copy(&intp, n);
         bc_num_one(&frac_len);
         base.cap = ARRAY_SIZE(base_digs);
         base.num = base_digs;
@@ -5784,8 +5801,7 @@ static BC_STATUS zxc_program_negate(void)
         s = zxc_program_prep(&ptr, &num);
         if (s) RETURN_STATUS(s);
 
-        bc_num_init(&res.d.n, num->len);
-        bc_num_copy(&res.d.n, num);
+        bc_num_init_and_copy(&res.d.n, num);
         if (res.d.n.len) res.d.n.neg = !res.d.n.neg;
 
         xc_program_retire(&res, XC_RESULT_TEMP);
@@ -6024,8 +6040,7 @@ static BC_STATUS zxc_program_assign(char inst)
                 s = BC_STATUS_SUCCESS;
         }
 
-        bc_num_init(&res.d.n, l->len);
-        bc_num_copy(&res.d.n, l);
+        bc_num_init_and_copy(&res.d.n, l);
         xc_program_binOpRetire(&res);
 
         RETURN_STATUS(s);
@@ -6122,8 +6137,7 @@ static BC_STATUS zbc_program_incdec(char inst)
 
         if (inst == BC_INST_INC_POST || inst == BC_INST_DEC_POST) {
                 copy.t = XC_RESULT_TEMP;
-                bc_num_init(&copy.d.n, num->len);
-                bc_num_copy(&copy.d.n, num);
+                bc_num_init_and_copy(&copy.d.n, num);
         }
 
         res.t = BC_RESULT_ONE;
@@ -6225,8 +6239,7 @@ static BC_STATUS zbc_program_return(char inst)
 
                 s = zxc_program_num(operand, &num);
                 if (s) RETURN_STATUS(s);
-                bc_num_init(&res.d.n, num->len);
-                bc_num_copy(&res.d.n, num);
+                bc_num_init_and_copy(&res.d.n, num);
                 bc_vec_pop(&G.prog.results);
         } else {
                 if (f->voidfunc)
diff --git a/miscutils/chat.c b/miscutils/chat.c
index 86a114df6..f9e12a4ac 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -79,7 +79,7 @@
 //kbuild:lib-$(CONFIG_CHAT) += chat.o
 
 //usage:#define chat_trivial_usage
-//usage:       "EXPECT [SEND [EXPECT [SEND...]]]"
+//usage:       "EXPECT [SEND [EXPECT [SEND]]...]"
 //usage:#define chat_full_usage "\n\n"
 //usage:       "Useful for interacting with a modem connected to stdin/stdout.\n"
 //usage:       "A script consists of \"expect-send\" argument pairs.\n"
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c
index 1ca9d158d..93c80cc6c 100644
--- a/miscutils/flashcp.c
+++ b/miscutils/flashcp.c
@@ -19,9 +19,9 @@
 //kbuild:lib-$(CONFIG_FLASHCP) += flashcp.o
 
 //usage:#define flashcp_trivial_usage
-//usage:       "-v FILE MTD_DEVICE"
+//usage:       "[-v] FILE MTD_DEVICE"
 //usage:#define flashcp_full_usage "\n\n"
-//usage:       "Copy an image to MTD device\n"
+//usage:       "Copy FILE to MTD device\n"
 //usage:     "\n        -v      Verbose"
 
 #include "libbb.h"
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 48135921d..b25d49792 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -1394,7 +1394,7 @@ static void check_i2c_func(int fd)
 }
 
 //usage:#define i2ctransfer_trivial_usage
-//usage:       "[-fay] I2CBUS {rLENGTH[@ADDR] | wLENGTH[@ADDR] DATA...}..."
+//usage:       "[-fay] I2CBUS { rLENGTH[@ADDR] | wLENGTH[@ADDR] DATA...}..."
 //usage:#define i2ctransfer_full_usage "\n\n"
 //usage:       "Read/write I2C data in one transfer"
 //usage:     "\n"
diff --git a/miscutils/man.c b/miscutils/man.c
index 052b50054..be3b2a000 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -350,7 +350,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 
         /* is 1st ARG a SECTION? */
         sec_list = conf_sec_list;
-        if (is_section_name(conf_sec_list, *argv)) {
+        if (is_section_name(conf_sec_list, *argv) && argv[1]) {
                 /* yes */
                 sec_list = *argv++;
         }
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index 399d4cf7f..97b46342f 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -18,14 +18,14 @@
 //kbuild:lib-$(CONFIG_MICROCOM) += microcom.o
 
 //usage:#define microcom_trivial_usage
-//usage:       "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY"
+//usage:       "[-d DELAY_MS] [-t TIMEOUT_MS ] [-s SPEED] [-X] TTY"
 //usage:#define microcom_full_usage "\n\n"
-//usage:       "Copy bytes for stdin to TTY and from TTY to stdout\n"
-//usage:     "\n        -d      Wait up to DELAY ms for TTY output before sending every"
-//usage:     "\n                next byte to it"
-//usage:     "\n        -t      Exit if both stdin and TTY are silent for TIMEOUT ms"
-//usage:     "\n        -s      Set serial line to SPEED"
-//usage:     "\n        -X      Disable special meaning of NUL and Ctrl-X from stdin"
+//usage:       "Copy bytes from stdin to TTY and from TTY to stdout\n"
+//usage:     "\n        -d DELAY        Wait up to DELAY ms for TTY output before sending"
+//usage:     "\n                        every next byte to it"
+//usage:     "\n        -t TIMEOUT      Exit if both stdin and TTY are silent for TIMEOUT ms"
+//usage:     "\n        -s SPEED        Set serial line to SPEED"
+//usage:     "\n        -X              Disable special meaning of NUL and Ctrl-X from stdin"
 
 #include "libbb.h"
 #include "common_bufsiz.h"
diff --git a/miscutils/mt.c b/miscutils/mt.c
index 1a4214664..52d5476a1 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -19,7 +19,7 @@
 //usage:#define mt_full_usage "\n\n"
 //usage:       "Control magnetic tape drive operation\n"
 //usage:       "\n"
-//usage:       "Available Opcodes:\n"
+//usage:       "Opcodes:\n"
 //usage:       "\n"
 //usage:       "bsf bsfm bsr bss datacompression drvbuffer eof eom erase\n"
 //usage:       "fsf fsfm fsr fss load lock mkpart nop offline ras1 ras2\n"
diff --git a/miscutils/strings.c b/miscutils/strings.c
index e4a68227e..b01884968 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -18,7 +18,7 @@
 //kbuild:lib-$(CONFIG_STRINGS) += strings.o
 
 //usage:#define strings_trivial_usage
-//usage:       "[-fo] [-t o/d/x] [-n LEN] [FILE]..."
+//usage:       "[-fo] [-t o|d|x] [-n LEN] [FILE]..."
 //usage:#define strings_full_usage "\n\n"
 //usage:       "Display printable strings in a binary file\n"
 //We usually don't bother user with "nop" options. They work, but are not shown:
@@ -26,7 +26,7 @@
 //unimplemented alternative is -d: Only strings from initialized, loaded data sections
 //usage:     "\n        -f              Precede strings with filenames"
 //usage:     "\n        -o              Precede strings with octal offsets"
-//usage:     "\n        -t o/d/x        Precede strings with offsets in base 8/10/16"
+//usage:     "\n        -t o|d|x        Precede strings with offsets in base 8/10/16"
 //usage:     "\n        -n LEN          At least LEN characters form a string (default 4)"
 
 #include "libbb.h"
diff --git a/miscutils/ts.c b/miscutils/ts.c
index 3eecb7464..af6677fc7 100644
--- a/miscutils/ts.c
+++ b/miscutils/ts.c
@@ -13,7 +13,10 @@
 
 //usage:#define ts_trivial_usage
 //usage:       "[-is] [STRFTIME]"
-//usage:#define ts_full_usage ""
+//usage:#define ts_full_usage "\n\n"
+//usage:       "Pipe stdin to stdout, add timestamp to each line\n"
+//usage:     "\n        -s      Time since start"
+//usage:     "\n        -i      Time since previous line"
 
 #include "libbb.h"
 #include "common_bufsiz.h"
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index 69ead7a13..6d49f61d9 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -251,7 +251,7 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
         } else
 
 //usage:#define ubirmvol_trivial_usage
-//usage:       "-n VOLID / -N VOLNAME UBI_DEVICE"
+//usage:       "-n VOLID | -N VOLNAME UBI_DEVICE"
 //usage:#define ubirmvol_full_usage "\n\n"
 //usage:       "Remove UBI volume\n"
 //usage:     "\n        -n VOLID        Volume ID"
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index d15772f0d..0a86c3296 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -131,7 +131,7 @@ static void modinfo(const char *path, const char *version,
 //usage:     "\n        -p              Shortcut for '-F parm'"
 ////usage:     "\n      -n              Shortcut for '-F filename'"
 //usage:     "\n        -F keyword      Keyword to look for"
-//usage:     "\n        -0              Separate output with NULs"
+//usage:     "\n        -0              NUL terminated output"
 //usage:#define modinfo_example_usage
 //usage:       "$ modinfo -F vermagic loop\n"
 
diff --git a/networking/ftpd.c b/networking/ftpd.c
index 6ca231c90..0d6a289c7 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -54,7 +54,7 @@
 //kbuild:lib-$(CONFIG_FTPD) += ftpd.o
 
 //usage:#define ftpd_trivial_usage
-//usage:       "[-wvS]"IF_FEATURE_FTPD_AUTHENTICATION(" [-a USER]")" [-t N] [-T N] [DIR]"
+//usage:       "[-wvS]"IF_FEATURE_FTPD_AUTHENTICATION(" [-a USER]")" [-t SEC] [-T SEC] [DIR]"
 //usage:#define ftpd_full_usage "\n\n"
 //usage:        IF_NOT_FEATURE_FTPD_AUTHENTICATION(
 //usage:       "Anonymous FTP server. Client access occurs under ftpd's UID.\n"
@@ -63,7 +63,7 @@
 //usage:       "FTP server. "
 //usage:        )
 //usage:       "Chroots to DIR, if this fails (run by non-root), cds to it.\n"
-//usage:       "Should be used as inetd service, inetd.conf line:\n"
+//usage:       "It is an inetd service, inetd.conf line:\n"
 //usage:       "        21 stream tcp nowait root ftpd ftpd /files/to/serve\n"
 //usage:       "Can be run from tcpsvd:\n"
 //usage:       "        tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve"
diff --git a/networking/nameif.c b/networking/nameif.c
index 854594c83..66e042688 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -52,10 +52,10 @@
 //usage:#define nameif_full_usage "\n\n"
 //usage:        "Rename network interface while it in the down state."
 //usage:        IF_NOT_FEATURE_NAMEIF_EXTENDED(
-//usage:     "\nThe device with address HWADDR is renamed to IFACE."
+//usage:     "\nThe device with address HWADDR is renamed to IFNAME."
 //usage:        )
 //usage:        IF_FEATURE_NAMEIF_EXTENDED(
-//usage:     "\nThe device matched by SELECTOR is renamed to IFACE."
+//usage:     "\nThe device matched by SELECTOR is renamed to IFNAME."
 //usage:     "\nSELECTOR can be a combination of:"
 //usage:     "\n        driver=STRING"
 //usage:     "\n        bus=STRING"
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 29f805de7..de4d733f9 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -109,6 +109,7 @@
 //usage:     "\n        -i              Inetd mode"
 //usage:        IF_FEATURE_TELNETD_INETD_WAIT(
 //usage:     "\n        -w SEC          Inetd 'wait' mode, linger time SEC"
+//usage:     "\n                inetd.conf line: 23 stream tcp wait root telnetd telnetd -w10"
 //usage:     "\n        -S              Log to syslog (implied by -i or without -F and -w)"
 //usage:        )
 //usage:        )
diff --git a/networking/tftp.c b/networking/tftp.c
index 4b86ed9de..f5b4367ca 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -113,10 +113,9 @@
 //usage:#define tftpd_full_usage "\n\n"
 //usage:       "Transfer a file on tftp client's request\n"
 //usage:       "\n"
-//usage:       "tftpd should be used as an inetd service.\n"
-//usage:       "tftpd's line for inetd.conf:\n"
+//usage:       "tftpd is an inetd service, inetd.conf line:\n"
 //usage:       "        69 dgram udp nowait root tftpd tftpd -l /files/to/serve\n"
-//usage:       "It also can be ran from udpsvd:\n"
+//usage:       "Can be run from udpsvd:\n"
 //usage:       "        udpsvd -vE 0.0.0.0 69 tftpd /files/to/serve\n"
 //usage:     "\n        -r      Prohibit upload"
 //usage:     "\n        -c      Allow file creation via upload"
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 7f288f891..8d11a7539 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -479,15 +479,15 @@ static ALWAYS_INLINE uint32_t random_xid(void)
 }
 
 /* Initialize the packet with the proper defaults */
-static uint8_t *init_d6_packet(struct d6_packet *packet, char type, uint32_t xid)
+static uint8_t *init_d6_packet(struct d6_packet *packet, char type)
 {
         uint8_t *ptr;
         unsigned secs;
 
         memset(packet, 0, sizeof(*packet));
 
-        packet->d6_xid32 = xid;
-        packet->d6_msg_type = type;
+        packet->d6_xid32 = client_data.xid;
+        packet->d6_msg_type = type; /* union, overwrites lowest byte of d6_xid32 */
 
         /* ELAPSED_TIME option is required to be present by the RFC,
          * and some servers do check for its presense. [which?]
@@ -585,13 +585,13 @@ static int d6_mcast_from_client_data_ifindex(struct d6_packet *packet, uint8_t *
  * about parameter values the client would like to have returned.
  */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE int send_d6_info_request(uint32_t xid)
+static NOINLINE int send_d6_info_request(void)
 {
         struct d6_packet packet;
         uint8_t *opt_ptr;
 
-        /* Fill in: msg type */
-        opt_ptr = init_d6_packet(&packet, D6_MSG_INFORMATION_REQUEST, xid);
+        /* Fill in: msg type, xid, ELAPSED_TIME */
+        opt_ptr = init_d6_packet(&packet, D6_MSG_INFORMATION_REQUEST);
 
         /* Add options: client-id,
          * "param req" option according to -O, options specified with -x
@@ -684,14 +684,14 @@ static NOINLINE int send_d6_info_request(uint32_t xid)
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE int send_d6_discover(uint32_t xid, struct in6_addr *requested_ipv6)
+static NOINLINE int send_d6_discover(struct in6_addr *requested_ipv6)
 {
         struct d6_packet packet;
         uint8_t *opt_ptr;
         unsigned len;
 
-        /* Fill in: msg type */
-        opt_ptr = init_d6_packet(&packet, D6_MSG_SOLICIT, xid);
+        /* Fill in: msg type, xid, ELAPSED_TIME */
+        opt_ptr = init_d6_packet(&packet, D6_MSG_SOLICIT);
 
         /* Create new IA_NA, optionally with included IAADDR with requested IP */
         free(client6_data.ia_na);
@@ -763,13 +763,13 @@ static NOINLINE int send_d6_discover(uint32_t xid, struct in6_addr *requested_ip
  * messages from the server.
  */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE int send_d6_select(uint32_t xid)
+static NOINLINE int send_d6_select(void)
 {
         struct d6_packet packet;
         uint8_t *opt_ptr;
 
-        /* Fill in: msg type */
-        opt_ptr = init_d6_packet(&packet, D6_MSG_REQUEST, xid);
+        /* Fill in: msg type, xid, ELAPSED_TIME */
+        opt_ptr = init_d6_packet(&packet, D6_MSG_REQUEST);
 
         /* server id */
         opt_ptr = mempcpy(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2);
@@ -836,13 +836,13 @@ static NOINLINE int send_d6_select(uint32_t xid)
  * about parameter values the client would like to have returned.
  */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE int send_d6_renew(uint32_t xid, struct in6_addr *server_ipv6, struct in6_addr *our_cur_ipv6)
+static NOINLINE int send_d6_renew(struct in6_addr *server_ipv6, struct in6_addr *our_cur_ipv6)
 {
         struct d6_packet packet;
         uint8_t *opt_ptr;
 
-        /* Fill in: msg type */
-        opt_ptr = init_d6_packet(&packet, DHCPREQUEST, xid);
+        /* Fill in: msg type, xid, ELAPSED_TIME */
+        opt_ptr = init_d6_packet(&packet, DHCPREQUEST);
 
         /* server id */
         opt_ptr = mempcpy(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2);
@@ -877,8 +877,8 @@ int send_d6_release(struct in6_addr *server_ipv6, struct in6_addr *our_cur_ipv6)
         uint8_t *opt_ptr;
         struct option_set *ci;
 
-        /* Fill in: msg type, client id */
-        opt_ptr = init_d6_packet(&packet, D6_MSG_RELEASE, random_xid());
+        /* Fill in: msg type, xid, ELAPSED_TIME */
+        opt_ptr = init_d6_packet(&packet, D6_MSG_RELEASE);
         /* server id */
         opt_ptr = mempcpy(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2);
         /* IA NA (contains our current IP) */
@@ -1097,6 +1097,7 @@ static void perform_d6_release(struct in6_addr *server_ipv6, struct in6_addr *ou
          || client_data.state == RENEW_REQUESTED
         ) {
                 bb_simple_info_msg("unicasting a release");
+                client_data.xid = random_xid(); //TODO: can omit?
                 send_d6_release(server_ipv6, our_cur_ipv6); /* unicast */
         }
         bb_simple_info_msg("entering released state");
@@ -1126,23 +1127,23 @@ static void client_background(void)
 //usage:# define IF_UDHCP_VERBOSE(...)
 //usage:#endif
 //usage:#define udhcpc6_trivial_usage
-//usage:       "[-fbnq"IF_UDHCP_VERBOSE("v")"odR] [-i IFACE] [-r IPv6] [-s PROG] [-p PIDFILE]\n"
-//usage:       "        [-x OPT:VAL]... [-O OPT]..." IF_FEATURE_UDHCP_PORT(" [-P PORT]")
+//usage:       "[-fbq"IF_UDHCP_VERBOSE("v")"R] [-t N] [-T SEC] [-A SEC|-n] [-i IFACE] [-s PROG]\n"
+//usage:       "        [-p PIDFILE]"IF_FEATURE_UDHCP_PORT(" [-P PORT]")" [-ldo] [-r IPv6] [-x OPT:VAL]... [-O OPT]..."
 //usage:#define udhcpc6_full_usage "\n"
 //usage:     "\n        -i IFACE        Interface to use (default "CONFIG_UDHCPC_DEFAULT_INTERFACE")"
 //usage:     "\n        -p FILE         Create pidfile"
 //usage:     "\n        -s PROG         Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
 //usage:     "\n        -B              Request broadcast replies"
 //usage:     "\n        -t N            Send up to N discover packets"
-//usage:     "\n        -T N            Pause between packets (default 3 seconds)"
-//usage:     "\n        -A N            Wait N seconds (default 20) after failure"
-//usage:     "\n        -f              Run in foreground"
+//usage:     "\n        -T SEC          Pause between packets (default 3)"
+//usage:     "\n        -A SEC          Wait if lease is not obtained (default 20)"
 //usage:        USE_FOR_MMU(
 //usage:     "\n        -b              Background if lease is not obtained"
 //usage:        )
 //usage:     "\n        -n              Exit if lease is not obtained"
 //usage:     "\n        -q              Exit after obtaining lease"
 //usage:     "\n        -R              Release IP on exit"
+//usage:     "\n        -f              Run in foreground"
 //usage:     "\n        -S              Log to syslog too"
 //usage:        IF_FEATURE_UDHCP_PORT(
 //usage:     "\n        -P PORT         Use PORT (default 546)"
@@ -1150,12 +1151,12 @@ static void client_background(void)
 ////usage:      IF_FEATURE_UDHCPC_ARPING(
 ////usage:     "\n      -a              Use arping to validate offered address"
 ////usage:      )
-//usage:     "\n        -O OPT          Request option OPT from server (cumulative)"
-//usage:     "\n        -o              Don't request any options (unless -O is given)"
-//usage:     "\n        -r IPv6         Request this address ('no' to not request any IP)"
-//usage:     "\n        -d              Request prefix"
 //usage:     "\n        -l              Send 'information request' instead of 'solicit'"
 //usage:     "\n                        (used for servers which do not assign IPv6 addresses)"
+//usage:     "\n        -r IPv6         Request this address ('no' to not request any IP)"
+//usage:     "\n        -d              Request prefix"
+//usage:     "\n        -o              Don't request any options (unless -O is given)"
+//usage:     "\n        -O OPT          Request option OPT from server (cumulative)"
 //usage:     "\n        -x OPT:VAL      Include option OPT in sent packets (cumulative)"
 //usage:     "\n                        Examples of string, numeric, and hex byte opts:"
 //usage:     "\n                        -x hostname:bbox - option 12"
@@ -1183,7 +1184,6 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         struct in6_addr srv6_buf;
         struct in6_addr ipv6_buf;
         struct in6_addr *requested_ipv6;
-        uint32_t xid = 0;
         int packet_num;
         int timeout; /* must be signed */
         int lease_remaining; /* must be signed */
@@ -1387,13 +1387,13 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                 if (!discover_retries || packet_num < discover_retries) {
                                         if (packet_num == 0) {
                                                 change_listen_mode(LISTEN_RAW);
-                                                xid = random_xid();
+                                                client_data.xid = random_xid();
                                         }
                                         /* multicast */
                                         if (opt & OPT_l)
-                                                send_d6_info_request(xid);
+                                                send_d6_info_request();
                                         else
-                                                send_d6_discover(xid, requested_ipv6);
+                                                send_d6_discover(requested_ipv6);
                                         timeout = discover_timeout;
                                         packet_num++;
                                         continue;
@@ -1427,7 +1427,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                         case REQUESTING:
                                 if (!discover_retries || packet_num < discover_retries) {
                                         /* send multicast select packet */
-                                        send_d6_select(xid);
+                                        send_d6_select();
                                         timeout = discover_timeout;
                                         packet_num++;
                                         continue;
@@ -1459,9 +1459,9 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                          * into INIT_SELECTING state.
                          */
                                         if (opt & OPT_l)
-                                                send_d6_info_request(xid);
+                                                send_d6_info_request();
                                         else
-                                                send_d6_renew(xid, &srv6_buf, requested_ipv6);
+                                                send_d6_renew(&srv6_buf, requested_ipv6);
                                         timeout = discover_timeout;
                                         packet_num++;
                                         continue;
@@ -1484,9 +1484,9 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                  * try to find DHCP server using broadcast */
                                 if (lease_remaining > 0 && packet_num < 3) {
                                         if (opt & OPT_l)
-                                                send_d6_info_request(xid);
+                                                send_d6_info_request();
                                         else /* send a broadcast renew request */
-                                                send_d6_renew(xid, /*server_ipv6:*/ NULL, requested_ipv6);
+                                                send_d6_renew(/*server_ipv6:*/ NULL, requested_ipv6);
                                         timeout = discover_timeout;
                                         packet_num++;
                                         continue;
@@ -1581,9 +1581,9 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                         packet_end = (uint8_t*)&packet + len;
                 }
 
-                if ((packet.d6_xid32 & htonl(0x00ffffff)) != xid) {
+                if ((packet.d6_xid32 & htonl(0x00ffffff)) != client_data.xid) {
                         log1("xid %x (our is %x)%s",
-                                (unsigned)(packet.d6_xid32 & htonl(0x00ffffff)), (unsigned)xid,
+                                (unsigned)(packet.d6_xid32 & htonl(0x00ffffff)), (unsigned)client_data.xid,
                                 ", ignoring packet"
                         );
                         continue;
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 4e3d8ca5e..331f13a8c 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -605,7 +605,7 @@ static void init_packet(struct dhcp_packet *packet, char type)
         /* Fill in: op, htype, hlen, cookie fields; message type option: */
         udhcp_init_header(packet, type);
 
-        packet->xid = random_xid();
+        packet->xid = client_data.xid;
 
         client_data.last_secs = monotonic_sec();
         if (client_data.first_secs == 0)
@@ -663,6 +663,24 @@ static void add_client_options(struct dhcp_packet *packet)
         //      ...add (DHCP_VENDOR, "udhcp "BB_VER) opt...
 }
 
+static void add_serverid_and_clientid_options(struct dhcp_packet *packet, uint32_t server)
+{
+        struct option_set *ci;
+
+        udhcp_add_simple_option(packet, DHCP_SERVER_ID, server);
+
+        /* RFC 2131 section 2:
+         * If the client uses a 'client identifier' in one message,
+         * it MUST use that same identifier in all subsequent messages.
+         * section 3.1.6:
+         * If the client used a 'client identifier' when it obtained the lease,
+         * it MUST use the same 'client identifier' in the DHCPRELEASE message.
+         */
+        ci = udhcp_find_option(client_data.options, DHCP_CLIENT_ID);
+        if (ci)
+                udhcp_add_binary_option(packet, ci->data);
+}
+
 /* RFC 2131
  * 4.4.4 Use of broadcast and unicast
  *
@@ -701,17 +719,15 @@ static int bcast_or_ucast(struct dhcp_packet *packet, uint32_t ciaddr, uint32_t
 
 /* Broadcast a DHCP discover packet to the network, with an optionally requested IP */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
+static NOINLINE int send_discover(uint32_t requested)
 {
         struct dhcp_packet packet;
 
         /* Fill in: op, htype, hlen, cookie, chaddr fields,
-         * random xid field (we override it below),
-         * message type option:
+         * xid field, message type option:
          */
         init_packet(&packet, DHCPDISCOVER);
 
-        packet.xid = xid;
         if (requested)
                 udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
 
@@ -729,7 +745,7 @@ static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
  * "The client _broadcasts_ a DHCPREQUEST message..."
  */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE int send_select(uint32_t xid, uint32_t server, uint32_t requested)
+static NOINLINE int send_select(uint32_t server, uint32_t requested)
 {
         struct dhcp_packet packet;
         struct in_addr temp_addr;
@@ -748,18 +764,16 @@ static NOINLINE int send_select(uint32_t xid, uint32_t server, uint32_t requeste
  * include that list in all subsequent messages.
  */
         /* Fill in: op, htype, hlen, cookie, chaddr fields,
-         * random xid field (we override it below),
-         * message type option:
+         * xid field, message type option:
          */
         init_packet(&packet, DHCPREQUEST);
 
-        packet.xid = xid;
         udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
 
         udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
 
         /* Add options: maxsize,
-         * "param req" option according to -O, and options specified with -x
+         * "param req" option according to -O, options specified with -x
          */
         add_client_options(&packet);
 
@@ -775,7 +789,7 @@ static NOINLINE int send_select(uint32_t xid, uint32_t server, uint32_t requeste
 
 /* Unicast or broadcast a DHCP renew message */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr)
+static NOINLINE int send_renew(uint32_t server, uint32_t ciaddr)
 {
         struct dhcp_packet packet;
 
@@ -794,16 +808,14 @@ static NOINLINE int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr)
  * replying to the client.
  */
         /* Fill in: op, htype, hlen, cookie, chaddr fields,
-         * random xid field (we override it below),
-         * message type option:
+         * xid field, message type option:
          */
         init_packet(&packet, DHCPREQUEST);
 
-        packet.xid = xid;
         packet.ciaddr = ciaddr;
 
         /* Add options: maxsize,
-         * "param req" option according to -O, and options specified with -x
+         * "param req" option according to -O, options specified with -x
          */
         add_client_options(&packet);
 
@@ -821,7 +833,7 @@ static NOINLINE int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr)
 #if ENABLE_FEATURE_UDHCPC_ARPING
 /* Broadcast a DHCP decline message */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE int send_decline(/*uint32_t xid,*/ uint32_t server, uint32_t requested)
+static NOINLINE int send_decline(uint32_t server, uint32_t requested)
 {
         struct dhcp_packet packet;
 
@@ -830,20 +842,10 @@ static NOINLINE int send_decline(/*uint32_t xid,*/ uint32_t server, uint32_t req
          */
         init_packet(&packet, DHCPDECLINE);
 
-#if 0
-        /* RFC 2131 says DHCPDECLINE's xid is randomly selected by client,
-         * but in case the server is buggy and wants DHCPDECLINE's xid
-         * to match the xid which started entire handshake,
-         * we use the same xid we used in initial DHCPDISCOVER:
-         */
-        packet.xid = xid;
-#endif
         /* DHCPDECLINE uses "requested ip", not ciaddr, to store offered IP */
         udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
 
-        udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
-
-//TODO: add client-id opt?
+        add_serverid_and_clientid_options(&packet, server);
 
         bb_simple_info_msg("broadcasting decline");
         return raw_bcast_from_client_data_ifindex(&packet, INADDR_ANY);
@@ -856,7 +858,6 @@ ALWAYS_INLINE /* one caller, help compiler to use this fact */
 int send_release(uint32_t server, uint32_t ciaddr)
 {
         struct dhcp_packet packet;
-        struct option_set *ci;
 
         /* Fill in: op, htype, hlen, cookie, chaddr, random xid fields,
          * message type option:
@@ -866,15 +867,7 @@ int send_release(uint32_t server, uint32_t ciaddr)
         /* DHCPRELEASE uses ciaddr, not "requested ip", to store IP being released */
         packet.ciaddr = ciaddr;
 
-        udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
-
-        /* RFC 2131 section 3.1.6:
-         * If the client used a 'client identifier' when it obtained the lease,
-         * it MUST use the same 'client identifier' in the DHCPRELEASE message.
-         */
-        ci = udhcp_find_option(client_data.options, DHCP_CLIENT_ID);
-        if (ci)
-                udhcp_add_binary_option(&packet, ci->data);
+        add_serverid_and_clientid_options(&packet, server);
 
         bb_info_msg("sending %s", "release");
         /* Note: normally we unicast here since "server" is not zero.
@@ -1120,7 +1113,7 @@ static void change_listen_mode(int new_mode)
         /* else LISTEN_NONE: client_data.sockfd stays closed */
 }
 
-static void perform_release(uint32_t server_addr, uint32_t requested_ip)
+static void perform_release(uint32_t server_id, uint32_t requested_ip)
 {
         char buffer[sizeof("255.255.255.255")];
         struct in_addr temp_addr;
@@ -1133,12 +1126,13 @@ static void perform_release(uint32_t server_addr, uint32_t requested_ip)
          || client_data.state == REBINDING
          || client_data.state == RENEW_REQUESTED
         ) {
-                temp_addr.s_addr = server_addr;
+                temp_addr.s_addr = server_id;
                 strcpy(buffer, inet_ntoa(temp_addr));
                 temp_addr.s_addr = requested_ip;
                 bb_info_msg("unicasting a release of %s to %s",
                                 inet_ntoa(temp_addr), buffer);
-                send_release(server_addr, requested_ip); /* unicast */
+                client_data.xid = random_xid(); //TODO: can omit?
+                send_release(server_id, requested_ip); /* unicast */
         }
         bb_simple_info_msg("entering released state");
 /*
@@ -1167,7 +1161,7 @@ static void client_background(void)
 //usage:# define IF_UDHCP_VERBOSE(...)
 //usage:#endif
 //usage:#define udhcpc_trivial_usage
-//usage:       "[-fbq"IF_UDHCP_VERBOSE("v")"RB]"IF_FEATURE_UDHCPC_ARPING(" [-a[MSEC]]")" [-t N] [-T SEC] [-A SEC/-n]\n"
+//usage:       "[-fbq"IF_UDHCP_VERBOSE("v")"RB]"IF_FEATURE_UDHCPC_ARPING(" [-a[MSEC]]")" [-t N] [-T SEC] [-A SEC|-n]\n"
 //usage:       "        [-i IFACE]"IF_FEATURE_UDHCP_PORT(" [-P PORT]")" [-s PROG] [-p PIDFILE]\n"
 //usage:       "        [-oC] [-r IP] [-V VENDOR] [-F NAME] [-x OPT:VAL]... [-O OPT]..."
 //usage:#define udhcpc_full_usage "\n"
@@ -1224,9 +1218,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
         int tryagain_timeout = 20;
         int discover_timeout = 3;
         int discover_retries = 3;
-        uint32_t server_addr = server_addr; /* for compiler */
+        uint32_t server_id = server_id; /* for compiler */
         uint32_t requested_ip = 0;
-        uint32_t xid = xid; /* for compiler */
         int packet_num;
         int timeout; /* must be signed */
         int lease_remaining; /* must be signed */
@@ -1291,7 +1284,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 memcpy(p + OPT_DATA + 3, str_F, len); /* do not store NUL byte */
         }
         if (opt & OPT_r)
-                requested_ip = inet_addr(str_r);
+                if (!inet_aton(str_r, (void*)&requested_ip))
+                        bb_show_usage();
 #if ENABLE_FEATURE_UDHCP_PORT
         if (opt & OPT_P) {
                 CLIENT_PORT = xatou16(str_P);
@@ -1451,10 +1445,10 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 if (!discover_retries || packet_num < discover_retries) {
                                         if (packet_num == 0) {
                                                 change_listen_mode(LISTEN_RAW);
-                                                xid = random_xid();
+                                                client_data.xid = random_xid();
                                         }
                                         /* broadcast */
-                                        send_discover(xid, requested_ip);
+                                        send_discover(requested_ip);
                                         timeout = discover_timeout;
                                         packet_num++;
                                         continue;
@@ -1488,7 +1482,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                         case REQUESTING:
                                 if (packet_num < 3) {
                                         /* send broadcast select packet */
-                                        send_select(xid, server_addr, requested_ip);
+                                        send_select(server_id, requested_ip);
                                         timeout = discover_timeout;
                                         packet_num++;
                                         continue;
@@ -1519,7 +1513,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                          * Anyway, it does recover by eventually failing through
                          * into INIT_SELECTING state.
                          */
-                                        if (send_renew(xid, server_addr, requested_ip) >= 0) {
+                                        if (send_renew(server_id, requested_ip) >= 0) {
                                                 timeout = discover_timeout;
                                                 packet_num++;
                                                 continue;
@@ -1548,7 +1542,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                  * try to find DHCP server using broadcast */
                                 if (lease_remaining > 0 && packet_num < 3) {
                                         /* send a broadcast renew request */
-                                        send_renew(xid, 0 /*INADDR_ANY*/, requested_ip);
+                                        send_renew(0 /*INADDR_ANY*/, requested_ip);
                                         timeout = discover_timeout;
                                         packet_num++;
                                         continue;
@@ -1610,7 +1604,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                         timeout = 0;
                         continue;
                 case SIGUSR2:
-                        perform_release(server_addr, requested_ip);
+                        perform_release(server_id, requested_ip);
                         /* ^^^ switches to LISTEN_NONE */
                         timeout = INT_MAX;
                         continue;
@@ -1641,9 +1635,9 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 continue;
                 }
 
-                if (packet.xid != xid) {
+                if (packet.xid != client_data.xid) {
                         log1("xid %x (our is %x)%s",
-                                (unsigned)packet.xid, (unsigned)xid,
+                                (unsigned)packet.xid, (unsigned)client_data.xid,
                                 ", ignoring packet"
                         );
                         continue;
@@ -1695,13 +1689,13 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
  * They either supply DHCP_SERVER_ID of 0.0.0.0 or don't supply it at all.
  * They say ISC DHCP client supports this case.
  */
-                                server_addr = 0;
+                                server_id = 0;
                                 temp = udhcp_get_option32(&packet, DHCP_SERVER_ID);
                                 if (!temp) {
                                         bb_simple_info_msg("no server ID, using 0.0.0.0");
                                 } else {
                                         /* it IS unaligned sometimes, don't "optimize" */
-                                        move_from_unaligned32(server_addr, temp);
+                                        move_from_unaligned32(server_id, temp);
                                 }
                                 /*xid = packet.xid; - already is */
                                 temp_addr.s_addr = requested_ip = packet.yiaddr;
@@ -1725,7 +1719,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 
                                 change_listen_mode(LISTEN_NONE);
 
-                                temp_addr.s_addr = server_addr;
+                                temp_addr.s_addr = server_id;
                                 strcpy(server_str, inet_ntoa(temp_addr));
                                 temp_addr.s_addr = packet.yiaddr;
 
@@ -1772,7 +1766,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                         ) {
                                                 bb_simple_info_msg("offered address is in use "
                                                         "(got ARP reply), declining");
-                                                send_decline(/*xid,*/ server_addr, packet.yiaddr);
+                                                client_data.xid = random_xid(); //TODO: can omit?
+                                                send_decline(server_id, packet.yiaddr);
 
                                                 if (client_data.state != REQUESTING)
                                                         d4_run_script_deconfig();
@@ -1807,7 +1802,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 timeout = (unsigned)lease_remaining / 2;
                                 client_data.state = BOUND;
                                 /* make future renew packets use different xid */
-                                /* xid = random_xid(); ...but why bother? */
+                                /* client_data.xid = random_xid(); ...but why bother? */
                                 packet_num = 0;
                                 continue; /* back to main loop */
                         }
@@ -1816,20 +1811,14 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                  * "wrong" server can reply first, with a NAK.
                                  * Do not interpret it as a NAK from "our" server.
                                  */
-                                if (server_addr != 0) {
-                                        uint32_t svid;
-                                        uint8_t *temp;
-
-                                        temp = udhcp_get_option32(&packet, DHCP_SERVER_ID);
-                                        if (!temp) {
- non_matching_svid:
-                                                log1("received DHCP NAK with wrong"
-                                                        " server ID%s", ", ignoring packet");
-                                                continue;
-                                        }
+                                uint32_t svid = 0; /* we treat no server id as 0.0.0.0 */
+                                uint8_t *temp = udhcp_get_option32(&packet, DHCP_SERVER_ID);
+                                if (temp)
                                         move_from_unaligned32(svid, temp);
-                                        if (svid != server_addr)
-                                                goto non_matching_svid;
+                                if (svid != server_id) {
+                                        log1("received DHCP NAK with wrong"
+                                                " server ID%s", ", ignoring packet");
+                                        continue;
                                 }
                                 /* return to init state */
                                 change_listen_mode(LISTEN_NONE);
@@ -1853,7 +1842,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 
  ret0:
         if (opt & OPT_R) /* release on quit */
-                perform_release(server_addr, requested_ip);
+                perform_release(server_id, requested_ip);
         retval = 0;
  ret:
         /*if (client_data.pidfile) - remove_pidfile has its own check */
diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h
index cd9ead6bd..19b054b32 100644
--- a/networking/udhcp/dhcpc.h
+++ b/networking/udhcp/dhcpc.h
@@ -11,6 +11,7 @@ struct client_data_t {
         uint8_t client_mac[6];          /* Our mac address */
         IF_FEATURE_UDHCP_PORT(uint16_t port;)
         int ifindex;                    /* Index number of the interface to use */
+        uint32_t xid;
         uint8_t opt_mask[256 / 8];      /* Bitmask of options to send (-O option) */
 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TODO: DHCPv6 has 16-bit option numbers
         const char *interface;          /* The name of the interface to use */
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 4f1fbe280..7e805be9c 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -20,12 +20,12 @@
 //usage:       "COMMAND [OPTIONS]"
 //usage:#define vconfig_full_usage "\n\n"
 //usage:       "Create and remove virtual ethernet devices\n"
-//usage:     "\n        add             IFACE VLAN_ID"
-//usage:     "\n        rem             VLAN_NAME"
-//usage:     "\n        set_flag        IFACE 0|1 VLAN_QOS"
-//usage:     "\n        set_egress_map  VLAN_NAME SKB_PRIO VLAN_QOS"
-//usage:     "\n        set_ingress_map VLAN_NAME SKB_PRIO VLAN_QOS"
-//usage:     "\n        set_name_type   NAME_TYPE"
+//usage:     "\n        add IFACE VLAN_ID"
+//usage:     "\n        rem VLAN_NAME"
+//usage:     "\n        set_flag IFACE 0|1 VLAN_QOS"
+//usage:     "\n        set_egress_map VLAN_NAME SKB_PRIO VLAN_QOS"
+//usage:     "\n        set_ingress_map VLAN_NAME SKB_PRIO VLAN_QOS"
+//usage:     "\n        set_name_type NAME_TYPE"
 
 #include "libbb.h"
 #include <net/if.h>
diff --git a/procps/free.c b/procps/free.c
index 142786083..f19c38dd5 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -19,9 +19,9 @@
 //kbuild:lib-$(CONFIG_FREE) += free.o
 
 //usage:#define free_trivial_usage
-//usage:       "" IF_DESKTOP("[-b/k/m/g]")
+//usage:       "" IF_DESKTOP("[-bkmgh]")
 //usage:#define free_full_usage "\n\n"
-//usage:       "Display the amount of free and used system memory"
+//usage:       "Display free and used memory"
 //usage:
 //usage:#define free_example_usage
 //usage:       "$ free\n"
@@ -29,6 +29,27 @@
 //usage:       "  Mem:       257628       248724         8904        59644        93124\n"
 //usage:       " Swap:       128516         8404       120112\n"
 //usage:       "Total:       386144       257128       129016\n"
+//procps-ng 3.3.15:
+// -b, --bytes         show output in bytes
+//     --kilo          show output in kilobytes
+//     --mega          show output in megabytes
+//     --giga          show output in gigabytes
+//     --tera          show output in terabytes
+//     --peta          show output in petabytes
+// -k, --kibi          show output in kibibytes
+// -m, --mebi          show output in mebibytes
+// -g, --gibi          show output in gibibytes
+//     --tebi          show output in tebibytes
+//     --pebi          show output in pebibytes
+// -h, --human         show human-readable output
+//     --si            use powers of 1000 not 1024
+// -l, --lohi          show detailed low and high memory statistics
+// -t, --total         show total for RAM + swap
+// -s N, --seconds N   repeat printing every N seconds
+// -c N, --count N     repeat printing N times, then exit
+// -w, --wide          wide output
+//
+//NB: if we implement -s or -c, need to stop being NOFORK!
 
 #include "libbb.h"
 #ifdef __linux__
@@ -38,18 +59,22 @@
 struct globals {
         unsigned mem_unit;
 #if ENABLE_DESKTOP
-        uint8_t unit_steps;
-# define G_unit_steps g->unit_steps
+        unsigned unit;
+# define G_unit g->unit
 #else
-# define G_unit_steps 10
+# define G_unit (1 << 10)
 #endif
         unsigned long cached_kb, available_kb, reclaimable_kb;
 };
 /* Because of NOFORK, "globals" are not in global data */
 
-static unsigned long long scale(struct globals *g, unsigned long d)
+static const char *scale(struct globals *g, unsigned long d)
 {
-        return ((unsigned long long)d * g->mem_unit) >> G_unit_steps;
+        /* Display (size * block_size) with one decimal digit.
+         * If display_unit == 0, show value no bigger than 1024 with suffix (K,M,G...),
+         * else divide by display_unit and do not use suffix.
+         * Returns "auto pointer" */
+        return make_human_readable_str(d, g->mem_unit, G_unit);
 }
 
 #if !ENABLE_PLATFORM_MINGW32
@@ -97,20 +122,27 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
         int seen_available;
 
 #if ENABLE_DESKTOP
-        G.unit_steps = 10;
+        G.unit = 1 << 10;
         if (argv[1] && argv[1][0] == '-') {
                 switch (argv[1][1]) {
                 case 'b':
-                        G.unit_steps = 0;
+                        G.unit = 1;
                         break;
                 case 'k': /* 2^10 */
-                        /* G.unit_steps = 10; - already is */
+                        /* G.unit = 1 << 10; - already is */
                         break;
                 case 'm': /* 2^20 */
-                        G.unit_steps = 20;
+                        G.unit = 1 << 20;
                         break;
                 case 'g': /* 2^30 */
-                        G.unit_steps = 30;
+                        G.unit = 1 << 30;
+                        break;
+//              case 't':
+// -- WRONG, -t is not "terabytes" in procps-ng, it's --total
+//                      G.unit = 1 << 40;
+//                      break;
+                case 'h':
+                        G.unit = 0; /* human readable */
                         break;
                 default:
                         bb_show_usage();
@@ -135,29 +167,13 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
         cached += ((unsigned long long) G.reclaimable_kb * 1024) / G.mem_unit;
         cached_plus_free = cached + info.freeram;
 
-/* In case (long long * G.mem_unit) can overflow, this can be used to reduce the chances */
-#if 0 //ENABLE_DESKTOP
-        while (!(G.mem_unit & 1) && G.unit_steps != 0) {
-                G.mem_unit >>= 1;
-                G.unit_steps--;
-                //bb_error_msg("mem_unit:%d unit_steps:%d", G.mem_unit, G.unit_steps);
-        }
-#endif
-
-#if !ENABLE_PLATFORM_MINGW32
-#define FIELDS_6 "%12llu %11llu %11llu %11llu %11llu %11llu\n"
-#define FIELDS_3 (FIELDS_6 + 6 + 7 + 7)
-#define FIELDS_2 (FIELDS_6 + 6 + 7 + 7 + 7)
-#else
-#define FIELDS_6 "%12I64u %11I64u %11I64u %11I64u %11I64u %11I64u\n"
-#define FIELDS_3 (FIELDS_6 + 7 + 8 + 8)
-#define FIELDS_2 (FIELDS_6 + 8 + 8 + 8 + 8)
-#endif
-
-        printf(FIELDS_6,
+        printf("%12s%12s%12s",
                 scale(&G, info.totalram),                //total
                 scale(&G, info.totalram - cached_plus_free), //used
-                scale(&G, info.freeram),                 //free
+                scale(&G, info.freeram)                  //free
+        );
+        /* using two printf's: only 4 auto strings are supported, we need 6 */
+        printf("%12s%12s%12s\n",
                 scale(&G, info.sharedram),               //shared
                 scale(&G, cached),                       //buff/cache
                 scale(&G, available)                     //available
@@ -167,14 +183,14 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
          * buffer cache as free memory. */
         if (!seen_available) {
                 printf("-/+ buffers/cache: ");
-                printf(FIELDS_2,
+                printf("%12s%12s%12s\n" + 4,
                         scale(&G, info.totalram - cached_plus_free), //used
                         scale(&G, cached_plus_free)                  //free
                 );
         }
 #if BB_MMU
         printf("Swap:  ");
-        printf(FIELDS_3,
+        printf("%12s%12s%12s\n",
                 scale(&G, info.totalswap),                 //total
                 scale(&G, info.totalswap - info.freeswap), //used
                 scale(&G, info.freeswap)                   //free
diff --git a/procps/kill.c b/procps/kill.c
index 358d8f42b..8c2bc2b6f 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -59,7 +59,7 @@
 //usage:       "$ kill 252\n"
 //usage:
 //usage:#define killall_trivial_usage
-//usage:       "[-l] [-q] [-SIG] PROCESS_NAME..."
+//usage:       "[-lq] [-SIG] PROCESS_NAME..."
 //usage:#define killall_full_usage "\n\n"
 //usage:       "Send a signal (default: TERM) to given processes\n"
 //usage:     "\n        -l      List all signal names and numbers"
diff --git a/procps/lsof.c b/procps/lsof.c
index 21ac85ed3..9cb8d066c 100644
--- a/procps/lsof.c
+++ b/procps/lsof.c
@@ -66,7 +66,7 @@ int lsof_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 
                                 safe_strncpy(name + baseofs, entry->d_name, 10);
                                 if ((fdlink = xmalloc_readlink(name)) != NULL) {
-                                        printf("%d\t%s\t%s\n", proc->pid, proc->exe, fdlink);
+                                        printf("%d\t%s\t%s\t%s\n", proc->pid, proc->exe, entry->d_name, fdlink);
                                         free(fdlink);
                                 }
                         }
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 495e0ef9d..6d25c247e 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -44,17 +44,17 @@
 //usage:     "\n        -P      Match parent process ID"
 //usage:
 //usage:#define pkill_trivial_usage
-//usage:       "[-l|-SIGNAL] [-fnovx] [-s SID|-P PPID|PATTERN]"
+//usage:       "[-l|-SIGNAL] [-xfvno] [-s SID|-P PPID|PATTERN]"
 //usage:#define pkill_full_usage "\n\n"
-//usage:       "Send a signal to process(es) selected by regex PATTERN\n"
+//usage:       "Send signal to processes selected by regex PATTERN\n"
 //usage:     "\n        -l      List all signals"
+//usage:     "\n        -x      Match whole name (not substring)"
 //usage:     "\n        -f      Match against entire command line"
+//usage:     "\n        -s SID  Match session ID (0 for current)"
+//usage:     "\n        -P PPID Match parent process ID"
+//usage:     "\n        -v      Negate the match"
 //usage:     "\n        -n      Signal the newest process only"
 //usage:     "\n        -o      Signal the oldest process only"
-//usage:     "\n        -v      Negate the match"
-//usage:     "\n        -x      Match whole name (not substring)"
-//usage:     "\n        -s      Match session ID (0 for current)"
-//usage:     "\n        -P      Match parent process ID"
 
 #include "libbb.h"
 #include "xregex.h"
diff --git a/procps/sysctl.c b/procps/sysctl.c
index e16b119e9..40afa0c90 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -21,16 +21,16 @@
 //kbuild:lib-$(CONFIG_BB_SYSCTL) += sysctl.o
 
 //usage:#define sysctl_trivial_usage
-//usage:       "-p [-enq] [FILE...] / [-enqaw] [KEY[=VALUE]]..."
+//usage:       "[-enq] { -a | -p [FILE]... | [-w] [KEY[=VALUE]]... }"
 //usage:#define sysctl_full_usage "\n\n"
 //usage:       "Show/set kernel parameters\n"
-//usage:     "\n        -p      Set values from FILEs (default /etc/sysctl.conf)"
 //usage:     "\n        -e      Don't warn about unknown keys"
 //usage:     "\n        -n      Don't show key names"
 //usage:     "\n        -q      Quiet"
 //usage:     "\n        -a      Show all values"
 /* Same as -a, no need to show it */
 /* //usage:     "\n     -A      Show all values in table form" */
+//usage:     "\n        -p      Set values from FILEs (default /etc/sysctl.conf)"
 //usage:     "\n        -w      Set values"
 //usage:
 //usage:#define sysctl_example_usage
diff --git a/procps/top.c b/procps/top.c
index cadc4ecec..4cd545c69 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -1052,9 +1052,9 @@ static unsigned handle_input(unsigned scan_mask, duration_t interval)
 //usage:       "[-b"IF_FEATURE_TOPMEM("m")IF_FEATURE_SHOW_THREADS("H")"]"
 //usage:       " [-n COUNT] [-d SECONDS]"
 //usage:#define top_full_usage "\n\n"
-//usage:       "Provide a view of process activity in real time."
+//usage:       "Show a view of process activity in real time."
 //usage:   "\n""Read the status of all processes from /proc each SECONDS"
-//usage:   "\n""and display a screenful of them."
+//usage:   "\n""and show a screenful of them."
 //usage:   "\n"
 //usage:        IF_FEATURE_TOP_INTERACTIVE(
 //usage:       "Keys:"
diff --git a/procps/watch.c b/procps/watch.c
index 059eb1dda..1190b29df 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -22,7 +22,7 @@
 //usage:       "[-n SEC] [-t] PROG ARGS"
 //usage:#define watch_full_usage "\n\n"
 //usage:       "Run PROG periodically\n"
-//usage:     "\n        -n SEC  Loop period (default 2)"
+//usage:     "\n        -n SEC  Period (default 2)"
 //usage:     "\n        -t      Don't print header"
 //usage:
 //usage:#define watch_example_usage
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 02c305696..f7576f0fa 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -140,12 +140,12 @@ log message, you can use a pattern like this instead
 //usage:#define svlogd_full_usage "\n\n"
 //usage:       "Read log data from stdin and write to rotated log files in DIRs"
 //usage:   "\n"
-//usage:   "\n""-r C            Replace non-printable characters with C"
-//usage:   "\n""-R CHARS        Also replace CHARS with C (default _)"
-//usage:   "\n""-t              Timestamp with @tai64n"
-//usage:   "\n""-tt             Timestamp with yyyy-mm-dd_hh:mm:ss.sssss"
-//usage:   "\n""-ttt            Timestamp with yyyy-mm-ddThh:mm:ss.sssss"
-//usage:   "\n""-v              Verbose"
+//usage:   "\n""        -r C    Replace non-printable characters with C"
+//usage:   "\n""        -R CHARS Also replace CHARS with C (default _)"
+//usage:   "\n""        -t      Timestamp with @tai64n"
+//usage:   "\n""        -tt     Timestamp with yyyy-mm-dd_hh:mm:ss.sssss"
+//usage:   "\n""        -ttt    Timestamp with yyyy-mm-ddThh:mm:ss.sssss"
+//usage:   "\n""        -v      Verbose"
 //usage:   "\n"
 //usage:   "\n""DIR/config file modifies behavior:"
 //usage:   "\n""sSIZE - when to rotate logs (default 1000000, 0 disables)"
diff --git a/shell/ash.c b/shell/ash.c
index bab6138da..4ae42595d 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13572,7 +13572,7 @@ parsesub: {
                         do {
                                 STPUTC(c, out);
                                 c = pgetc_eatbnl();
-                        } while (!subtype && isdigit(c));
+                        } while ((subtype == 0 || subtype == VSLENGTH) && isdigit(c));
                 } else if (c != '}') {
                         /* $[{[#]]<specialchar>[}] */
                         int cc = c;
@@ -13602,11 +13602,6 @@ parsesub: {
                 } else
                         goto badsub;
 
-                if (c != '}' && subtype == VSLENGTH) {
-                        /* ${#VAR didn't end with } */
-                        goto badsub;
-                }
-
                 if (subtype == 0) {
                         static const char types[] ALIGN1 = "}-+?=";
                         /* ${VAR...} but not $VAR or ${#VAR} */
@@ -13663,6 +13658,8 @@ parsesub: {
 #endif
                         }
                 } else {
+                        if (subtype == VSLENGTH && c != '}')
+                                subtype = 0;
  badsub:
                         pungetc();
                 }
@@ -15358,7 +15355,7 @@ init(void)
 
 
 //usage:#define ash_trivial_usage
-//usage:        "[-il] [-/+Cabefmnuvx] [-/+o OPT]... [-c 'SCRIPT' [ARG0 [ARGS]] / FILE [ARGS] / -s [ARGS]]"
+//usage:        "[-il] [-|+Cabefmnuvx] [-|+o OPT]... [-c 'SCRIPT' [ARG0 ARGS] | FILE [ARGS] | -s [ARGS]]"
 ////////        comes from ^^^^^^^^^^optletters
 //usage:#define ash_full_usage "\n\n"
 //usage:        "Unix shell interpreter"
diff --git a/shell/ash_test/ash-misc/control_char3.right b/shell/ash_test/ash-misc/control_char3.right
new file mode 100644
index 000000000..283e02cbb
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char3.right
@@ -0,0 +1 @@
+SHELL: line 1: : not found
diff --git a/shell/ash_test/ash-misc/control_char3.tests b/shell/ash_test/ash-misc/control_char3.tests
new file mode 100755
index 000000000..4359db3f3
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char3.tests
@@ -0,0 +1,2 @@
+# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
+$THIS_SH -c '\' SHELL
diff --git a/shell/ash_test/ash-misc/control_char4.right b/shell/ash_test/ash-misc/control_char4.right
new file mode 100644
index 000000000..2bf18e684
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char4.right
@@ -0,0 +1 @@
+SHELL: line 1: -: not found
diff --git a/shell/ash_test/ash-misc/control_char4.tests b/shell/ash_test/ash-misc/control_char4.tests
new file mode 100755
index 000000000..48010f154
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char4.tests
@@ -0,0 +1,2 @@
+# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
+$THIS_SH -c '"-"' SHELL
diff --git a/shell/ash_test/ash-parsing/bkslash_newline4.right b/shell/ash_test/ash-parsing/bkslash_newline4.right
new file mode 100644
index 000000000..2110716d1
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline4.right
@@ -0,0 +1,4 @@
+1:1
+22:22
+3:3
+Ok:0
diff --git a/shell/ash_test/ash-parsing/bkslash_newline4.tests b/shell/ash_test/ash-parsing/bkslash_newline4.tests
new file mode 100755
index 000000000..c8f5037c4
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline4.tests
@@ -0,0 +1,14 @@
+set -- 1 22 333
+echo 1:$\
+1
+echo 22:$\
+{\
+2\
+}
+echo 3:$\
+{\
+#\
+3\
+}
+echo Ok:$\
+?
diff --git a/shell/hush.c b/shell/hush.c
index 77921e11c..1aa0a400d 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -339,7 +339,7 @@
  * therefore we don't show them either.
  */
 //usage:#define hush_trivial_usage
-//usage:        "[-enxl] [-c 'SCRIPT' [ARG0 [ARGS]] / FILE [ARGS] / -s [ARGS]]"
+//usage:        "[-enxl] [-c 'SCRIPT' [ARG0 ARGS] | FILE [ARGS] | -s [ARGS]]"
 //usage:#define hush_full_usage "\n\n"
 //usage:        "Unix shell interpreter"
 
@@ -3696,9 +3696,10 @@ static void debug_print_tree(struct pipe *pi, int lvl)
 
         pin = 0;
         while (pi) {
-                fdprintf(2, "%*spipe %d %sres_word=%s followup=%d %s\n",
+                fdprintf(2, "%*spipe %d #cmds:%d %sres_word=%s followup=%d %s\n",
                                 lvl*2, "",
                                 pin,
+                                pi->num_cmds,
                                 (IF_HAS_KEYWORDS(pi->pi_inverted ? "! " :) ""),
                                 RES[pi->res_word],
                                 pi->followup, PIPE[pi->followup]
@@ -3841,6 +3842,9 @@ static void done_pipe(struct parse_context *ctx, pipe_style type)
 #endif
                 /* Replace all pipes in ctx with one newly created */
                 ctx->list_head = ctx->pipe = pi;
+                /* for cases like "cmd && &", do not be tricked by last command
+                 * being null - the entire {...} & is NOT null! */
+                not_null = 1;
         } else {
  no_conv:
                 ctx->pipe->followup = type;
@@ -4994,6 +4998,32 @@ static int parse_dollar(o_string *as_string,
                  * which check invalid constructs like ${%}.
                  * Oh well... let's check that the var name part is fine... */
 
+                if (isdigit(len_single_ch)
+                 || (len_single_ch == '#' && isdigit(i_peek_and_eat_bkslash_nl(input)))
+                ) {
+                        /* Execution engine uses plain xatoi_positive()
+                         * to interpret ${NNN} and {#NNN},
+                         * check syntax here in the parser.
+                         * (bash does not support expressions in ${#NN},
+                         * e.g. ${#$var} and {#1:+WORD} are not supported).
+                         */
+                        unsigned cnt = 9; /* max 9 digits for ${NN} and 8 for {#NN} */
+                        while (1) {
+                                o_addchr(dest, ch);
+                                debug_printf_parse(": '%c'\n", ch);
+                                ch = i_getch_and_eat_bkslash_nl(input);
+                                nommu_addchr(as_string, ch);
+                                if (ch == '}')
+                                        break;
+                                if (--cnt == 0)
+                                        goto bad_dollar_syntax;
+                                if (len_single_ch != '#' && strchr(VAR_SUBST_OPS, ch))
+                                        /* ${NN<op>...} is valid */
+                                        goto eat_until_closing;
+                                if (!isdigit(ch))
+                                        goto bad_dollar_syntax;
+                        }
+                } else
                 while (1) {
                         unsigned pos;
 
@@ -5004,7 +5034,6 @@ static int parse_dollar(o_string *as_string,
                         nommu_addchr(as_string, ch);
                         if (ch == '}')
                                 break;
-
                         if (!isalnum(ch) && ch != '_') {
                                 unsigned end_ch;
                                 unsigned char last_ch;
@@ -5023,6 +5052,7 @@ static int parse_dollar(o_string *as_string,
                                          * special var name, e.g. ${#!}.
                                          */
                                 }
+ eat_until_closing:
                                 /* Eat everything until closing '}' (or ':') */
                                 end_ch = '}';
                                 if (BASH_SUBSTR
@@ -5237,6 +5267,11 @@ static int encode_string(o_string *as_string,
         }
 #endif
         o_addQchr(dest, ch);
+        if (ch == SPECIAL_VAR_SYMBOL) {
+                /* Convert "^C" to corresponding special variable reference */
+                o_addchr(dest, SPECIAL_VAR_QUOTED_SVS);
+                o_addchr(dest, SPECIAL_VAR_SYMBOL);
+        }
         goto again;
 #undef as_string
 }
@@ -5348,6 +5383,11 @@ static struct pipe *parse_stream(char **pstring,
                         if (ch == '\n')
                                 continue; /* drop \<newline>, get next char */
                         nommu_addchr(&ctx.as_string, '\\');
+                        if (ch == SPECIAL_VAR_SYMBOL) {
+                                nommu_addchr(&ctx.as_string, ch);
+                                /* Convert \^C to corresponding special variable reference */
+                                goto case_SPECIAL_VAR_SYMBOL;
+                        }
                         o_addchr(&ctx.word, '\\');
                         if (ch == EOF) {
                                 /* Testcase: eval 'echo Ok\' */
@@ -5672,6 +5712,7 @@ static struct pipe *parse_stream(char **pstring,
                 /* Note: nommu_addchr(&ctx.as_string, ch) is already done */
 
                 switch (ch) {
+                case_SPECIAL_VAR_SYMBOL:
                 case SPECIAL_VAR_SYMBOL:
                         /* Convert raw ^C to corresponding special variable reference */
                         o_addchr(&ctx.word, SPECIAL_VAR_SYMBOL);
diff --git a/shell/hush_test/hush-misc/control_char3.right b/shell/hush_test/hush-misc/control_char3.right
new file mode 100644
index 000000000..94b4f8699
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char3.right
@@ -0,0 +1 @@
+hush: can't execute '': No such file or directory
diff --git a/shell/hush_test/hush-misc/control_char3.tests b/shell/hush_test/hush-misc/control_char3.tests
new file mode 100755
index 000000000..4359db3f3
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char3.tests
@@ -0,0 +1,2 @@
+# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
+$THIS_SH -c '\' SHELL
diff --git a/shell/hush_test/hush-misc/control_char4.right b/shell/hush_test/hush-misc/control_char4.right
new file mode 100644
index 000000000..698e21427
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char4.right
@@ -0,0 +1 @@
+hush: can't execute '-': No such file or directory
diff --git a/shell/hush_test/hush-misc/control_char4.tests b/shell/hush_test/hush-misc/control_char4.tests
new file mode 100755
index 000000000..48010f154
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char4.tests
@@ -0,0 +1,2 @@
+# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
+$THIS_SH -c '"-"' SHELL
diff --git a/shell/hush_test/hush-parsing/bkslash_newline4.right b/shell/hush_test/hush-parsing/bkslash_newline4.right
new file mode 100644
index 000000000..2110716d1
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline4.right
@@ -0,0 +1,4 @@
+1:1
+22:22
+3:3
+Ok:0
diff --git a/shell/hush_test/hush-parsing/bkslash_newline4.tests b/shell/hush_test/hush-parsing/bkslash_newline4.tests
new file mode 100755
index 000000000..c8f5037c4
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline4.tests
@@ -0,0 +1,14 @@
+set -- 1 22 333
+echo 1:$\
+1
+echo 22:$\
+{\
+2\
+}
+echo 3:$\
+{\
+#\
+3\
+}
+echo Ok:$\
+?
diff --git a/shell/hush_test/hush-vars/var6.right b/shell/hush_test/hush-vars/var6.right
index 40e67fdf5..5e28d2fab 100644
--- a/shell/hush_test/hush-vars/var6.right
+++ b/shell/hush_test/hush-vars/var6.right
@@ -1,2 +1,2 @@
-hush: invalid number '1q'
+hush: syntax error: unterminated ${name}
 hush: syntax error: unterminated ${name}
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 9422b6ea7..04b2c8e3b 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -26,7 +26,7 @@
 //usage:       "Write MESSAGE (or stdin) to syslog\n"
 //usage:     "\n        -s      Log to stderr as well as the system log"
 //usage:     "\n        -t TAG  Log using the specified tag (defaults to user name)"
-//usage:     "\n        -p PRIO Priority (numeric or facility.level pair)"
+//usage:     "\n        -p PRIO Priority (number or FACILITY.LEVEL pair)"
 //usage:
 //usage:#define logger_example_usage
 //usage:       "$ logger \"hello\"\n"
diff --git a/testsuite/mv/mv-files-to-dir-2 b/testsuite/mv/mv-files-to-dir-2
new file mode 100644
index 000000000..e189ebb6f
--- /dev/null
+++ b/testsuite/mv/mv-files-to-dir-2
@@ -0,0 +1,16 @@
+echo file number one > file1
+echo file number two > file2
+ln -s file2 link1
+mkdir dir1
+TZ=UTC0 touch -d '2000-01-30 05:24:08' dir1/file3
+mkdir there
+busybox mv -t there file1 file2 link1 dir1
+test -f there/file1
+test -f there/file2
+test -f there/dir1/file3
+test -L there/link1
+test xfile2 = x`readlink there/link1`
+test ! -e file1
+test ! -e file2
+test ! -e link1
+test ! -e dir1/file3
diff --git a/testsuite/unlzma.tests b/testsuite/unlzma.tests
index 0e98afe09..fcc6e9441 100755
--- a/testsuite/unlzma.tests
+++ b/testsuite/unlzma.tests
@@ -8,14 +8,23 @@
 
 # Damaged encrypted streams
 testing "unlzma (bad archive 1)" \
-        "unlzma <unlzma_issue_1.lzma >/dev/null; echo \$?" \
-"1
+        "unlzma <unlzma_issue_1.lzma 2>&1 >/dev/null; echo \$?" \
+"unlzma: corrupted data
+1
 " "" ""
 
 # Damaged encrypted streams
 testing "unlzma (bad archive 2)" \
-        "unlzma <unlzma_issue_2.lzma >/dev/null; echo \$?" \
-"1
+        "unlzma <unlzma_issue_2.lzma 2>&1 >/dev/null; echo \$?" \
+"unlzma: corrupted data
+1
+" "" ""
+
+# Damaged encrypted streams
+testing "unlzma (bad archive 3)" \
+        "unlzma <unlzma_issue_3.lzma 2>&1 >/dev/null; echo \$?" \
+"unlzma: corrupted data
+1
 " "" ""
 
 exit $FAILCOUNT
diff --git a/testsuite/unlzma_issue_3.lzma b/testsuite/unlzma_issue_3.lzma
new file mode 100644
index 000000000..cc60f29e4
--- /dev/null
+++ b/testsuite/unlzma_issue_3.lzma
diff --git a/util-linux/blockdev.c b/util-linux/blockdev.c
index 20a031377..3b550220a 100644
--- a/util-linux/blockdev.c
+++ b/util-linux/blockdev.c
@@ -25,8 +25,11 @@
 //usage:     "\n        --getbsz        Get block size"
 //usage:     "\n        --setbsz BYTES  Set block size"
 //usage:     "\n        --getsz         Get device size in 512-byte sectors"
-/*//usage:     "\n      --getsize       Get device size in sectors (deprecated)"*/
+///////:     "\n        --getsize       Get device size in sectors (deprecated)"
+///////^^^^^ supported, but not shown in help ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //usage:     "\n        --getsize64     Get device size in bytes"
+//usage:     "\n        --getra         Get readahead in 512-byte sectors"
+//usage:     "\n        --setra SECTORS Set readahead"
 //usage:     "\n        --flushbufs     Flush buffers"
 //usage:     "\n        --rereadpt      Reread partition table"
 // util-linux 2.31 also has:
@@ -57,6 +60,9 @@ static const char bdcmd_names[] ALIGN1 =
         "getsz"     "\0"
         "getsize"   "\0"
         "getsize64" "\0"
+        "getra"     "\0"
+        "setra"     "\0"
+#define CMD_SETRA 10
         "flushbufs" "\0"
         "rereadpt"  "\0"
 ;
@@ -70,6 +76,8 @@ static const uint32_t bdcmd_ioctl[] ALIGN4 = {
         BLKGETSIZE64,   //getsz
         BLKGETSIZE,     //getsize
         BLKGETSIZE64,   //getsize64
+        BLKRAGET,       //getra
+        BLKRASET,       //setra
         BLKFLSBUF,      //flushbufs
         BLKRRPART,      //rereadpt
 };
@@ -95,6 +103,8 @@ static const uint8_t bdcmd_flags[] ALIGN1 = {
         ARG_U64 + FL_SCALE512,             //getsz
         ARG_ULONG,                         //getsize
         ARG_U64,                           //getsize64
+        ARG_ULONG,                         //getra
+        ARG_ULONG + FL_NORESULT,           //setra
         ARG_NONE + FL_NORESULT,            //flushbufs
         ARG_NONE + FL_NORESULT,            //rereadpt
 };
@@ -130,8 +140,9 @@ int blockdev_main(int argc UNUSED_PARAM, char **argv)
         /* setrw translates to BLKROSET(0), most other ioctls don't care... */
         /* ...setro will do BLKROSET(1) */
         u64 = (bdcmd == CMD_SETRO);
-        if (bdcmd == CMD_SETBSZ) {
+        if (bdcmd == CMD_SETBSZ || bdcmd == CMD_SETRA) {
                 /* ...setbsz is BLKBSZSET(bytes) */
+                /* ...setra is BLKRASET(512 bytes) */
                 u64 = xatoi_positive(*++argv);
         }
 
@@ -145,8 +156,11 @@ int blockdev_main(int argc UNUSED_PARAM, char **argv)
 #if BB_BIG_ENDIAN
         /* Store data properly wrt data size.
          * (1) It's no-op for little-endian.
-         * (2) it's no-op for 0 and -1. Only --setro uses arg != 0 and != -1,
-         * and it is ARG_INT. --setbsz USER_VAL is also ARG_INT.
+         * (2) it's no-op for 0 and -1.
+         * --setro uses arg != 0 and != -1, and it is ARG_INT
+         * --setbsz USER_VAL is also ARG_INT
+         * --setra USER_VAL is ARG_ULONG, but it is passed by value,
+         * not reference (see below in ioctl call).
          * Thus, we don't need to handle ARG_ULONG.
          */
         switch (flags & ARG_MASK) {
@@ -161,7 +175,11 @@ int blockdev_main(int argc UNUSED_PARAM, char **argv)
         }
 #endif
 
-        if (ioctl(fd, bdcmd_ioctl[bdcmd], &ioctl_val_on_stack.u64) == -1)
+        if (ioctl(fd, bdcmd_ioctl[bdcmd],
+                        bdcmd == CMD_SETRA
+                                ? (void*)(uintptr_t)u64 /* BLKRASET passes _value_, not pointer to it */
+                                : &ioctl_val_on_stack.u64
+                ) == -1)
                 bb_simple_perror_msg_and_die(*argv);
 
         /* Fetch it into register(s) */
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index dc4e57169..6670b84de 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -46,7 +46,7 @@
 //kbuild:lib-$(CONFIG_DMESG) += dmesg.o
 
 //usage:#define dmesg_trivial_usage
-//usage:       "[-c] [-n LEVEL] [-s SIZE]"
+//usage:       "[-cr] [-n LEVEL] [-s SIZE]"
 //usage:#define dmesg_full_usage "\n\n"
 //usage:       "Print or control the kernel ring buffer\n"
 //usage:     "\n        -c              Clear ring buffer after printing"
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index c50ceead1..1c2a7d683 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -232,8 +232,8 @@ struct pte {
 };
 
 #define unable_to_open "can't open '%s'"
-#define unable_to_read "can't read from %s"
-#define unable_to_seek "can't seek on %s"
+#define unable_to_read "can't read '%s'"
+#define unable_to_seek "can't seek '%s'"
 
 enum label_type {
         LABEL_DOS, LABEL_SUN, LABEL_SGI, LABEL_AIX, LABEL_OSF, LABEL_GPT
diff --git a/util-linux/flock.c b/util-linux/flock.c
index 12c16013c..1ed752a80 100644
--- a/util-linux/flock.c
+++ b/util-linux/flock.c
@@ -14,7 +14,7 @@
 //kbuild:lib-$(CONFIG_FLOCK) += flock.o
 
 //usage:#define flock_trivial_usage
-//usage:       "[-sxun] FD|{FILE [-c] PROG ARGS}"
+//usage:       "[-sxun] FD | { FILE [-c] PROG ARGS }"
 //usage:#define flock_full_usage "\n\n"
 //usage:       "[Un]lock file descriptor, or lock FILE, run PROG\n"
 //usage:     "\n        -s      Shared lock"
diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c
index 29bbc6633..fe78f6242 100644
--- a/util-linux/hexdump_xxd.c
+++ b/util-linux/hexdump_xxd.c
@@ -41,15 +41,17 @@
 //    -u          use upper case hex letters.
 
 //usage:#define xxd_trivial_usage
-//usage:       "[-pr] [-g N] [-c N] [-n LEN] [-s OFS] [FILE]"
+//usage:       "[-pri] [-g N] [-c N] [-n LEN] [-s OFS] [-o OFS] [FILE]"
 //usage:#define xxd_full_usage "\n\n"
 //usage:       "Hex dump FILE (or stdin)\n"
 //usage:     "\n        -g N            Bytes per group"
 //usage:     "\n        -c N            Bytes per line"
 //usage:     "\n        -p              Show only hex bytes, assumes -c30"
+//usage:     "\n        -i              C include file style"
 // exactly the same help text lines in hexdump and xxd:
 //usage:     "\n        -l LENGTH       Show only first LENGTH bytes"
 //usage:     "\n        -s OFFSET       Skip OFFSET bytes"
+//usage:     "\n        -o OFFSET       Add OFFSET to displayed offset"
 //usage:     "\n        -r              Reverse (with -p, assumes no offsets in input)"
 
 #include "libbb.h"
@@ -61,7 +63,11 @@
 #define OPT_s (1 << 1)
 #define OPT_a (1 << 2)
 #define OPT_p (1 << 3)
-#define OPT_r (1 << 4)
+#define OPT_i (1 << 4)
+#define OPT_r (1 << 5)
+#define OPT_g (1 << 6)
+#define OPT_c (1 << 7)
+#define OPT_o (1 << 8)
 
 static void reverse(unsigned opt, unsigned cols, const char *filename)
 {
@@ -122,20 +128,30 @@ static void reverse(unsigned opt, unsigned cols, const char *filename)
         fflush_stdout_and_exit(EXIT_SUCCESS);
 }
 
+static void print_C_style(const char *p, const char *hdr)
+{
+        printf(hdr, isdigit(p[0]) ? "__" : "");
+        while (*p) {
+                bb_putchar(isalnum(*p) ? *p : '_');
+                p++;
+        }
+}
+
 int xxd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int xxd_main(int argc UNUSED_PARAM, char **argv)
 {
         char buf[80];
         dumper_t *dumper;
-        char *opt_l, *opt_s;
+        char *opt_l, *opt_s, *opt_o;
         unsigned bytes = 2;
         unsigned cols = 0;
         unsigned opt;
+        int r;
 
         dumper = alloc_dumper();
 
-        opt = getopt32(argv, "^" "l:s:aprg:+c:+" "\0" "?1" /* 1 argument max */,
-                        &opt_l, &opt_s, &bytes, &cols
+        opt = getopt32(argv, "^" "l:s:apirg:+c:+o:" "\0" "?1" /* 1 argument max */,
+                        &opt_l, &opt_s, &bytes, &cols, &opt_o
         );
         argv += optind;
 
@@ -158,14 +174,24 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
                 //BUGGY for /proc/version (unseekable?)
         }
 
+        if (opt & OPT_o) {
+                /* -o accepts negative numbers too */
+                dumper->xxd_displayoff = xstrtoll(opt_o, /*base:*/ 0);
+        }
+
         if (opt & OPT_p) {
                 if (cols == 0)
                         cols = 30;
                 bytes = cols; /* -p ignores -gN */
         } else {
                 if (cols == 0)
-                        cols = 16;
-                bb_dump_add(dumper, "\"%08.8_ax: \""); // "address: "
+                        cols = (opt & OPT_i) ? 12 : 16;
+                if (opt & OPT_i) {
+                        bytes = 1; // -i ignores -gN
+                        // output is "  0xXX, 0xXX, 0xXX...", add leading space
+                        bb_dump_add(dumper, "\" \"");
+                } else
+                        bb_dump_add(dumper, "\"%08.8_ax: \""); // "address: "
         }
 
         if (opt & OPT_r) {
@@ -173,11 +199,15 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
         }
 
         if (bytes < 1 || bytes >= cols) {
-                sprintf(buf, "%u/1 \"%%02x\"", cols); // cols * "xx"
+                sprintf(buf, "%u/1 \"%%02x\"", cols); // cols * "XX"
                 bb_dump_add(dumper, buf);
         }
         else if (bytes == 1) {
-                sprintf(buf, "%u/1 \"%%02x \"", cols); // cols * "xx "
+                if (opt & OPT_i)
+                        sprintf(buf, "%u/1 \" 0x%%02x,\"", cols); // cols * " 0xXX,"
+//TODO: compat: omit the last comma after the very last byte
+                else
+                        sprintf(buf, "%u/1 \"%%02x \"", cols); // cols * "XX "
                 bb_dump_add(dumper, buf);
         }
         else {
@@ -201,13 +231,22 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
                 free(bigbuf);
         }
 
-        if (!(opt & OPT_p)) {
+        if (!(opt & (OPT_p|OPT_i))) {
                 sprintf(buf, "\"  \"%u/1 \"%%_p\"\"\n\"", cols); // "  ASCII\n"
                 bb_dump_add(dumper, buf);
         } else {
                 bb_dump_add(dumper, "\"\n\"");
-                dumper->eofstring = "\n";
+                dumper->xxd_eofstring = "\n";
         }
 
-        return bb_dump_dump(dumper, argv);
+        if ((opt & OPT_i) && argv[0]) {
+                print_C_style(argv[0], "unsigned char %s");
+                printf("[] = {\n");
+        }
+        r = bb_dump_dump(dumper, argv);
+        if (r == 0 && (opt & OPT_i) && argv[0]) {
+                print_C_style(argv[0], "};\nunsigned int %s");
+                printf("_len = %"OFF_FMT"u;\n", dumper->address);
+        }
+        return r;
 }
diff --git a/util-linux/ionice.c b/util-linux/ionice.c
index c8fb1a777..82bd309d1 100644
--- a/util-linux/ionice.c
+++ b/util-linux/ionice.c
@@ -18,11 +18,13 @@
 //kbuild:lib-$(CONFIG_IONICE) += ionice.o
 
 //usage:#define ionice_trivial_usage
-//usage:        "[-c 1-3] [-n 0-7] [-p PID] [PROG ARGS]"
+//usage:        "[-c 1-3] [-n 0-7] [-t] { -p PID | PROG ARGS }"
+//TODO: | -P PGID | -u UID; also -pPu can take _list of_ IDs
 //usage:#define ionice_full_usage "\n\n"
 //usage:       "Change I/O priority and class\n"
 //usage:     "\n        -c N    Class. 1:realtime 2:best-effort 3:idle"
 //usage:     "\n        -n N    Priority"
+//usage:     "\n        -t      Ignore errors"
 
 #include <sys/syscall.h>
 #include <asm/unistd.h>
@@ -64,14 +66,15 @@ int ionice_main(int argc UNUSED_PARAM, char **argv)
         int pid = 0; /* affect own process */
         int opt;
         enum {
-                OPT_n = 1,
-                OPT_c = 2,
-                OPT_p = 4,
+                OPT_n = 1 << 0,
+                OPT_c = 1 << 1,
+                OPT_p = 1 << 2,
+                OPT_t = 1 << 3,
         };
 
-        /* Numeric params */
         /* '+': stop at first non-option */
-        opt = getopt32(argv, "+n:+c:+p:+", &pri, &ioclass, &pid);
+        /* numeric params for -n -c -p */
+        opt = getopt32(argv, "+""n:+c:+p:+t", &pri, &ioclass, &pid);
         argv += optind;
 
         if (opt & OPT_c) {
@@ -104,7 +107,8 @@ int ionice_main(int argc UNUSED_PARAM, char **argv)
 //pri, ioclass, pri | (ioclass << IOPRIO_CLASS_SHIFT));
                 pri |= (ioclass << IOPRIO_CLASS_SHIFT);
                 if (ioprio_set(IOPRIO_WHO_PROCESS, pid, pri) == -1)
-                        bb_perror_msg_and_die("ioprio_%cet", 's');
+                        if (!(opt & OPT_t))
+                                bb_perror_msg_and_die("ioprio_%cet", 's');
                 if (argv[0]) {
                         BB_EXECVP_or_die(argv);
                 }
diff --git a/util-linux/mountpoint.c b/util-linux/mountpoint.c
index a44cf6013..28b1e7a54 100644
--- a/util-linux/mountpoint.c
+++ b/util-linux/mountpoint.c
@@ -19,13 +19,14 @@
 //kbuild:lib-$(CONFIG_MOUNTPOINT) += mountpoint.o
 
 //usage:#define mountpoint_trivial_usage
-//usage:       "[-q] <[-dn] DIR | -x DEVICE>"
+//usage:       "[-q] { [-dn] DIR | -x DEVICE }"
 //usage:#define mountpoint_full_usage "\n\n"
-//usage:       "Check if the directory is a mountpoint\n"
+//usage:       "Check if DIR is a mountpoint\n"
 //usage:     "\n        -q      Quiet"
-//usage:     "\n        -d      Print major/minor device number of the filesystem"
+//usage:     "\n        -d      Print major:minor of the filesystem"
 //usage:     "\n        -n      Print device name of the filesystem"
-//usage:     "\n        -x      Print major/minor device number of the blockdevice"
+//////// -n is not supported by util-linux-2.36.1 ^^^^^^^^^^^^^^^^^^
+//usage:     "\n        -x      Print major:minor of DEVICE"
 //usage:
 //usage:#define mountpoint_example_usage
 //usage:       "$ mountpoint /proc\n"
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 32d9987e7..f11c62292 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -44,8 +44,8 @@
 //usage:#define readprofile_trivial_usage
 //usage:       "[OPTIONS]"
 //usage:#define readprofile_full_usage "\n\n"
-//usage:       "        -m mapfile      (Default: /boot/System.map)"
-//usage:     "\n        -p profile      (Default: /proc/profile)"
+//usage:       "        -m MAPFILE      (Default: /boot/System.map)"
+//usage:     "\n        -p PROFILE      (Default: /proc/profile)"
 //usage:     "\n        -M NUM          Set the profiling multiplier to NUM"
 //usage:     "\n        -i              Print only info about the sampling step"
 //usage:     "\n        -v              Verbose"
diff --git a/util-linux/renice.c b/util-linux/renice.c
index a318ffce0..fc72550f4 100644
--- a/util-linux/renice.c
+++ b/util-linux/renice.c
@@ -29,7 +29,7 @@
 //kbuild:lib-$(CONFIG_RENICE) += renice.o
 
 //usage:#define renice_trivial_usage
-//usage:       "[-n] PRIORITY [[-p | -g | -u] ID...]..."
+//usage:       "[-n] PRIORITY [[-p|g|u] ID...]..."
 //usage:#define renice_full_usage "\n\n"
 //usage:       "Change scheduling priority of a running process\n"
 //usage:     "\n        -n      Add PRIORITY to current nice value"
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index f2674b5ac..901c0b8db 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -68,11 +68,22 @@ extern int capget(cap_user_header_t header, const cap_user_data_t data);
 # define MS_MOVE     8192
 #endif
 
+static void delete_contents(const char *directory, dev_t rootdev);
+
+static int FAST_FUNC rmrf(const char *directory, struct dirent *d, void *rootdevp)
+{
+        char *newdir = concat_subpath_file(directory, d->d_name);
+        if (newdir) { // not . or ..
+                // Recurse to delete contents
+                delete_contents(newdir, *(dev_t*)rootdevp);
+                free(newdir);
+        }
+        return 0;
+}
+
 // Recursively delete contents of rootfs
 static void delete_contents(const char *directory, dev_t rootdev)
 {
-        DIR *dir;
-        struct dirent *d;
         struct stat st;
 
         // Don't descend into other filesystems
@@ -81,25 +92,7 @@ static void delete_contents(const char *directory, dev_t rootdev)
 
         // Recursively delete the contents of directories
         if (S_ISDIR(st.st_mode)) {
-                dir = opendir(directory);
-                if (dir) {
-                        while ((d = readdir(dir))) {
-                                char *newdir = d->d_name;
-
-                                // Skip . and ..
-                                if (DOT_OR_DOTDOT(newdir))
-                                        continue;
-
-                                // Recurse to delete contents
-                                newdir = concat_path_file(directory, newdir);
-                                delete_contents(newdir, rootdev);
-                                free(newdir);
-                        }
-                        closedir(dir);
-
-                        // Directory should now be empty, zap it
-                        rmdir(directory);
-                }
+                iterate_on_dir(directory, rmrf, &rootdev);
         } else {
                 // It wasn't a directory, zap it
                 unlink(directory);
diff --git a/util-linux/taskset.c b/util-linux/taskset.c
index b542f8c83..afe2f04d2 100644
--- a/util-linux/taskset.c
+++ b/util-linux/taskset.c
@@ -34,10 +34,12 @@
 //kbuild:lib-$(CONFIG_TASKSET) += taskset.o
 
 //usage:#define taskset_trivial_usage
-//usage:       "[-p] [HEXMASK] PID | PROG ARGS"
+//usage:       "[-ap] [HEXMASK"IF_FEATURE_TASKSET_CPULIST(" | -c LIST")"] { PID | PROG ARGS }"
 //usage:#define taskset_full_usage "\n\n"
 //usage:       "Set or get CPU affinity\n"
-//usage:     "\n        -p      Operate on an existing PID"
+//usage:     "\n        -p      Operate on PID"
+//usage:     "\n        -a      Operate on all threads"
+//usage:     "\n        -c      Affinity is a list, not mask"
 //usage:
 //usage:#define taskset_example_usage
 //usage:       "$ taskset 0x7 ./dgemm_test&\n"
@@ -205,42 +207,18 @@ static void print_cpulist(const ul *mask, unsigned mask_size_in_bytes)
 }
 #endif
 
-int taskset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int taskset_main(int argc UNUSED_PARAM, char **argv)
+enum {
+        OPT_p = 1 << 0,
+        OPT_a = 1 << 1,
+        OPT_c = (1 << 2) * ENABLE_FEATURE_TASKSET_CPULIST,
+};
+
+static int process_pid_str(const char *pid_str, unsigned opts, char *aff)
 {
         ul *mask;
         unsigned mask_size_in_bytes;
-        pid_t pid = 0;
         const char *current_new;
-        char *aff;
-        unsigned opts;
-        enum {
-                OPT_p = 1 << 0,
-                OPT_c = (1 << 1) * ENABLE_FEATURE_TASKSET_CPULIST,
-        };
-
-        /* NB: we mimic util-linux's taskset: -p does not take
-         * an argument, i.e., "-pN" is NOT valid, only "-p N"!
-         * Indeed, util-linux-2.13-pre7 uses:
-         * getopt_long(argc, argv, "+pchV", ...), not "...p:..." */
-
-        opts = getopt32(argv, "^+" "p"IF_FEATURE_TASKSET_CPULIST("c")
-                        "\0" "-1" /* at least 1 arg */);
-        argv += optind;
-
-        aff = *argv++;
-        if (opts & OPT_p) {
-                char *pid_str = aff;
-                if (*argv) { /* "-p <aff> <pid> ...rest.is.ignored..." */
-                        pid_str = *argv; /* NB: *argv != NULL in this case */
-                }
-                /* else it was just "-p <pid>", and *argv == NULL */
-                pid = xatoul_range(pid_str, 1, ((unsigned)(pid_t)ULONG_MAX) >> 1);
-        } else {
-                /* <aff> <cmd...> */
-                if (!*argv)
-                        bb_show_usage();
-        }
+        pid_t pid = xatoi_positive(pid_str);
 
         mask_size_in_bytes = SZOF_UL;
         current_new = "current";
@@ -255,13 +233,12 @@ int taskset_main(int argc UNUSED_PARAM, char **argv)
 #endif
                         printf("pid %d's %s affinity mask: "TASKSET_PRINTF_MASK"\n",
                                 pid, current_new, from_mask(mask, mask_size_in_bytes));
-                if (*argv == NULL) {
+                if (!aff) {
                         /* Either it was just "-p <pid>",
                          * or it was "-p <aff> <pid>" and we came here
                          * for the second time (see goto below) */
-                        return EXIT_SUCCESS;
+                        return 0;
                 }
-                *argv = NULL;
                 current_new = "new";
         }
         memset(mask, 0, mask_size_in_bytes);
@@ -331,8 +308,61 @@ int taskset_main(int argc UNUSED_PARAM, char **argv)
                 bb_perror_msg_and_die("can't %cet pid %d's affinity", 's', pid);
         //bb_error_msg("set mask[0]:%lx", mask[0]);
 
-        if (!argv[0]) /* "-p <aff> <pid> [...ignored...]" */
+        if ((opts & OPT_p) && aff) { /* "-p <aff> <pid> [...ignored...]" */
+                aff = NULL;
                 goto print_aff; /* print new affinity and exit */
+        }
+        return 0;
+}
+
+static int FAST_FUNC iter(const char *dn UNUSED_PARAM, struct dirent *ent, void *aff)
+{
+        if (isdigit(ent->d_name[0]))
+                return process_pid_str(ent->d_name, option_mask32, aff);
+        return 0;
+}
+
+int taskset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int taskset_main(int argc UNUSED_PARAM, char **argv)
+{
+        const char *pid_str;
+        char *aff;
+        unsigned opts;
 
-        BB_EXECVP_or_die(argv);
+        /* NB: we mimic util-linux's taskset: -p does not take
+         * an argument, i.e., "-pN" is NOT valid, only "-p N"!
+         * Indeed, util-linux-2.13-pre7 uses:
+         * getopt_long(argc, argv, "+pchV", ...), not "...p:..." */
+
+        opts = getopt32(argv, "^+" "pa"IF_FEATURE_TASKSET_CPULIST("c")
+                        "\0" "-1" /* at least 1 arg */);
+        argv += optind;
+
+        aff = *argv++;
+        if (!(opts & OPT_p)) {
+                /* <aff> <cmd...> */
+                if (!*argv)
+                        bb_show_usage();
+                process_pid_str("0", opts, aff);
+                BB_EXECVP_or_die(argv);
+        }
+
+        pid_str = aff;
+        if (*argv) /* "-p <aff> <pid> ...rest.is.ignored..." */
+                pid_str = *argv;
+        else
+                aff = NULL;
+
+        if (opts & OPT_a) {
+                char *dn;
+                int r;
+
+                dn = xasprintf("/proc/%s/task", pid_str);
+                r = iterate_on_dir(dn, iter, aff);
+                IF_FEATURE_CLEAN_UP(free(dn);)
+                if (r == 0)
+                        return r; /* EXIT_SUCCESS */
+                /* else: no /proc/PID/task, act as if no -a was given */
+        }
+        return process_pid_str(pid_str, opts, aff);
 }