Merge branch 'busybox' into merge

227 files changed, 3296 insertions, 2214 deletions

diff --git a/Config.in b/Config.in
index 495ac4c13..2d1e9bc8b 100644
--- a/Config.in
+++ b/Config.in
@@ -649,6 +649,14 @@ config STACK_OPTIMIZATION_386
         do not work with it (they use SSE instructions without
         ensuring stack alignment).
 
+config STATIC_LIBGCC
+        bool "Use -static-libgcc"
+        default y
+        help
+        This option instructs gcc to link in a static version of its
+        support library, libgcc. This means that the binary will require
+        one fewer dynamic library at run time.
+
 comment 'Installation Options ("make install" behavior)'
 
 choice
diff --git a/Makefile b/Makefile
index 892d5411d..a6609ca90 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERSION = 1
-PATCHLEVEL = 33
+PATCHLEVEL = 34
 SUBLEVEL = 0
 EXTRAVERSION = .git
 NAME = Unnamed
diff --git a/Makefile.flags b/Makefile.flags
index fdaf5cc79..94ed4e40e 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -59,7 +59,8 @@ CFLAGS += $(call cc-option,-fno-builtin-strlen -fomit-frame-pointer -ffunction-s
 CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
 CFLAGS += $(call cc-option,-funsigned-char,)
 
-ifneq ($(CC),clang)
+ifeq ($(CONFIG_STATIC_LIBGCC),y)
+# Disable it, for example, if you get
 # "clang-9: warning: argument unused during compilation: '-static-libgcc'"
 CFLAGS += $(call cc-option,-static-libgcc,)
 endif
@@ -189,8 +190,10 @@ LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%
 endif
 
 ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
+ifeq ($(CONFIG_UNAME_OSNAME),Linux)
 LDLIBS += resolv
 endif
+endif
 
 ifeq ($(CONFIG_EFENCE),y)
 LDLIBS += efence
diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index ce2037440..7ba929b12 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -20,6 +20,10 @@
 #undef ARRAY_SIZE
 #define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0])))
 
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
 #include "../include/autoconf.h"
 #include "../include/applet_metadata.h"
 
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 425361fd9..2fa008fa7 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -11,3 +11,11 @@ ifeq ($(CONFIG_STACK_OPTIMIZATION_386),y)
 # from aligning stack to 16 bytes. (Which is gcc's way of supporting SSE).
 CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2,)
 endif
+
+# "Control how GCC aligns variables.
+# Supported values for type are compat uses increased alignment value
+# compatible uses GCC 4.8 and earlier, abi uses alignment value as specified by the psABI,
+# and cacheline uses increased alignment value to match the cache line size.
+# compat is the default."
+# "abi" seems to be somewhat successful in preventing oversealous data alignment.
+CFLAGS += $(call cc-option,-malign-data=abi,)
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
new file mode 100644
index 000000000..16576fb81
--- /dev/null
+++ b/arch/x86_64/Makefile
@@ -0,0 +1,11 @@
+# ==========================================================================
+# Build system
+# ==========================================================================
+
+# "Control how GCC aligns variables.
+# Supported values for type are compat uses increased alignment value
+# compatible uses GCC 4.8 and earlier, abi uses alignment value as specified by the psABI,
+# and cacheline uses increased alignment value to match the cache line size.
+# compat is the default."
+# "abi" seems to be somewhat successful in preventing oversealous data alignment.
+CFLAGS += $(call cc-option,-malign-data=abi,)
diff --git a/archival/ar.c b/archival/ar.c
index 66930f0b8..eb734a685 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -48,19 +48,9 @@
 
 //kbuild:lib-$(CONFIG_AR) += ar.o
 
-//usage:#define ar_trivial_usage
-//usage:       "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
-//usage:#define ar_full_usage "\n\n"
-//usage:       "Extract or list FILES from an ar archive\n"
-//usage:     "\n        -o      Preserve original dates"
-//usage:     "\n        -p      Extract to stdout"
-//usage:     "\n        -t      List"
-//usage:     "\n        -x      Extract"
-//usage:     "\n        -v      Verbose"
-
 #include "libbb.h"
 #include "bb_archive.h"
-#include "ar.h"
+#include "ar_.h"
 
 #if ENABLE_FEATURE_AR_CREATE
 /* filter out entries with same names as specified on the command line */
@@ -236,23 +226,36 @@ static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
         );
 }
 
-#define AR_OPT_VERBOSE          (1 << 0)
-#define AR_OPT_PRESERVE_DATE    (1 << 1)
-/* "ar r" implies create, but warns about it. c suppresses warning.
- * bbox accepts but ignores it: */
-#define AR_OPT_CREATE           (1 << 2)
-
-#define AR_CMD_PRINT            (1 << 3)
-#define FIRST_CMD               AR_CMD_PRINT
-#define AR_CMD_LIST             (1 << 4)
-#define AR_CMD_EXTRACT          (1 << 5)
-#define AR_CMD_INSERT           (1 << 6)
+//usage:#define ar_trivial_usage
+//usage:       "x|p|t"IF_FEATURE_AR_CREATE("|r")" [-ov] ARCHIVE [FILE]..."
+//usage:#define ar_full_usage "\n\n"
+//usage:       "Extract or list FILEs from an ar archive"IF_FEATURE_AR_CREATE(", or create it")"\n"
+//usage:     "\n        x       Extract"
+//usage:     "\n        p       Extract to stdout"
+//usage:     "\n        t       List"
+//usage:        IF_FEATURE_AR_CREATE(
+//usage:     "\n        r       Create"
+//usage:        )
+//usage:     "\n        -o      Restore mtime"
+//usage:     "\n        -v      Verbose"
 
 int ar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ar_main(int argc UNUSED_PARAM, char **argv)
 {
         archive_handle_t *archive_handle;
         unsigned opt, t;
+        enum {
+                OPT_VERBOSE       = (1 << 0),
+                OPT_PRESERVE_DATE = (1 << 1),
+                /* "ar r" implies create, but warns about it. c suppresses warning.
+                 * bbox accepts but ignores it: */
+                OPT_CREATE        = (1 << 2),
+                CMD_PRINT         = (1 << 3),
+                FIRST_CMD         = CMD_PRINT,
+                CMD_LIST          = (1 << 4),
+                CMD_EXTRACT       = (1 << 5),
+                CMD_INSERT        = ((1 << 6) * ENABLE_FEATURE_AR_CREATE),
+        };
 
         archive_handle = init_handle();
 
@@ -272,26 +275,26 @@ int ar_main(int argc UNUSED_PARAM, char **argv)
         if (t & (t-1)) /* more than one of p,t,x[,r] are specified */
                 bb_show_usage();
 
-        if (opt & AR_CMD_PRINT) {
+        if (opt & CMD_PRINT) {
                 archive_handle->action_data = data_extract_to_stdout;
         }
-        if (opt & AR_CMD_LIST) {
+        if (opt & CMD_LIST) {
                 archive_handle->action_header = header_list;
         }
-        if (opt & AR_CMD_EXTRACT) {
+        if (opt & CMD_EXTRACT) {
                 archive_handle->action_data = data_extract_all;
         }
-        if (opt & AR_OPT_PRESERVE_DATE) {
+        if (opt & OPT_PRESERVE_DATE) {
                 archive_handle->ah_flags |= ARCHIVE_RESTORE_DATE;
         }
-        if (opt & AR_OPT_VERBOSE) {
+        if (opt & OPT_VERBOSE) {
                 archive_handle->action_header = header_verbose_list_ar;
         }
 #if ENABLE_FEATURE_AR_CREATE
         archive_handle->ar__name = *argv;
 #endif
         archive_handle->src_fd = xopen(*argv++,
-                        (opt & AR_CMD_INSERT)
+                        (opt & CMD_INSERT)
                                 ? O_RDWR | O_CREAT
                                 : O_RDONLY
         );
@@ -303,7 +306,7 @@ int ar_main(int argc UNUSED_PARAM, char **argv)
         }
 
 #if ENABLE_FEATURE_AR_CREATE
-        if (opt & AR_CMD_INSERT)
+        if (opt & CMD_INSERT)
                 return write_ar_archive(archive_handle);
 #endif
 
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 320fe4fd1..2beb92763 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -221,7 +221,7 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 //usage:#define uncompress_trivial_usage
 //usage:       "[-cf] [FILE]..."
 //usage:#define uncompress_full_usage "\n\n"
-//usage:       "Decompress .Z file[s]\n"
+//usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Overwrite"
 
@@ -463,7 +463,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define unlzma_trivial_usage
 //usage:       "[-cfk] [FILE]..."
 //usage:#define unlzma_full_usage "\n\n"
-//usage:       "Decompress FILE (or stdin)\n"
+//usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
@@ -471,7 +471,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define lzma_trivial_usage
 //usage:       "-d [-cfk] [FILE]..."
 //usage:#define lzma_full_usage "\n\n"
-//usage:       "Decompress FILE (or stdin)\n"
+//usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -d      Decompress"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
@@ -534,7 +534,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define unxz_trivial_usage
 //usage:       "[-cfk] [FILE]..."
 //usage:#define unxz_full_usage "\n\n"
-//usage:       "Decompress FILE (or stdin)\n"
+//usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
@@ -543,7 +543,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define xz_trivial_usage
 //usage:       "-d [-cfk] [FILE]..."
 //usage:#define xz_full_usage "\n\n"
-//usage:       "Decompress FILE (or stdin)\n"
+//usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -d      Decompress"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
diff --git a/archival/bzip2.c b/archival/bzip2.c
index d0390a92a..ac5db0880 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -50,7 +50,7 @@
 //kbuild:lib-$(CONFIG_BZIP2) += bzip2.o
 
 //usage:#define bzip2_trivial_usage
-//usage:       "[OPTIONS] [FILE]..."
+//usage:       "[-cfk" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789] [FILE]..."
 //usage:#define bzip2_full_usage "\n\n"
 //usage:       "Compress FILEs (or stdin) with bzip2 algorithm\n"
 //usage:     "\n        -1..9   Compression level"
diff --git a/archival/cpio.c b/archival/cpio.c
index 94b4b8174..94303389e 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -68,7 +68,7 @@
 //usage:     "\n        -H newc Archive format"
 //usage:        )
 //usage:     "\n        -d      Make leading directories"
-//usage:     "\n        -m      Preserve mtime"
+//usage:     "\n        -m      Restore mtime"
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -u      Overwrite"
 //usage:     "\n        -F FILE Input (-t,-i,-p) or output (-o) file"
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 61631bd4d..8e1f9431d 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1309,7 +1309,7 @@ postrm abort-install <old_version>
 postrm abort-upgrade <old_version>
 postrm disappear <overwriter> <version>
 */
-static const char *const all_control_files[] = {
+static const char *const all_control_files[] ALIGN_PTR = {
         "preinst", "postinst", "prerm", "postrm",
         "list", "md5sums", "shlibs", "conffiles",
         "config", "templates"
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index c2c4cbbcc..a5a80439d 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -28,7 +28,7 @@
 //usage:     "\n        -f      Print control fields"
 //usage:     "\n        -e      Extract control files to DIR (default: ./DEBIAN)"
 //usage:     "\n        -x      Extract files to DIR (no default)"
-//usage:     "\n        -X      Verbose -x"
+//usage:     "\n        -X      Verbose extract"
 //usage:
 //usage:#define dpkg_deb_example_usage
 //usage:       "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
diff --git a/archival/libarchive/bz/blocksort.c b/archival/libarchive/bz/blocksort.c
index 92d6d8251..062fd0f54 100644
--- a/archival/libarchive/bz/blocksort.c
+++ b/archival/libarchive/bz/blocksort.c
@@ -459,7 +459,7 @@ int mainGtU(EState* state,
  * usually small, typically <= 20.
  */
 static
-const uint32_t incs[14] = {
+const uint32_t incs[14] ALIGN4 = {
         1, 4, 13, 40, 121, 364, 1093, 3280,
         9841, 29524, 88573, 265720,
         797161, 2391484
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 3142405a3..049c2c156 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -159,6 +159,10 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                 break;
         }
         case S_IFDIR:
+//TODO: this causes problems if tarball contains a r-xr-xr-x directory:
+// we create this directory, and then fail to create files inside it
+// (if tar xf isn't run as root).
+// GNU tar works around this by chmod-ing directories *after* all files are extracted.
                 res = mkdir(dst_name, file_header->mode);
                 if ((res != 0)
                  && (errno != EISDIR) /* btw, Linux doesn't return this */
diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index 0fcabb4a9..f8b2ff8d2 100644
--- a/archival/libarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -20,7 +20,7 @@ enum {
         TAR_MAX,
 };
 
-static const char *const tar_var[] = {
+static const char *const tar_var[] ALIGN_PTR = {
         // "FILETYPE",
         "MODE",
         "FILENAME",
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index c0332d414..b2a3eb1c2 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -194,14 +194,14 @@ struct cp_ext {
 };
 /* Copy lengths and extra bits for literal codes 257..285 */
 /* note: see note #13 above about the 258 in this list. */
-static const struct cp_ext lit = {
+static const struct cp_ext lit ALIGN2 = {
         /*257 258 259 260 261 262 263 264 265 266 267 268 269 270 271  272  273  274  275  276   277   278   279   280   281   282   283    284    285 */
         /*0   1   2   3   4   5   6   7   8   9   10  11  12  13   14   15   16   17   18   19    20    21    22    23    24    25    26     27     28     29  30 */
         { 3,  4,  5,  6,  7,  8,  9,  10, 11, 13, 15, 17, 19, 23,  27,  31,  35,  43,  51,  59,   67,   83,   99,  115,  131,  163,  195,   227,   258,     0, 0  },
         { 0,  0,  0,  0,  0,  0,  0,   0,  1,  1,  1,  1,  2,  2,   2,   2,   3,   3,   3,   3,    4,    4,    4,    4,    5,    5,    5,     5,     0,    99, 99 } /* 99 == invalid */
 };
 /* Copy offsets and extra bits for distance codes 0..29 */
-static const struct cp_ext dist = {
+static const struct cp_ext dist ALIGN2 = {
         /*0   1   2   3   4   5   6   7   8   9   10  11  12  13   14   15   16   17   18   19    20    21    22    23    24    25    26     27     28     29 */
         { 1,  2,  3,  4,  5,  7,  9,  13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 },
         { 0,  0,  0,  0,  1,  1,  2,   2,  3,  3,  4,  4,  5,  5,   6,   6,   7,   7,   8,   8,    9,    9,   10,   10,   11,   11,   12,    12,    13,    13 }
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index b6ecd596c..3a19d6ff7 100644
--- a/archival/libarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -6,7 +6,7 @@
  */
 #include "libbb.h"
 #include "bb_archive.h"
-#include "ar.h"
+#include "ar_.h"
 
 /* WARNING: Clobbers str[len], so fields must be read in reverse order! */
 static unsigned read_num(char *str, int base, int len)
diff --git a/archival/libarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c
index 584c18ce8..125d424c9 100644
--- a/archival/libarchive/unpack_ar_archive.c
+++ b/archival/libarchive/unpack_ar_archive.c
@@ -4,7 +4,7 @@
  */
 #include "libbb.h"
 #include "bb_archive.h"
-#include "ar.h"
+#include "ar_.h"
 
 void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
 {
diff --git a/archival/rpm.c b/archival/rpm.c
index 0d8f641b9..63d13d0e1 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -83,7 +83,9 @@ struct globals {
         void *map;
         rpm_index *mytags;
         int tagcount;
-        unsigned mapsize, pagesize;
+        unsigned mapsize;
+        IF_VARIABLE_ARCH_PAGESIZE(unsigned pagesize;)
+#define G_pagesize cached_pagesize(G.pagesize)
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
@@ -142,11 +144,11 @@ static int rpm_gettags(const char *filename)
 
 #if !ENABLE_PLATFORM_MINGW32
         /* Map the store */
-        storepos = (storepos + G.pagesize) & -(int)G.pagesize;
+        storepos = (storepos + G_pagesize) & -(int)G_pagesize;
         /* remember size for munmap */
         G.mapsize = storepos;
         /* some NOMMU systems prefer MAP_PRIVATE over MAP_SHARED */
-        G.map = mmap(0, storepos, PROT_READ, MAP_PRIVATE, fd, 0);
+        G.map = mmap_read(fd, storepos);
         if (G.map == MAP_FAILED)
                 bb_perror_msg_and_die("mmap '%s'", filename);
 #else
@@ -368,7 +370,7 @@ int rpm_main(int argc, char **argv)
         int opt, func = 0;
 
         INIT_G();
-        G.pagesize = getpagesize();
+        INIT_PAGESIZE(G.pagesize);
 
         while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
                 switch (opt) {
@@ -535,7 +537,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
         int rpm_fd;
 
         INIT_G();
-        G.pagesize = getpagesize();
+        INIT_PAGESIZE(G.pagesize);
 
         rpm_fd = rpm_gettags(argv[1]);
 
diff --git a/archival/tar.c b/archival/tar.c
index 1796d4c60..6c1591bdc 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -794,7 +794,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("[--exclude PATTERN]... "))
+//usage:        IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[OPTION]... "))
 //usage:        "[FILE]..."
 //usage:#define tar_full_usage "\n\n"
 //usage:        IF_FEATURE_TAR_CREATE("Create, extract, ")
@@ -828,6 +828,11 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:        IF_FEATURE_SEAMLESS_BZ2(
 //usage:     "\n        -j      (De)compress using bzip2"
 //usage:        )
+//usage:        IF_FEATURE_SEAMLESS_LZMA(
+//usage:        IF_FEATURE_TAR_LONG_OPTIONS(
+//usage:     "\n        --lzma  (De)compress using lzma"
+//usage:        )
+//usage:        )
 //usage:     "\n        -a      (De)compress based on extension"
 //usage:        IF_FEATURE_TAR_CREATE(
 //usage:     "\n        -h      Follow symlinks"
@@ -839,21 +844,21 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:     "\n        --exclude PATTERN       Glob pattern to exclude"
 //usage:        )
 //usage:        )
+//usage:        IF_FEATURE_TAR_LONG_OPTIONS(
+//usage:     "\n        --overwrite             Replace existing files"
+//usage:     "\n        --strip-components NUM  NUM of leading components to strip"
+//usage:     "\n        --no-recursion          Don't descend in directories"
+//usage:     "\n        --numeric-owner         Use numeric user:group"
+//usage:     "\n        --no-same-permissions   Don't restore access permissions"
+//usage:        IF_FEATURE_TAR_TO_COMMAND(
+//usage:     "\n        --to-command COMMAND    Pipe files to COMMAND"
+//usage:        )
+//usage:        )
 //usage:
 //usage:#define tar_example_usage
 //usage:       "$ zcat /tmp/tarball.tar.gz | tar -xf -\n"
 //usage:       "$ tar -cf /tmp/tarball.tar /usr/local\n"
 
-// Supported but aren't in --help:
-//      lzma
-//      no-recursion
-//      numeric-owner
-//      no-same-permissions
-//      overwrite
-//IF_FEATURE_TAR_TO_COMMAND(
-//      to-command
-//)
-
 enum {
         OPTBIT_KEEP_OLD = 8,
         IF_FEATURE_TAR_CREATE(   OPTBIT_CREATE      ,)
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index d3a974706..f95f71607 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.33.0.git
-# Thu Nov 12 08:15:02 2020
+# Busybox version: 1.34.0.git
+# Thu Jan 14 12:07:38 2021
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -72,6 +72,7 @@ CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
 CONFIG_USE_PORTABLE_CODE=y
 CONFIG_STACK_OPTIMIZATION_386=y
+CONFIG_STATIC_LIBGCC=y
 
 #
 # Installation Options ("make install" behavior)
@@ -348,6 +349,7 @@ CONFIG_UNIQ=y
 CONFIG_UNLINK=y
 CONFIG_USLEEP=y
 CONFIG_UUDECODE=y
+CONFIG_BASE32=y
 CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
@@ -720,6 +722,7 @@ CONFIG_REV=y
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_EROFS is not set
 # CONFIG_FEATURE_VOLUMEID_EXFAT is not set
 # CONFIG_FEATURE_VOLUMEID_EXT is not set
 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
@@ -1002,6 +1005,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
+CONFIG_UDHCPC_DEFAULT_INTERFACE=""
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index da2419c62..cf0e3ec8e 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.33.0.git
-# Thu Nov 12 08:15:02 2020
+# Busybox version: 1.34.0.git
+# Thu Jan 14 12:07:38 2021
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -72,6 +72,7 @@ CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
 CONFIG_USE_PORTABLE_CODE=y
 CONFIG_STACK_OPTIMIZATION_386=y
+CONFIG_STATIC_LIBGCC=y
 
 #
 # Installation Options ("make install" behavior)
@@ -348,6 +349,7 @@ CONFIG_UNIQ=y
 CONFIG_UNLINK=y
 CONFIG_USLEEP=y
 CONFIG_UUDECODE=y
+CONFIG_BASE32=y
 CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
@@ -720,6 +722,7 @@ CONFIG_REV=y
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_EROFS is not set
 # CONFIG_FEATURE_VOLUMEID_EXFAT is not set
 # CONFIG_FEATURE_VOLUMEID_EXT is not set
 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
@@ -1002,6 +1005,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
+CONFIG_UDHCPC_DEFAULT_INTERFACE=""
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
diff --git a/coreutils/cp.c b/coreutils/cp.c
index cfeb19fc4..9b9b8f7bf 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -38,7 +38,7 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cp.html */
 
 //usage:#define cp_trivial_usage
-//usage:       "[OPTIONS] SOURCE... DEST"
+//usage:       "[-arPLHpfilsTu] SOURCE... DEST"
 //usage:#define cp_full_usage "\n\n"
 //usage:       "Copy SOURCE(s) to DEST\n"
 //usage:     "\n        -a      Same as -dpR"
diff --git a/coreutils/date.c b/coreutils/date.c
index 1a3ae506c..d64ff94b9 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -93,40 +93,27 @@
  */
 
 //usage:#define date_trivial_usage
-//usage:       "[OPTIONS] [+FMT] [TIME]"
+//usage:       "[OPTIONS] [+FMT] [[-s] TIME]"
 //usage:#define date_full_usage "\n\n"
 //usage:       "Display time (using +FMT), or set time\n"
-//usage:        IF_NOT_LONG_OPTS(
-//usage:         IF_NOT_PLATFORM_MINGW32(
-//usage:     "\n        [-s] TIME       Set time to TIME"
-//usage:     )
 //usage:     "\n        -u              Work in UTC (don't convert to local time)"
-//usage:     "\n        -R              Output RFC-2822 compliant date string"
-//usage:        ) IF_LONG_OPTS(
-//usage:         IF_NOT_PLATFORM_MINGW32(
-//usage:     "\n        [-s,--set] TIME Set time to TIME"
-//usage:     )
-//usage:     "\n        -u,--utc        Work in UTC (don't convert to local time)"
-//usage:     "\n        -R,--rfc-2822   Output RFC-2822 compliant date string"
+//usage:        IF_NOT_PLATFORM_MINGW32(
+//usage:     "\n        [-s] TIME       Set time to TIME"
 //usage:        )
+//usage:     "\n        -d TIME         Display TIME, not 'now'"
 //usage:        IF_FEATURE_DATE_ISOFMT(
-//usage:     "\n        -I[SPEC]        Output ISO-8601 compliant date string"
-//usage:     "\n                        SPEC='date' (default) for date only,"
-//usage:     "\n                        'hours', 'minutes', or 'seconds' for date and"
-//usage:     "\n                        time to the indicated precision"
+//usage:     "\n        -D FMT          FMT (strptime format) for -s/-d TIME conversion"
+////////^^^^^^^^^^^^^^^^^^^^^^ busybox invention, not compat
 //usage:        )
-//usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -r FILE         Display last modification time of FILE"
-//usage:     "\n        -d TIME         Display TIME, not 'now'"
-//usage:        ) IF_LONG_OPTS(
-//usage:     "\n        -r,--reference FILE     Display last modification time of FILE"
-//usage:     "\n        -d,--date TIME  Display TIME, not 'now'"
-//usage:        )
+//usage:     "\n        -R              Output RFC-2822 date"
 //usage:        IF_FEATURE_DATE_ISOFMT(
-//usage:     "\n        -D FMT          Use FMT (strptime format) for -d TIME conversion"
+//usage:     "\n        -I[SPEC]        Output ISO-8601 date"
+//usage:     "\n                        SPEC=date (default), hours, minutes, seconds or ns"
 //usage:        )
 //usage:     "\n"
 //usage:     "\nRecognized TIME formats:"
+//usage:     "\n        @seconds_since_1970"
 //usage:     "\n        hh:mm[:ss]"
 //usage:     "\n        [YYYY.]MM.DD-hh:mm[:ss]"
 //usage:     "\n        YYYY-MM-DD hh:mm[:ss]"
@@ -152,15 +139,15 @@ enum {
         OPT_UTC       = (1 << 2), /* u */
         OPT_DATE      = (1 << 3), /* d */
         OPT_REFERENCE = (1 << 4), /* r */
-        OPT_TIMESPEC  = (1 << 5) * ENABLE_FEATURE_DATE_ISOFMT, /* I */
-        OPT_HINT      = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
+        OPT_ISO8601   = (1 << 5) * ENABLE_FEATURE_DATE_ISOFMT, /* I */
+        OPT_STR2DT    = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
 #else
         OPT_SET       = (0),      /* s */
         OPT_UTC       = (1 << 1), /* u */
         OPT_DATE      = (1 << 2), /* d */
         OPT_REFERENCE = (1 << 3), /* r */
-        OPT_TIMESPEC  = (1 << 4) * ENABLE_FEATURE_DATE_ISOFMT, /* I */
-        OPT_HINT      = (1 << 5) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
+        OPT_ISO8601   = (1 << 4) * ENABLE_FEATURE_DATE_ISOFMT, /* I */
+        OPT_STR2DT    = (1 << 5) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
 #endif
 };
 
@@ -185,12 +172,6 @@ static const char date_longopts[] ALIGN1 =
  * - after xasprintf we use other xfuncs
  */
 
-static void maybe_set_utc(int opt)
-{
-        if (opt & OPT_UTC)
-                putenv((char*)"TZ=UTC0");
-}
-
 int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int date_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -198,7 +179,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
         struct tm tm_time;
         char buf_fmt_dt2str[64];
         unsigned opt;
-        int ifmt = -1;
+        int isofmt = -1;
         char *date_str;
         char *fmt_dt2str;
         char *fmt_str2dt;
@@ -229,15 +210,16 @@ int date_main(int argc UNUSED_PARAM, char **argv)
         );
         argv += optind;
 
-        maybe_set_utc(opt);
+        if (opt & OPT_UTC)
+                putenv((char*)"TZ=UTC0");
 
-        if (ENABLE_FEATURE_DATE_ISOFMT && (opt & OPT_TIMESPEC)) {
-                ifmt = 0; /* default is date */
+        if (ENABLE_FEATURE_DATE_ISOFMT && (opt & OPT_ISO8601)) {
+                isofmt = 0; /* default is date */
                 if (isofmt_arg) {
                         static const char isoformats[] ALIGN1 =
-                                "date\0""hours\0""minutes\0""seconds\0"; /* ns? */
-                        ifmt = index_in_substrings(isoformats, isofmt_arg);
-                        if (ifmt < 0)
+                                "date\0""hours\0""minutes\0""seconds\0ns\0";
+                        isofmt = index_in_substrings(isoformats, isofmt_arg);
+                        if (isofmt < 0)
                                 bb_show_usage();
                 }
         }
@@ -247,7 +229,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                 fmt_dt2str = &argv[0][1]; /* skip over the '+' */
                 argv++;
         }
-        if (!(opt & (OPT_SET | OPT_DATE))) {
+        if (!(opt & (OPT_SET | OPT_DATE))) { /* neither -s TIME nor -d TIME? */
                 opt |= OPT_SET;
                 date_str = argv[0]; /* can be NULL */
                 if (date_str) {
@@ -315,7 +297,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                 tm_time.tm_hour = 0;
 
                 /* Process any date input to UNIX time since 1 Jan 1970 */
-                if (ENABLE_FEATURE_DATE_ISOFMT && (opt & OPT_HINT)) {
+                if (ENABLE_FEATURE_DATE_ISOFMT && (opt & OPT_STR2DT)) {
                         if (strptime(date_str, fmt_str2dt, &tm_time) == NULL)
                                 bb_error_msg_and_die(bb_msg_invalid_date, date_str);
                 } else {
@@ -341,24 +323,34 @@ int date_main(int argc UNUSED_PARAM, char **argv)
         if (fmt_dt2str == NULL) {
                 int i;
                 fmt_dt2str = buf_fmt_dt2str;
-                if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) {
-                        /* -I[SPEC]: 0:date 1:hours 2:minutes 3:seconds */
+                if (ENABLE_FEATURE_DATE_ISOFMT && isofmt >= 0) {
+                        /* -I[SPEC]: 0:date 1:hours 2:minutes 3:seconds 4:ns*/
                         strcpy(fmt_dt2str, "%Y-%m-%dT%H:%M:%S");
-                        i = 8 + 3 * ifmt;
-                        if (ifmt != 0) {
-                                /* TODO: if (ifmt==4) i += sprintf(&fmt_dt2str[i], ",%09u", nanoseconds); */
- format_utc:
-                                fmt_dt2str[i++] = '%';
-                                fmt_dt2str[i++] = (opt & OPT_UTC) ? 'Z' : 'z';
+                        i = 8 + 3 * isofmt;
+                        if (isofmt != 0) {
+                                int n;
+                                if (isofmt == 4) {
+                                        i -= 3;
+                                        i += sprintf(&fmt_dt2str[i], ",%09u", (unsigned)ts.tv_nsec);
+                                }
+                                /* %z prints "+hhmm" timezone, but coreutils-8.30 prints "+hh:mm"! */
+                                /* ...therefore this atrocity: */
+                                n = strftime(&fmt_dt2str[i], 8, "%z", &tm_time);
+                                i += n;
+                                if (n == 5 && (fmt_dt2str[i-5] == '+' || fmt_dt2str[i-5] == '-')) {
+                                        /* "mm" -> ":mm" */
+                                        fmt_dt2str[i    ] = fmt_dt2str[i - 1];
+                                        fmt_dt2str[i - 1] = fmt_dt2str[i - 2];
+                                        fmt_dt2str[i - 2] = ':';
+                                        i++;
+                                }
                         }
                         fmt_dt2str[i] = '\0';
                 } else if (opt & OPT_RFC2822) {
                         /* -R. undo busybox.c setlocale */
                         if (ENABLE_LOCALE_SUPPORT)
                                 setlocale(LC_TIME, "C");
-                        strcpy(fmt_dt2str, "%a, %d %b %Y %H:%M:%S ");
-                        i = sizeof("%a, %d %b %Y %H:%M:%S ")-1;
-                        goto format_utc;
+                        fmt_dt2str = (char*)"%a, %d %b %Y %H:%M:%S %z";
                 } else { /* default case */
                         fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y";
                 }
@@ -410,10 +402,6 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                 /* With no format string, just print a blank line */
                 date_buf[0] = '\0';
         } else {
-                /* Handle special conversions */
-                if (is_prefixed_with(fmt_dt2str, "%f")) {
-                        fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
-                }
                 /* Generate output string */
                 strftime(date_buf, COMMON_BUFSIZE, fmt_dt2str, &tm_time);
         }
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 042355e24..c150ef5bc 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -59,7 +59,7 @@
 //usage:       "[if=FILE] [of=FILE] [" IF_FEATURE_DD_IBS_OBS("ibs=N obs=N/") "bs=N] [count=N] [skip=N] [seek=N]\n"
 //usage:        IF_FEATURE_DD_IBS_OBS(
 //usage:       "        [conv=notrunc|noerror|sync|fsync]\n"
-//usage:       "        [iflag=skip_bytes|fullblock] [oflag=seek_bytes|append]"
+//usage:       "        [iflag=skip_bytes|fullblock|direct] [oflag=seek_bytes|append|direct]"
 //usage:        )
 //usage:#define dd_full_usage "\n\n"
 //usage:       "Copy a file with converting and formatting\n"
@@ -82,9 +82,11 @@
 //usage:     "\n        conv=fsync      Physically write data out before finishing"
 //usage:     "\n        conv=swab       Swap every pair of bytes"
 //usage:     "\n        iflag=skip_bytes        skip=N is in bytes"
-//usage:     "\n        iflag=fullblock Read full blocks"
 //usage:     "\n        oflag=seek_bytes        seek=N is in bytes"
-//usage:     "\n        oflag=append    Open output file in append mode"
+//usage:     "\n        iflag=direct    O_DIRECT input"
+//usage:     "\n        oflag=direct    O_DIRECT output"
+//usage:     "\n        iflag=fullblock Read full blocks"
+//usage:     "\n        oflag=append    Open output in append mode"
 //usage:        )
 //usage:        IF_FEATURE_DD_STATUS(
 //usage:     "\n        status=noxfer   Suppress rate output"
@@ -140,16 +142,18 @@ enum {
         FLAG_IFLAG_SHIFT = 5,
         FLAG_SKIP_BYTES = (1 << 5) * ENABLE_FEATURE_DD_IBS_OBS,
         FLAG_FULLBLOCK = (1 << 6) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_IDIRECT = (1 << 7) * ENABLE_FEATURE_DD_IBS_OBS,
         /* end of input flags */
         /* start of output flags */
-        FLAG_OFLAG_SHIFT = 7,
-        FLAG_SEEK_BYTES = (1 << 7) * ENABLE_FEATURE_DD_IBS_OBS,
-        FLAG_APPEND = (1 << 8) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_OFLAG_SHIFT = 8,
+        FLAG_SEEK_BYTES = (1 << 8) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_APPEND = (1 << 9) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_ODIRECT = (1 << 10) * ENABLE_FEATURE_DD_IBS_OBS,
         /* end of output flags */
-        FLAG_TWOBUFS = (1 << 9) * ENABLE_FEATURE_DD_IBS_OBS,
-        FLAG_COUNT   = 1 << 10,
-        FLAG_STATUS_NONE = 1 << 11,
-        FLAG_STATUS_NOXFER = 1 << 12,
+        FLAG_TWOBUFS = (1 << 11) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_COUNT   = 1 << 12,
+        FLAG_STATUS_NONE = 1 << 13,
+        FLAG_STATUS_NOXFER = 1 << 14,
 };
 
 static void dd_output_status(int UNUSED_PARAM cur_signal)
@@ -195,12 +199,50 @@ static void dd_output_status(int UNUSED_PARAM cur_signal)
 #endif
 }
 
+#if ENABLE_FEATURE_DD_IBS_OBS
+static int clear_O_DIRECT(int fd)
+{
+        if (errno == EINVAL) {
+                int fl = fcntl(fd, F_GETFL);
+                if (fl & O_DIRECT) {
+                        fcntl(fd, F_SETFL, fl & ~O_DIRECT);
+                        return 1;
+                }
+        }
+        return 0;
+}
+#endif
+
+static ssize_t dd_read(void *ibuf, size_t ibs)
+{
+        ssize_t n;
+
+#if ENABLE_FEATURE_DD_IBS_OBS
+ read_again:
+        if (G.flags & FLAG_FULLBLOCK)
+                n = full_read(ifd, ibuf, ibs);
+        else
+#endif
+                n = safe_read(ifd, ibuf, ibs);
+#if ENABLE_FEATURE_DD_IBS_OBS
+        if (n < 0 && (G.flags & FLAG_IDIRECT) && clear_O_DIRECT(ifd))
+                goto read_again;
+#endif
+        return n;
+}
+
 static bool write_and_stats(const void *buf, size_t len, size_t obs,
         const char *filename)
 {
         ssize_t n;
 
+ IF_FEATURE_DD_IBS_OBS(write_again:)
         n = full_write(ofd, buf, len);
+#if ENABLE_FEATURE_DD_IBS_OBS
+        if (n < 0 && (G.flags & FLAG_ODIRECT) && clear_O_DIRECT(ofd))
+                goto write_again;
+#endif
+
 #if ENABLE_FEATURE_DD_THIRD_STATUS_LINE
         if (n > 0)
                 G.total_bytes += n;
@@ -257,6 +299,16 @@ static int parse_comma_flags(char *val, const char *words, const char *error_in)
 }
 #endif
 
+static void *alloc_buf(size_t size)
+{
+#if !ENABLE_PLATFORM_MINGW32
+        /* Important for "{i,o}flag=direct" - buffers must be page aligned */
+        if (size >= bb_getpagesize())
+                return xmmap_anon(size);
+#endif
+        return xmalloc(size);
+}
+
 int dd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dd_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -270,9 +322,9 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         static const char conv_words[] ALIGN1 =
                 "notrunc\0""sync\0""noerror\0""fsync\0""swab\0";
         static const char iflag_words[] ALIGN1 =
-                "skip_bytes\0""fullblock\0";
+                "skip_bytes\0""fullblock\0""direct\0";
         static const char oflag_words[] ALIGN1 =
-                "seek_bytes\0append\0";
+                "seek_bytes\0append\0""direct\0";
 #endif
 #if ENABLE_FEATURE_DD_STATUS
         static const char status_words[] ALIGN1 =
@@ -313,7 +365,9 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         //swab          swap every pair of input bytes: will abort on non-even reads
                 OP_iflag_skip_bytes,
                 OP_iflag_fullblock,
+                OP_iflag_direct,
                 OP_oflag_seek_bytes,
+                OP_oflag_direct,
 #endif
         };
         smallint exitcode = EXIT_FAILURE;
@@ -429,13 +483,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #endif
         } /* end of "for (argv[i])" */
 
-//XXX:FIXME for huge ibs or obs, malloc'ing them isn't the brightest idea ever
-        ibuf = xmalloc(ibs);
+        ibuf = alloc_buf(ibs);
         obuf = ibuf;
 #if ENABLE_FEATURE_DD_IBS_OBS
         if (ibs != obs) {
                 G.flags |= FLAG_TWOBUFS;
-                obuf = xmalloc(obs);
+                obuf = alloc_buf(obs);
         }
 #endif
 
@@ -447,10 +500,15 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         if (infile) {
+                int iflag = O_RDONLY;
+#if ENABLE_FEATURE_DD_IBS_OBS
+                if (G.flags & FLAG_IDIRECT)
+                        iflag |= O_DIRECT;
+#endif
 #if !ENABLE_PLATFORM_MINGW32
-                xmove_fd(xopen(infile, O_RDONLY), ifd);
+                xmove_fd(xopen(infile, iflag), ifd);
 #else
-                xmove_fd(mingw_xopen(infile, O_RDONLY), ifd);
+                xmove_fd(mingw_xopen(infile, iflag), ifd);
                 update_dev_fd(get_dev_type(infile), ifd);
 #endif
         } else {
@@ -463,7 +521,10 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                         oflag |= O_TRUNC;
                 if (G.flags & FLAG_APPEND)
                         oflag |= O_APPEND;
-
+#if ENABLE_FEATURE_DD_IBS_OBS
+                if (G.flags & FLAG_ODIRECT)
+                        oflag |= O_DIRECT;
+#endif
                 xmove_fd(xopen(outfile, oflag), ofd);
 
 #if ENABLE_PLATFORM_MINGW32
@@ -508,13 +569,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 size_t blocksz = (G.flags & FLAG_SKIP_BYTES) ? 1 : ibs;
                 if (lseek(ifd, skip * blocksz, SEEK_CUR) < 0) {
                         do {
-                                ssize_t n;
-#if ENABLE_FEATURE_DD_IBS_OBS
-                                if (G.flags & FLAG_FULLBLOCK)
-                                        n = full_read(ifd, ibuf, blocksz);
-                                else
-#endif
-                                        n = safe_read(ifd, ibuf, blocksz);
+                                ssize_t n = dd_read(ibuf, blocksz);
                                 if (n < 0)
                                         goto die_infile;
                                 if (n == 0)
@@ -529,14 +584,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         }
 
         while (!(G.flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
-                ssize_t n;
-
-#if ENABLE_FEATURE_DD_IBS_OBS
-                if (G.flags & FLAG_FULLBLOCK)
-                        n = full_read(ifd, ibuf, ibs);
-                else
-#endif
-                        n = safe_read(ifd, ibuf, ibs);
+                ssize_t n = dd_read(ibuf, ibs);
                 if (n == 0)
                         break;
                 if (n < 0) {
@@ -631,11 +679,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         if (!ENABLE_FEATURE_DD_STATUS || !(G.flags & FLAG_STATUS_NONE))
                 dd_output_status(0);
 
+#if 0 /* can't just free(), they can be mmap()ed */
         if (ENABLE_FEATURE_CLEAN_UP) {
                 free(obuf);
                 if (G.flags & FLAG_TWOBUFS)
                         free(ibuf);
         }
+#endif
 
         return exitcode;
 }
diff --git a/coreutils/factor.c b/coreutils/factor.c
index 47fe179dc..a7a5a5030 100644
--- a/coreutils/factor.c
+++ b/coreutils/factor.c
@@ -19,6 +19,7 @@
 //usage:       "Print prime factors"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #if 0
 # define dbg(...) bb_error_msg(__VA_ARGS__)
@@ -42,9 +43,116 @@ typedef unsigned long half_t;
 #error Cant find an integer type which is half as wide as ullong
 #endif
 
+/* The trial divisor increment wheel.  Use it to skip over divisors that
+ * are composites of 2, 3, 5, 7, or 11.
+ * Larger wheels improve sieving only slightly, but quickly grow in size
+ * (adding just one prime, 13, results in 5766 element sieve).
+ */
+#define R(a,b,c,d,e,f,g,h,i,j,A,B,C,D,E,F,G,H,I,J) \
+        (((uint64_t)(a<<0) | (b<<3) | (c<<6) | (d<<9) | (e<<12) | (f<<15) | (g<<18) | (h<<21) | (i<<24) | (j<<27)) << 1) | \
+        (((uint64_t)(A<<0) | (B<<3) | (C<<6) | (D<<9) | (E<<12) | (F<<15) | (G<<18) | (H<<21) | (I<<24) | (J<<27)) << 31)
+#define P(a,b,c,d,e,f,g,h,i,j,A,B,C,D,E,F,G,H,I,J) \
+        R(      (a/2),(b/2),(c/2),(d/2),(e/2),(f/2),(g/2),(h/2),(i/2),(j/2), \
+                (A/2),(B/2),(C/2),(D/2),(E/2),(F/2),(G/2),(H/2),(I/2),(J/2)  )
+static const uint64_t packed_wheel[] = {
+        /*1, 2, 2, 4, 2,*/
+        P( 4, 2, 4, 6, 2, 6, 4, 2, 4, 6, 6, 2, 6, 4, 2, 6, 4, 6, 8, 4), //01
+        P( 2, 4, 2, 4,14, 4, 6, 2,10, 2, 6, 6, 4, 2, 4, 6, 2,10, 2, 4), //02
+        P( 2,12,10, 2, 4, 2, 4, 6, 2, 6, 4, 6, 6, 6, 2, 6, 4, 2, 6, 4), //03
+        P( 6, 8, 4, 2, 4, 6, 8, 6,10, 2, 4, 6, 2, 6, 6, 4, 2, 4, 6, 2), //04
+        P( 6, 4, 2, 6,10, 2,10, 2, 4, 2, 4, 6, 8, 4, 2, 4,12, 2, 6, 4), //05
+        P( 2, 6, 4, 6,12, 2, 4, 2, 4, 8, 6, 4, 6, 2, 4, 6, 2, 6,10, 2), //06
+        P( 4, 6, 2, 6, 4, 2, 4, 2,10, 2,10, 2, 4, 6, 6, 2, 6, 6, 4, 6), //07
+        P( 6, 2, 6, 4, 2, 6, 4, 6, 8, 4, 2, 6, 4, 8, 6, 4, 6, 2, 4, 6), //08
+        P( 8, 6, 4, 2,10, 2, 6, 4, 2, 4, 2,10, 2,10, 2, 4, 2, 4, 8, 6), //09
+        P( 4, 2, 4, 6, 6, 2, 6, 4, 8, 4, 6, 8, 4, 2, 4, 2, 4, 8, 6, 4), //10
+        P( 6, 6, 6, 2, 6, 6, 4, 2, 4, 6, 2, 6, 4, 2, 4, 2,10, 2,10, 2), //11
+        P( 6, 4, 6, 2, 6, 4, 2, 4, 6, 6, 8, 4, 2, 6,10, 8, 4, 2, 4, 2), //12
+        P( 4, 8,10, 6, 2, 4, 8, 6, 6, 4, 2, 4, 6, 2, 6, 4, 6, 2,10, 2), //13
+        P(10, 2, 4, 2, 4, 6, 2, 6, 4, 2, 4, 6, 6, 2, 6, 6, 6, 4, 6, 8), //14
+        P( 4, 2, 4, 2, 4, 8, 6, 4, 8, 4, 6, 2, 6, 6, 4, 2, 4, 6, 8, 4), //15
+        P( 2, 4, 2,10, 2,10, 2, 4, 2, 4, 6, 2,10, 2, 4, 6, 8, 6, 4, 2), //16
+        P( 6, 4, 6, 8, 4, 6, 2, 4, 8, 6, 4, 6, 2, 4, 6, 2, 6, 6, 4, 6), //17
+        P( 6, 2, 6, 6, 4, 2,10, 2,10, 2, 4, 2, 4, 6, 2, 6, 4, 2,10, 6), //18
+        P( 2, 6, 4, 2, 6, 4, 6, 8, 4, 2, 4, 2,12, 6, 4, 6, 2, 4, 6, 2), //19
+        P(12, 4, 2, 4, 8, 6, 4, 2, 4, 2,10, 2,10, 6, 2, 4, 6, 2, 6, 4), //20
+        P( 2, 4, 6, 6, 2, 6, 4, 2,10, 6, 8, 6, 4, 2, 4, 8, 6, 4, 6, 2), //21
+        P( 4, 6, 2, 6, 6, 6, 4, 6, 2, 6, 4, 2, 4, 2,10,12, 2, 4, 2,10), //22
+        P( 2, 6, 4, 2, 4, 6, 6, 2,10, 2, 6, 4,14, 4, 2, 4, 2, 4, 8, 6), //23
+        P( 4, 6, 2, 4, 6, 2, 6, 6, 4, 2, 4, 6, 2, 6, 4, 2, 4,12, 2,12), //24
+};
+#undef P
+#undef R
+#define WHEEL_START 5
+#define WHEEL_SIZE (5 + 24 * 20)
+#define square_count (((uint8_t*)&bb_common_bufsiz1)[0])
+#define wheel_tab    (((uint8_t*)&bb_common_bufsiz1) + 1)
+/*
+ * Why, you ask?
+ * plain byte array:
+ *      function                old     new   delta
+ *      wheel_tab                 -     485    +485
+ * 3-bit-packed insanity:
+ *      packed_wheel              -     192    +192
+ *      factor_main             108     171     +63
+ */
+static void unpack_wheel(void)
+{
+        int i;
+        uint8_t *p;
+
+        setup_common_bufsiz();
+        wheel_tab[0] = 1;
+        wheel_tab[1] = 2;
+        wheel_tab[2] = 2;
+        wheel_tab[3] = 4;
+        wheel_tab[4] = 2;
+        p = &wheel_tab[5];
+        for (i = 0; i < ARRAY_SIZE(packed_wheel); i++) {
+                uint64_t v = packed_wheel[i];
+                while ((v & 0xe) != 0) {
+                        *p = v & 0xe;
+                        //printf("%2u,", *p);
+                        p++;
+                        v >>= 3;
+                }
+                //printf("\n");
+        }
+}
+
+/* Prevent inlining, factorize() needs all help it can get with reducing register pressure */
+static NOINLINE void print_w(wide_t n)
+{
+        unsigned rep = square_count;
+        do
+                printf(" %"LL_FMT"u", n);
+        while (--rep != 0);
+}
+static NOINLINE void print_h(half_t n)
+{
+        print_w(n);
+}
+
+static void factorize(wide_t N);
+
 static half_t isqrt_odd(wide_t N)
 {
         half_t s = isqrt(N);
+        /* s^2 is <= N, (s+1)^2 > N */
+
+        /* If s^2 in fact is EQUAL to N, it's very lucky.
+         * Examples:
+         * factor 18446743988964486098 = 2 * 3037000493 * 3037000493
+         * factor 18446743902517389507 = 3 * 2479700513 * 2479700513
+         */
+        if ((wide_t)s * s == N) {
+                /* factorize sqrt(N), printing each factor twice */
+                square_count *= 2;
+                factorize(s);
+                /* Let caller know we recursed */
+                return 0;
+        }
+
         /* Subtract 1 from even s, odd s won't change: */
         /* (doesnt work for zero, but we know that s != 0 here) */
         s = (s - 1) | 1;
@@ -53,43 +161,20 @@ static half_t isqrt_odd(wide_t N)
 
 static NOINLINE void factorize(wide_t N)
 {
+        unsigned w;
         half_t factor;
         half_t max_factor;
-        // unsigned count3;
-        // unsigned count5;
-        // unsigned count7;
-        // ^^^^^^^^^^^^^^^ commented-out simple sieving code (easier to grasp).
-        // Faster sieving, using one word for potentially up to 6 counters:
-        // count upwards in each mask, counter "triggers" when it sets its mask to "100[0]..."
-        // 10987654321098765432109876543210 - bits 31-0 in 32-bit word
-        //    17777713333311111777775555333 - bit masks for counters for primes 3,5,7,11,13,17
-        //         100000100001000010001001 - value for adding 1 to each mask
-        //    10000010000010000100001000100 - value for checking that any mask reached msb
-        enum {
-                SHIFT_3 = 1 << 0,
-                SHIFT_5 = 1 << 3,
-                SHIFT_7 = 1 << 7,
-                INCREMENT_EACH = SHIFT_3 | SHIFT_5 | SHIFT_7,
-                MULTIPLE_OF_3 = 1 << 2,
-                MULTIPLE_OF_5 = 1 << 6,
-                MULTIPLE_OF_7 = 1 << 11,
-                MULTIPLE_DETECTED = MULTIPLE_OF_3 | MULTIPLE_OF_5 | MULTIPLE_OF_7,
-        };
-        unsigned sieve_word;
 
         if (N < 4)
                 goto end;
 
-        while (!(N & 1)) {
-                printf(" 2");
-                N >>= 1;
-        }
-
         /* The code needs to be optimized for the case where
          * there are large prime factors. For example,
          * this is not hard:
          * 8262075252869367027 = 3 7 17 23 47 101 113 127 131 137 823
-         * (the largest factor to test is only ~sqrt(823) = 28)
+         *  (the largest divisor to test for largest factor 823
+         *  is only ~sqrt(823) = 28, the entire factorization needs
+         *  only ~33 trial divisions)
          * but this is:
          * 18446744073709551601 = 53 348051774975651917
          * the last factor requires testing up to
@@ -98,70 +183,37 @@ static NOINLINE void factorize(wide_t N)
          * factor 18446744073709551557 (0xffffffffffffffc5).
          */
         max_factor = isqrt_odd(N);
-        // count3 = 3;
-        // count5 = 6;
-        // count7 = 9;
-        sieve_word = 0
-                /* initial count for SHIFT_n is (n-1)/2*3: */
-                + (MULTIPLE_OF_3 - 3 * SHIFT_3)
-                + (MULTIPLE_OF_5 - 6 * SHIFT_5)
-                + (MULTIPLE_OF_7 - 9 * SHIFT_7)
-                //+ (MULTIPLE_OF_11 - 15 * SHIFT_11)
-                //+ (MULTIPLE_OF_13 - 18 * SHIFT_13)
-                //+ (MULTIPLE_OF_17 - 24 * SHIFT_17)
-        ;
-        factor = 3;
+        if (!max_factor)
+                return; /* square was detected and recursively factored */
+        factor = 2;
+        w = 0;
         for (;;) {
+                half_t fw;
+
                 /* The division is the most costly part of the loop.
                  * On 64bit CPUs, takes at best 12 cycles, often ~20.
                  */
                 while ((N % factor) == 0) { /* not likely */
                         N = N / factor;
-                        printf(" %"HALF_FMT"u", factor);
+                        print_h(factor);
                         max_factor = isqrt_odd(N);
+                        if (!max_factor)
+                                return; /* square was detected */
                 }
- next_factor:
                 if (factor >= max_factor)
                         break;
-                factor += 2;
-                /* Rudimentary wheel sieving: skip multiples of 3, 5 and 7:
-                 * Every third odd number is divisible by three and thus isn't a prime:
-                 * 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47...
-                 * ^ ^   ^  ^     ^  ^     ^  _     ^  ^     _  ^     ^  ^     ^
-                 * (^ = primes, _ = would-be-primes-if-not-divisible-by-5)
-                 * The numbers with space under them are excluded by sieve 3.
-                 */
-                // count7--;
-                // count5--;
-                // count3--;
-                // if (count3 && count5 && count7)
-                //      continue;
-                sieve_word += INCREMENT_EACH;
-                if (!(sieve_word & MULTIPLE_DETECTED))
+                fw = factor + wheel_tab[w];
+                if (fw < factor)
+                        break; /* overflow */
+                factor = fw;
+                w++;
+                if (w < WHEEL_SIZE)
                         continue;
-                /*
-                 * "factor" is multiple of 3 33% of the time (count3 reached 0),
-                 * else, multiple of 5 13% of the time,
-                 * else, multiple of 7 7.6% of the time.
-                 * Cumulatively, with 3,5,7 sieving we are here 54.3% of the time.
-                 */
-                // if (count3 == 0)
-                //      count3 = 3;
-                if (sieve_word & MULTIPLE_OF_3)
-                        sieve_word -= SHIFT_3 * 3;
-                // if (count5 == 0)
-                //      count5 = 5;
-                if (sieve_word & MULTIPLE_OF_5)
-                        sieve_word -= SHIFT_5 * 5;
-                // if (count7 == 0)
-                //      count7 = 7;
-                if (sieve_word & MULTIPLE_OF_7)
-                        sieve_word -= SHIFT_7 * 7;
-                goto next_factor;
+                w = WHEEL_START;
         }
  end:
         if (N > 1)
-                printf(" %"LL_FMT"u", N);
+                print_w(N);
         bb_putchar('\n');
 }
 
@@ -176,12 +228,15 @@ static void factorize_numstr(const char *numstr)
         if (errno)
                 bb_show_usage();
         printf("%"LL_FMT"u:", N);
+        square_count = 1;
         factorize(N);
 }
 
 int factor_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int factor_main(int argc UNUSED_PARAM, char **argv)
 {
+        unpack_wheel();
+
         //// coreutils has undocumented option ---debug (three dashes)
         //getopt32(argv, "");
         //argv += optind;
diff --git a/coreutils/id.c b/coreutils/id.c
index f20cd7d09..78d5f2a50 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -33,7 +33,7 @@
 /* BB_AUDIT SUSv3 compliant. */
 
 //usage:#define id_trivial_usage
-//usage:       "[OPTIONS] [USER]"
+//usage:       "[-ugGnr"IF_SELINUX("Z")"] [USER]"
 //usage:#define id_full_usage "\n\n"
 //usage:       "Print information about USER or the current user\n"
 //usage:        IF_SELINUX(
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 5591e8335..2dcf79c07 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -21,14 +21,14 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */
 
 //usage:#define ln_trivial_usage
-//usage:       "[OPTIONS] TARGET... LINK|DIR"
+//usage:       "[-sfnbtv] [-S SUF] TARGET... LINK|DIR"
 //usage:#define ln_full_usage "\n\n"
 //usage:       "Create a link LINK or DIR/TARGET to the specified TARGET(s)\n"
 //usage:     "\n        -s      Make symlinks instead of hardlinks"
 //usage:     "\n        -f      Remove existing destinations"
 //usage:     "\n        -n      Don't dereference symlinks - treat like normal file"
 //usage:     "\n        -b      Make a backup of the target (if exists) before link operation"
-//usage:     "\n        -S suf  Use suffix instead of ~ when making backup files"
+//usage:     "\n        -S SUF  Use suffix instead of ~ when making backup files"
 //usage:     "\n        -T      Treat LINK as a file, not DIR"
 //usage:     "\n        -v      Verbose"
 //usage:
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index ba26c985a..4efa23061 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -117,8 +117,8 @@
 //usage:     "\n        -c      Check sums against list in FILEs"
 //usage:     "\n        -s      Don't output anything, status code shows success"
 //usage:     "\n        -w      Warn about improperly formatted checksum lines"
-//usage:     "\n        -a BITS 224 (default), 256, 384, 512"
 //usage:        )
+//usage:     "\n        -a BITS 224 (default), 256, 384, 512"
 
 //FIXME: GNU coreutils 8.25 has no -s option, it has only these two long opts:
 // --quiet   don't print OK for each successfully verified file
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 0ee1d1f72..d5e0f512b 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -27,7 +27,7 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/mkdir.html */
 
 //usage:#define mkdir_trivial_usage
-//usage:       "[OPTIONS] DIRECTORY..."
+//usage:       "[-m MODE] [-p] DIRECTORY..."
 //usage:#define mkdir_full_usage "\n\n"
 //usage:       "Create DIRECTORY\n"
 //usage:     "\n        -m MODE Mode"
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index eee0ac71d..b10fe4fc3 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -36,7 +36,9 @@
 //usage:       "$ mknod /dev/fd0 b 2 0\n"
 //usage:       "$ mknod -m 644 /tmp/pipe p\n"
 
-#include <sys/sysmacros.h>  // For makedev
+#ifdef __linux__
+# include <sys/sysmacros.h>  // For makedev
+#endif
 
 #include "libbb.h"
 #include "libcoreutils/coreutils.h"
diff --git a/coreutils/nl.c b/coreutils/nl.c
index aea019c56..800b73c26 100644
--- a/coreutils/nl.c
+++ b/coreutils/nl.c
@@ -19,7 +19,7 @@
 //usage:#define nl_full_usage "\n\n"
 //usage:       "Write FILEs to standard output with line numbers added\n"
 //usage:     "\n        -b STYLE        Which lines to number - a: all, t: nonempty, n: none"
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^TODO: support "pBRE": number only lines thatmatch regexp BRE"
+//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^TODO: support "pBRE": number only lines that match regexp BRE"
 ////usage:     "\n      -f STYLE        footer lines"
 ////usage:     "\n      -h STYLE        header lines"
 ////usage:     "\n      -d CC           use CC for separating logical pages"
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index ea1ab9de8..76ee5137a 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -634,7 +634,7 @@ decode_one_format(const char *s_orig, const char *s, struct tspec *tspec)
                                 bytes_to_unsigned_dec_digits,
                                 bytes_to_hex_digits,
                         };
-                        static const char doux_fmtstring[][sizeof(" %%0%u%s")] = {
+                        static const char doux_fmtstring[][sizeof(" %%0%u%s")] ALIGN1 = {
                                 " %%%u%s",
                                 " %%0%u%s",
                                 " %%%u%s",
@@ -1155,7 +1155,7 @@ dump_strings(off_t address, off_t end_offset)
 static int
 parse_old_offset(const char *s, off_t *offset)
 {
-        static const struct suffix_mult Bb[] = {
+        static const struct suffix_mult Bb[] ALIGN_SUFFIX = {
                 { "B", 1024 },
                 { "b", 512 },
                 { "", 0 }
diff --git a/coreutils/paste.c b/coreutils/paste.c
index 11743297a..fd2aa5027 100644
--- a/coreutils/paste.c
+++ b/coreutils/paste.c
@@ -18,7 +18,7 @@
 //kbuild:lib-$(CONFIG_PASTE) += paste.o
 
 //usage:#define paste_trivial_usage
-//usage:       "[OPTIONS] [FILE]..."
+//usage:       "[-d LIST] [-s] [FILE]..."
 //usage:#define paste_full_usage "\n\n"
 //usage:       "Paste lines from each input file, separated with tab\n"
 //usage:     "\n        -d LIST Use delimiters from LIST, not tab"
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 5092a5dfc..addf41188 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -20,7 +20,7 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
 
 //usage:#define rmdir_trivial_usage
-//usage:       "[OPTIONS] DIRECTORY..."
+//usage:       "[-p] DIRECTORY..."
 //usage:#define rmdir_full_usage "\n\n"
 //usage:       "Remove DIRECTORY if it is empty\n"
 //usage:     "\n        -p      Include parents"
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 07c327645..b194847d1 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -43,7 +43,7 @@
 
 //usage:#define sort_trivial_usage
 //usage:       "[-nru"
-//usage:        IF_FEATURE_SORT_BIG("gMcszbdfiokt] [-o FILE] [-k start[.offset][opts][,end[.offset][opts]] [-t CHAR")
+//usage:        IF_FEATURE_SORT_BIG("gMcszbdfiokt] [-o FILE] [-k START[.OFS][OPTS][,END[.OFS][OPTS]] [-t CHAR")
 //usage:       "] [FILE]..."
 //usage:#define sort_full_usage "\n\n"
 //usage:       "Sort lines of text\n"
diff --git a/coreutils/split.c b/coreutils/split.c
index ecbc9d2d8..3fcfd95f2 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -44,7 +44,7 @@
 #include "common_bufsiz.h"
 
 #if ENABLE_FEATURE_SPLIT_FANCY
-static const struct suffix_mult split_suffixes[] = {
+static const struct suffix_mult split_suffixes[] ALIGN_SUFFIX = {
         { "b", 512 },
         { "k", 1024 },
         { "m", 1024*1024 },
diff --git a/coreutils/stat.c b/coreutils/stat.c
index c332e5dc8..0a3f251f3 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -40,7 +40,7 @@
 //kbuild:lib-$(CONFIG_STAT) += stat.o
 
 //usage:#define stat_trivial_usage
-//usage:       "[OPTIONS] FILE..."
+//usage:       "[-lt"IF_FEATURE_STAT_FILESYSTEM("f")"] "IF_FEATURE_STAT_FORMAT("[-c FMT] ")"FILE..."
 //usage:#define stat_full_usage "\n\n"
 //usage:       "Display file"
 //usage:            IF_FEATURE_STAT_FILESYSTEM(" (default) or filesystem")
@@ -209,7 +209,7 @@ FS_TYPE(0x62656572, "sysfs")
 static const char *human_fstype(uint32_t f_type)
 {
 # define FS_TYPE(type, name) type,
-        static const uint32_t fstype[] = {
+        static const uint32_t fstype[] ALIGN4 = {
                 FS_TYPE_LIST
         };
 # undef FS_TYPE
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 40e812799..19253964c 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -487,7 +487,7 @@ static const char mode_name[] ALIGN1 =
 #undef MI_ENTRY
 #define MI_ENTRY(N,T,F,B,M) { T, F, M, B },
 
-static const struct mode_info mode_info[] = {
+static const struct mode_info mode_info[] ALIGN4 = {
         /* This should be verbatim cut-n-paste copy of the above MI_ENTRYs */
         MI_ENTRY("evenp",    combination, REV        | OMIT, 0,          0 )
         MI_ENTRY("parity",   combination, REV        | OMIT, 0,          0 )
@@ -905,7 +905,7 @@ static void display_window_size(int fancy)
         }
 }
 
-static const struct suffix_mult stty_suffixes[] = {
+static const struct suffix_mult stty_suffixes[] ALIGN_SUFFIX = {
         { "b",  512 },
         { "k", 1024 },
         { "B", 1024 },
diff --git a/coreutils/test.c b/coreutils/test.c
index ac7b546a3..7c6574334 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -306,7 +306,7 @@ struct operator_t {
         unsigned char op_num, op_type;
 };
 
-static const struct operator_t ops_table[] = {
+static const struct operator_t ops_table[] ALIGN2 = {
         { /* "-r" */ FILRD   , UNOP   },
         { /* "-w" */ FILWR   , UNOP   },
         { /* "-x" */ FILEX   , UNOP   },
diff --git a/coreutils/timeout.c b/coreutils/timeout.c
index 06c134a37..204a7ab92 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -41,7 +41,7 @@
 //usage:#define timeout_trivial_usage
 //usage:       "[-s SIG] SECS PROG ARGS"
 //usage:#define timeout_full_usage "\n\n"
-//usage:       "Runs PROG. Sends SIG to it if it is not gone in SECS seconds.\n"
+//usage:       "Run PROG. Send SIG to it if it is not gone in SECS seconds.\n"
 //usage:       "Default SIG: TERM."
 
 #include "libbb.h"
@@ -130,7 +130,7 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
  grandchild:
                 /* Just sleep(HUGE_NUM); kill(parent) may kill wrong process! */
                 while (1) {
-                        sleep(1);
+                        sleep1();
                         if (--timeout <= 0)
                                 break;
                         if (kill(parent, 0)) {
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 317f45531..e1594286f 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -20,7 +20,7 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */
 
 //usage:#define uniq_trivial_usage
-//usage:       "[-cdu][-f,s,w N] [INPUT [OUTPUT]]"
+//usage:       "[-cdui] [-f,s,w N] [INPUT [OUTPUT]]"
 //usage:#define uniq_full_usage "\n\n"
 //usage:       "Discard duplicate lines\n"
 //usage:     "\n        -c      Prefix lines by the number of occurrences"
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 5b2edd649..164b208ea 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -168,9 +168,11 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 }
 #endif
 
-//applet:IF_BASE64(APPLET(base64, BB_DIR_BIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_BASE64) += uudecode.o
+//config:config BASE32
+//config:       bool "base32 (4.9 kb)"
+//config:       default y
+//config:       help
+//config:       Base32 encode and decode
 
 //config:config BASE64
 //config:       bool "base64 (4.9 kb)"
@@ -178,49 +180,165 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 //config:       help
 //config:       Base64 encode and decode
 
+//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:     "\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"
+
 //usage:#define base64_trivial_usage
-//usage:        "[-d] [FILE]"
+//usage:        "[-d] [-w COL] [FILE]"
 //usage:#define base64_full_usage "\n\n"
 //usage:       "Base64 encode or decode FILE to standard output"
 //usage:     "\n        -d      Decode data"
-////usage:     "\n      -w COL  Wrap lines at COL (default 76, 0 disables)"
+//usage:     "\n        -w COL  Wrap lines at COL (default 76, 0 disables)"
 ////usage:     "\n      -i      When decoding, ignore non-alphabet characters"
 
-#if ENABLE_BASE64
-int base64_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int base64_main(int argc UNUSED_PARAM, char **argv)
+//                 APPLET_ODDNAME:name    main     location    suid_type     help
+//applet:IF_BASE32(APPLET_ODDNAME(base32, baseNUM, BB_DIR_BIN, BB_SUID_DROP, base32))
+//applet:IF_BASE64(APPLET_ODDNAME(base64, baseNUM, BB_DIR_BIN, BB_SUID_DROP, base64))
+
+//kbuild:lib-$(CONFIG_BASE64) += uudecode.o
+//kbuild:lib-$(CONFIG_BASE32) += uudecode.o
+
+#if ENABLE_BASE32 || ENABLE_BASE64
+
+# if ENABLE_BASE32
+static void bb_b32encode(char *p, const void *src, int length)
+{
+#define tbl bb_uuenc_tbl_base32
+        const unsigned char *s = src;
+
+        /* Transform 5x8 bits to 8x5 bits */
+        while (length > 0) {
+                unsigned cur, next;
+
+                length--;
+                cur = *s++;
+                *p++ = tbl[cur >> 3];                   // xxxxx--- -------- -------- -------- --------
+                cur &= 7;
+
+                next = 0;
+                if (--length >= 0)
+                        next = *s++;
+                *p++ = tbl[(cur << 2) + (next >> 6)];   // -----xxx xx------ -------- -------- --------
+                cur = next & 0x3f;
+
+                *p++ = tbl[cur >> 1];                   // -------- --xxxxx- -------- -------- --------
+                cur &= 1;
+
+                next = 0;
+                if (--length >= 0)
+                        next = *s++;
+                *p++ = tbl[(cur << 4) + (next >> 4)];   // -------- -------x xxxx---- -------- --------
+                cur = next & 0xf;
+
+                next = 0;
+                if (--length >= 0)
+                        next = *s++;
+                *p++ = tbl[(cur << 1) + (next >> 7)];   // -------- -------- ----xxxx x------- --------
+                cur = next & 0x7f;
+
+                *p++ = tbl[cur >> 2];                   // -------- -------- -------- -xxxxx-- --------
+                cur &= 3;
+
+                next = 0;
+                if (--length >= 0)
+                        next = *s++;
+                *p++ = tbl[(cur << 3) + (next >> 5)];   // -------- -------- -------- ------xx xxx-----
+                cur = next & 0x1f;
+
+                *p++ = tbl[cur];                        // -------- -------- -------- -------- ---xxxxx
+        }
+#undef tbl
+        /* Zero-terminate */
+        *p = '\0';
+        /* Pad as necessary */
+        length = ((-length) * 3) >> 1; /* -4 => 6 pad chars, -3 => 4, -2 => 3, -1 => 1 */
+        while (length--) {
+                *--p = '=';
+        }
+}
+# else
+void bb_b32encode(char *p, const void *src, int length); /* undefined */
+# endif
+
+int baseNUM_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int baseNUM_main(int argc UNUSED_PARAM, char **argv)
 {
         FILE *src_stream;
         unsigned opts;
+        unsigned col = 76;
 
-        opts = getopt32(argv, "^" "d" "\0" "?1"/* 1 arg max*/);
+        opts = getopt32(argv, "^" "dw:+" "\0" "?1"/* 1 arg max*/, &col);
         argv += optind;
 
         if (!argv[0])
                 *--argv = (char*)"-";
         src_stream = xfopen_stdin(argv[0]);
-        if (opts) {
-                read_base64(src_stream, stdout, /*flags:*/ (unsigned char)EOF);
+        if (opts & 1) {
+                /* -d: decode */
+                int flags = (unsigned char)EOF;
+                if (ENABLE_BASE32 && (!ENABLE_BASE64 || applet_name[4] == '3'))
+                        flags = ((unsigned char)EOF) | BASE64_32;
+                read_base64(src_stream, stdout, flags);
         } else {
                 enum {
-                        SRC_BUF_SIZE = 76 / 4 * 3, /* this *MUST* be a multiple of 3 */
-                        DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3),
+                        SRC_BUF_SIZE = 3 * 5 * 32, /* this *MUST* be a multiple of 3 and 5 */
+                        DST_BUF_SIZE = 8 * ((SRC_BUF_SIZE + 4) / 5), /* max growth on encode (base32 case) */
                 };
-                char src_buf[SRC_BUF_SIZE];
-                char dst_buf[DST_BUF_SIZE + 1];
-                int src_fd = fileno(src_stream);
+                /* Use one buffer for both input and output:
+                 * encoding reads input "left-to-right",
+                 * it's safe to place source at the end of the buffer and
+                 * overwrite it while encoding, just be careful to have a gap.
+                 */
+                char dst_buf[((DST_BUF_SIZE + /*gap:*/ 16) /*round up to 16:*/ | 0xf) + 1];
+#define src_buf (dst_buf + sizeof(dst_buf) - SRC_BUF_SIZE)
+                int src_fd, rem;
+
+                src_fd = fileno(src_stream);
+                rem = 0;
                 while (1) {
                         size_t size = full_read(src_fd, src_buf, SRC_BUF_SIZE);
-                        if (!size)
-                                break;
                         if ((ssize_t)size < 0)
                                 bb_simple_perror_msg_and_die(bb_msg_read_error);
+                        if (size == 0) {
+                                if (rem != 0) bb_putchar('\n');
+                                break;
+                        }
+
                         /* Encode the buffer we just read in */
-                        bb_uuencode(dst_buf, src_buf, size, bb_uuenc_tbl_base64);
-                        xwrite(STDOUT_FILENO, dst_buf, 4 * ((size + 2) / 3));
-                        bb_putchar('\n');
-                        fflush(stdout);
+                        if (ENABLE_BASE32 && (!ENABLE_BASE64 || applet_name[4] == '3')) {
+                                bb_b32encode(dst_buf, src_buf, size);
+                                size = 8 * ((size + 4) / 5);
+                        } else {
+                                bb_uuencode(dst_buf, src_buf, size, bb_uuenc_tbl_base64);
+                                size = 4 * ((size + 2) / 3);
+                        }
+
+                        if (col == 0) {
+                                fputs(dst_buf, stdout);
+                        } else {
+                                char *result = dst_buf;
+                                if (rem == 0)
+                                        rem = col;
+                                while (1) {
+                                        int out = size < rem ? size : rem;
+                                        rem -= out;
+                                        printf(rem != 0 ? "%.*s" : "%.*s\n", out, result);
+                                        if (rem != 0)
+                                                break;
+                                        size -= out;
+                                        if (size == 0)
+                                                break;
+                                        result += out;
+                                        rem = col;
+                                }
+                        }
                 }
+#undef src_buf
         }
 
         fflush_stdout_and_exit(EXIT_SUCCESS);
diff --git a/debianutils/which.c b/debianutils/which.c
index 1d23786b8..f5ea17198 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -17,9 +17,9 @@
 //kbuild:lib-$(CONFIG_WHICH) += which.o
 
 //usage:#define which_trivial_usage
-//usage:       "[COMMAND]..."
+//usage:       "COMMAND..."
 //usage:#define which_full_usage "\n\n"
-//usage:       "Locate a COMMAND"
+//usage:       "Locate COMMAND"
 //usage:
 //usage:#define which_example_usage
 //usage:       "$ which login\n"
diff --git a/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c
index 3b776bc97..d0cacf14c 100644
--- a/e2fsprogs/e2fs_lib.c
+++ b/e2fsprogs/e2fs_lib.c
@@ -159,7 +159,7 @@ int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_f
 
 #if !ENABLE_PLATFORM_MINGW32
 /* Print file attributes on an ext2 file system */
-const uint32_t e2attr_flags_value[] = {
+const uint32_t e2attr_flags_value[] ALIGN4 = {
 #ifdef ENABLE_COMPRESSION
         EXT2_COMPRBLK_FL,
         EXT2_DIRTY_FL,
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index fc53a9043..96c1e51e0 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -480,7 +480,7 @@ static int wait_one(int flags)
                          * time to set up the signal handler
                          */
                         if (inst2->start_time >= time(NULL) - 1)
-                                sleep(1);
+                                sleep1();
                         kill(inst2->pid, SIGUSR1);
                         inst2->flags |= FLAG_PROGRESS;
                         break;
diff --git a/editors/awk.c b/editors/awk.c
index 509f4ddd8..4799091ec 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -405,7 +405,7 @@ static const char tokenlist[] ALIGN1 =
 
 #define OC_B  OC_BUILTIN
 
-static const uint32_t tokeninfo[] = {
+static const uint32_t tokeninfo[] ALIGN4 = {
         0,
         0,
         OC_REGEXP,
@@ -1767,12 +1767,34 @@ static void fsrealloc(int size)
         nfields = size;
 }
 
+static int regexec1_nonempty(const regex_t *preg, const char *s, regmatch_t pmatch[])
+{
+        int r = regexec(preg, s, 1, pmatch, 0);
+        if (r == 0 && pmatch[0].rm_eo == 0) {
+                /* For example, happens when FS can match
+                 * an empty string (awk -F ' *'). Logically,
+                 * this should split into one-char fields.
+                 * However, gawk 5.0.1 searches for first
+                 * _non-empty_ separator string match:
+                 */
+                size_t ofs = 0;
+                do {
+                        ofs++;
+                        if (!s[ofs])
+                                return REG_NOMATCH;
+                        regexec(preg, s + ofs, 1, pmatch, 0);
+                } while (pmatch[0].rm_eo == 0);
+                pmatch[0].rm_so += ofs;
+                pmatch[0].rm_eo += ofs;
+        }
+        return r;
+}
+
 static int awk_split(const char *s, node *spl, char **slist)
 {
-        int l, n;
+        int n;
         char c[4];
         char *s1;
-        regmatch_t pmatch[2]; // TODO: why [2]? [1] is enough...
 
         /* in worst case, each char would be a separate field */
         *slist = s1 = xzalloc(strlen(s) * 2 + 3);
@@ -1789,29 +1811,31 @@ static int awk_split(const char *s, node *spl, char **slist)
                         return n; /* "": zero fields */
                 n++; /* at least one field will be there */
                 do {
+                        int l;
+                        regmatch_t pmatch[2]; // TODO: why [2]? [1] is enough...
+
                         l = strcspn(s, c+2); /* len till next NUL or \n */
-                        if (regexec(icase ? spl->r.ire : spl->l.re, s, 1, pmatch, 0) == 0
+                        if (regexec1_nonempty(icase ? spl->r.ire : spl->l.re, s, pmatch) == 0
                          && pmatch[0].rm_so <= l
                         ) {
+                                /* if (pmatch[0].rm_eo == 0) ... - impossible */
                                 l = pmatch[0].rm_so;
-                                if (pmatch[0].rm_eo == 0) {
-                                        l++;
-                                        pmatch[0].rm_eo++;
-                                }
                                 n++; /* we saw yet another delimiter */
                         } else {
                                 pmatch[0].rm_eo = l;
                                 if (s[l])
                                         pmatch[0].rm_eo++;
                         }
-                        memcpy(s1, s, l);
-                        /* make sure we remove *all* of the separator chars */
-                        do {
-                                s1[l] = '\0';
-                        } while (++l < pmatch[0].rm_eo);
-                        nextword(&s1);
+                        s1 = mempcpy(s1, s, l);
+                        *s1++ = '\0';
                         s += pmatch[0].rm_eo;
                 } while (*s);
+
+                /* echo a-- | awk -F-- '{ print NF, length($NF), $NF }'
+                 * should print "2 0 ":
+                 */
+                *s1 = '\0';
+
                 return n;
         }
         if (c[0] == '\0') {  /* null split */
@@ -2030,7 +2054,7 @@ static ssize_t FAST_FUNC safe_read_strip_cr(int fd, void *buf, size_t count)
 static int awk_getline(rstream *rsm, var *v)
 {
         char *b;
-        regmatch_t pmatch[2];
+        regmatch_t pmatch[2]; // TODO: why [2]? [1] is enough...
         int size, a, p, pp = 0;
         int fd, so, eo, r, rp;
         char c, *m, *s;
diff --git a/editors/patch.c b/editors/patch.c
index aaa253591..110176630 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -31,7 +31,7 @@
 //kbuild:lib-$(CONFIG_PATCH) += patch.o
 
 //usage:#define patch_trivial_usage
-//usage:       "[OPTIONS] [ORIGFILE [PATCHFILE]]"
+//usage:       "[-RNE] [-p N] [-i DIFF] [ORIGFILE [PATCHFILE]]"
 //usage:#define patch_full_usage "\n\n"
 //usage:       "        -p N    Strip N leading components from file names"
 //usage:     "\n        -i DIFF Read DIFF instead of stdin"
diff --git a/editors/vi.c b/editors/vi.c
index 131c018a2..bfe05d613 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -166,7 +166,7 @@
 //kbuild:lib-$(CONFIG_VI) += vi.o
 
 //usage:#define vi_trivial_usage
-//usage:       "[OPTIONS] [FILE]..."
+//usage:       IF_FEATURE_VI_COLON("[-c CMD] ")IF_FEATURE_VI_READONLY("[-R] ")"[FILE]..."
 //usage:#define vi_full_usage "\n\n"
 //usage:       "Edit FILE\n"
 //usage:        IF_FEATURE_VI_COLON(
diff --git a/examples/inetd.conf b/examples/inetd.conf
index ca7e3d8e1..78b10e3ac 100644
--- a/examples/inetd.conf
+++ b/examples/inetd.conf
@@ -31,7 +31,7 @@ time     dgram   udp	wait	root	internal
 #ftp    stream  tcp     nowait  root    /usr/sbin/tcpd  in.ftpd
 #telnet stream  tcp     nowait  root    /sbin/telnetd   /sbin/telnetd
 #nntp   stream  tcp     nowait  root    tcpd    in.nntpd
-#smtp  stream  tcp     nowait  root    tcpd    sendmail -v
+#smtp   stream  tcp     nowait  root    tcpd    sendmail -v
 #
 # Shell, login, exec and talk are BSD protocols.
 #
diff --git a/examples/udhcp/sample.bound b/examples/udhcp/sample.bound
index efd98cf15..15a7775e9 100755
--- a/examples/udhcp/sample.bound
+++ b/examples/udhcp/sample.bound
@@ -6,12 +6,12 @@ RESOLV_CONF="/etc/udhcpc/resolv.conf"
 [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
 [ -n "$subnet" ] && NETMASK="netmask $subnet"
 
-/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
+ifconfig $interface $ip $BROADCAST $NETMASK
 
 if [ -n "$router" ]
 then
         echo "deleting routers"
-        while /sbin/route del default gw 0.0.0.0 dev $interface
+        while route del default gw 0.0.0.0 dev $interface
         do :
         done
 
@@ -23,9 +23,9 @@ then
                         # /32 instructs kernel to always use routing for all outgoing packets
                         # (they can never be sent to local subnet - there is no local subnet for /32).
                         # Used in datacenters, avoids the need for private ip-addresses between two hops.
-                        /sbin/ip route add $i dev $interface
+                        ip route add $i dev $interface
                 fi
-                /sbin/route add default gw $i dev $interface metric $((metric++))
+                route add default gw $i dev $interface metric $((metric++))
         done
 fi
 
diff --git a/examples/udhcp/sample.deconfig b/examples/udhcp/sample.deconfig
index b221bcf12..a893de83f 100755
--- a/examples/udhcp/sample.deconfig
+++ b/examples/udhcp/sample.deconfig
@@ -1,4 +1,4 @@
 #!/bin/sh
 # Sample udhcpc deconfig script
 
-/sbin/ifconfig $interface 0.0.0.0
+ifconfig $interface 0.0.0.0
diff --git a/examples/udhcp/sample.renew b/examples/udhcp/sample.renew
index efd98cf15..15a7775e9 100755
--- a/examples/udhcp/sample.renew
+++ b/examples/udhcp/sample.renew
@@ -6,12 +6,12 @@ RESOLV_CONF="/etc/udhcpc/resolv.conf"
 [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
 [ -n "$subnet" ] && NETMASK="netmask $subnet"
 
-/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
+ifconfig $interface $ip $BROADCAST $NETMASK
 
 if [ -n "$router" ]
 then
         echo "deleting routers"
-        while /sbin/route del default gw 0.0.0.0 dev $interface
+        while route del default gw 0.0.0.0 dev $interface
         do :
         done
 
@@ -23,9 +23,9 @@ then
                         # /32 instructs kernel to always use routing for all outgoing packets
                         # (they can never be sent to local subnet - there is no local subnet for /32).
                         # Used in datacenters, avoids the need for private ip-addresses between two hops.
-                        /sbin/ip route add $i dev $interface
+                        ip route add $i dev $interface
                 fi
-                /sbin/route add default gw $i dev $interface metric $((metric++))
+                route add default gw $i dev $interface metric $((metric++))
         done
 fi
 
diff --git a/findutils/find.c b/findutils/find.c
index f26c01c1e..188865e05 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -1445,7 +1445,7 @@ static action*** parse_params(char **argv)
 #else
 #define XATOU_SFX xatoul_sfx
 #endif
-                        static const struct suffix_mult find_suffixes[] = {
+                        static const struct suffix_mult find_suffixes[] ALIGN_SUFFIX = {
                                 { "c", 1 },
                                 { "w", 2 },
                                 { "", 512 },
@@ -1526,7 +1526,7 @@ int find_main(int argc UNUSED_PARAM, char **argv)
         }
         *past_HLP = NULL;
         /* "+": stop on first non-option */
-        i = getopt32(argv, "+HLP");
+        i = getopt32(argv, "+""HLP");
         if (i & (1<<0))
                 G.recurse_flags |= ACTION_FOLLOWLINKS_L0 | ACTION_DANGLING_OK;
         if (i & (1<<1))
diff --git a/include/ar.h b/include/ar_.h
index 386fe0456..386fe0456 100644
--- a/include/ar.h
+++ b/include/ar_.h
diff --git a/include/libbb.h b/include/libbb.h
index eb8b63895..3d6a6a0cf 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -106,7 +106,11 @@
 #  define updwtmpx updwtmp
 #  define _PATH_UTMPX _PATH_UTMP
 # else
-#  include <utmp.h>
+#  if !defined(__FreeBSD__)
+#   include <utmp.h>
+#  else
+#   define _PATH_UTMPX "/var/run/utx.active"
+#  endif
 #  include <utmpx.h>
 #  if defined _PATH_UTMP && !defined _PATH_UTMPX
 #   define _PATH_UTMPX _PATH_UTMP
@@ -405,6 +409,32 @@ void* xrealloc_vector_helper(void *vector, unsigned sizeof_and_shift, int idx) F
 char *xstrdup(const char *s) FAST_FUNC RETURNS_MALLOC;
 char *xstrndup(const char *s, int n) FAST_FUNC RETURNS_MALLOC;
 void *xmemdup(const void *s, int n) FAST_FUNC RETURNS_MALLOC;
+void *mmap_read(int fd, size_t size) FAST_FUNC;
+void *mmap_anon(size_t size) FAST_FUNC;
+void *xmmap_anon(size_t size) FAST_FUNC;
+
+#if defined(__x86_64__) || defined(i386)
+# define BB_ARCH_FIXED_PAGESIZE 4096
+#elif defined(__arm__) /* only 32bit, 64bit ARM has variable page size */
+# define BB_ARCH_FIXED_PAGESIZE 4096
+#else /* if defined(ARCH) */
+/* add you favorite arch today! */
+//From Linux kernel inspection:
+//xtenza,s390[x],riscv,nios2,csky,sparc32: fixed 4k pages
+//sparc64,alpha,openrisc: fixed 8k pages
+#endif
+
+#if defined BB_ARCH_FIXED_PAGESIZE
+# define IF_VARIABLE_ARCH_PAGESIZE(...) /*nothing*/
+# define bb_getpagesize()     BB_ARCH_FIXED_PAGESIZE
+# define INIT_PAGESIZE(var)   ((void)0)
+# define cached_pagesize(var) BB_ARCH_FIXED_PAGESIZE
+#else
+# define IF_VARIABLE_ARCH_PAGESIZE(...) __VA_ARGS__
+# define bb_getpagesize()     getpagesize()
+# define INIT_PAGESIZE(var)   ((var) = getpagesize())
+# define cached_pagesize(var) (var)
+#endif
 
 
 //TODO: supply a pointer to char[11] buffer (avoid statics)?
@@ -670,6 +700,9 @@ void parse_datestr(const char *date_str, struct tm *ptm) FAST_FUNC;
 time_t validate_tm_time(const char *date_str, struct tm *ptm) FAST_FUNC;
 char *strftime_HHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
 char *strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
+void xgettimeofday(struct timeval *tv) FAST_FUNC;
+void xsettimeofday(const struct timeval *tv) FAST_FUNC;
+
 
 int xsocket(int domain, int type, int protocol) FAST_FUNC;
 void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) FAST_FUNC;
@@ -1065,8 +1098,9 @@ void generate_uuid(uint8_t *buf) FAST_FUNC;
 /* Last element is marked by mult == 0 */
 struct suffix_mult {
         char suffix[4];
-        unsigned mult;
+        uint32_t mult;
 };
+#define ALIGN_SUFFIX ALIGN4
 extern const struct suffix_mult bkm_suffixes[];
 #define km_suffixes (bkm_suffixes + 1)
 extern const struct suffix_mult cwbkMG_suffixes[];
@@ -1178,7 +1212,6 @@ int BB_EXECVP(const char *file, char *const argv[]) FAST_FUNC;
 #define BB_EXECLP(prog,cmd,...) execlp(prog,cmd,__VA_ARGS__)
 #endif
 void BB_EXECVP_or_die(char **argv) NORETURN FAST_FUNC;
-void exec_prog_or_SHELL(char **argv) NORETURN FAST_FUNC;
 
 /* xvfork() can't be a _function_, return after vfork in child mangles stack
  * in the parent. It must be a macro. */
@@ -1644,12 +1677,14 @@ char *bb_simplify_path(const char *path) FAST_FUNC;
 /* Returns ptr to NUL */
 char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC;
 
-#ifndef LOGIN_FAIL_DELAY
-#define LOGIN_FAIL_DELAY 3
-#endif
-extern void bb_do_delay(int seconds) FAST_FUNC;
-extern void change_identity(const struct passwd *pw) FAST_FUNC;
-extern void run_shell(const char *shell, int loginshell, const char **args) NORETURN FAST_FUNC;
+void pause_after_failed_login(void) FAST_FUNC;
+void bb_do_delay(unsigned seconds) FAST_FUNC;
+void msleep(unsigned ms) FAST_FUNC;
+void sleep1(void) FAST_FUNC;
+void change_identity(const struct passwd *pw) FAST_FUNC;
+void exec_shell(const char *shell, int loginshell, const char **args) NORETURN FAST_FUNC;
+void exec_login_shell(const char *shell) NORETURN FAST_FUNC;
+void exec_prog_or_SHELL(char **argv) NORETURN FAST_FUNC;
 
 /* Returns $SHELL, getpwuid(getuid())->pw_shell, or DEFAULT_SHELL.
  * Note that getpwuid result might need xstrdup'ing
@@ -1884,14 +1919,20 @@ typedef const char *get_exe_name_t(int i) FAST_FUNC;
 typedef struct line_input_t {
         int flags;
         int timeout;
+# if ENABLE_FEATURE_TAB_COMPLETION
+#  if ENABLE_SHELL_ASH
         const char *path_lookup;
-# if ENABLE_FEATURE_TAB_COMPLETION \
-&& (ENABLE_ASH  || ENABLE_SH_IS_ASH  || ENABLE_BASH_IS_ASH \
-||  ENABLE_HUSH || ENABLE_SH_IS_HUSH || ENABLE_BASH_IS_HUSH \
-)
+#   define EDITING_HAS_path_lookup 1
+#  else
+#   define EDITING_HAS_path_lookup 0
+#  endif
+#  if ENABLE_SHELL_ASH || ENABLE_SHELL_HUSH
         /* function to fetch additional application-specific names to match */
         get_exe_name_t *get_exe_name;
-#  define EDITING_HAS_get_exe_name 1
+#   define EDITING_HAS_get_exe_name 1
+#  else
+#   define EDITING_HAS_get_exe_name 0
+#  endif
 # endif
 # if MAX_HISTORY
         int cnt_history;
@@ -1919,7 +1960,11 @@ enum {
         FOR_SHELL        = DO_HISTORY | TAB_COMPLETION | USERNAME_COMPLETION,
 };
 line_input_t *new_line_input_t(int flags) FAST_FUNC;
+#if ENABLE_FEATURE_EDITING_SAVEHISTORY
 void free_line_input_t(line_input_t *n) FAST_FUNC;
+#else
+# define free_line_input_t(n) free(n)
+#endif
 /*
  * maxsize must be >= 2.
  * Returns:
@@ -2079,14 +2124,17 @@ char *percent_decode_in_place(char *str, int strict) FAST_FUNC;
 
 
 extern const char bb_uuenc_tbl_base64[] ALIGN1;
+extern const char bb_uuenc_tbl_base32[] ALIGN1;
 extern const char bb_uuenc_tbl_std[] ALIGN1;
 void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC;
 enum {
         BASE64_FLAG_UU_STOP = 0x100,
+        BASE64_32           = 0x200, /* base32 */
         /* Sign-extends to a value which never matches fgetc result: */
         BASE64_FLAG_NO_STOP_CHAR = 0x80,
 };
-const char *decode_base64(char **pp_dst, const char *src) FAST_FUNC;
+char *decode_base64(char *dst, const char **pp_src) FAST_FUNC;
+char *decode_base32(char *dst, const char **pp_src) FAST_FUNC;
 void read_base64(FILE *src_stream, FILE *dst_stream, int flags) FAST_FUNC;
 
 typedef struct md5_ctx_t {
diff --git a/include/mingw.h b/include/mingw.h
index 8af2e3938..d1e638231 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -31,6 +31,7 @@ int inet_pton(int af, const char *src, void *dst);
 #define O_NONBLOCK 0
 #define O_NOFOLLOW 0
 #define O_NOCTTY 0
+#define O_DIRECT 0
 #define O_SPECIAL 0x800000
 
 /*
diff --git a/include/platform.h b/include/platform.h
index f1c09c4d2..ea97d2682 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -335,7 +335,7 @@ typedef unsigned smalluint;
 #endif
 
 /* Define bb_setpgrp */
-#if defined(__digital__) && defined(__unix__)
+#if (defined(__digital__) && defined(__unix__)) || defined(__FreeBSD__)
 /* use legacy setpgrp(pid_t, pid_t) for now.  move to platform.c */
 # define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me, __me); } while (0)
 #else
@@ -358,6 +358,8 @@ typedef unsigned smalluint;
 # define ALIGN2
 # define ALIGN4
 #endif
+#define ALIGN8     __attribute__((aligned(8)))
+#define ALIGN_PTR  __attribute__((aligned(sizeof(void*))))
 
 /*
  * For 0.9.29 and svn, __ARCH_USE_MMU__ indicates no-mmu reliably.
diff --git a/include/rtc_.h b/include/rtc_.h
index 750fc20ec..24ff5363f 100644
--- a/include/rtc_.h
+++ b/include/rtc_.h
@@ -11,6 +11,12 @@
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
+#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS
+# define ADJTIME_PATH "/var/lib/hwclock/adjtime"
+#else
+# define ADJTIME_PATH "/etc/adjtime"
+#endif
+
 int rtc_adjtime_is_utc(void) FAST_FUNC;
 int rtc_xopen(const char **default_rtc, int flags) FAST_FUNC;
 void rtc_read_tm(struct tm *ptm, int fd) FAST_FUNC;
diff --git a/include/usage.src.h b/include/usage.src.h
index d22efd3ba..1ac252d1b 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -25,6 +25,12 @@
         " (default "CONFIG_FEATURE_DEFAULT_PASSWD_ALGO")"
 #endif
 
+#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS
+# define ADJTIME_PATH "/var/lib/hwclock/adjtime"
+#else
+# define ADJTIME_PATH "/etc/adjtime"
+#endif
+
 INSERT
 
 #define busybox_notes_usage \
diff --git a/init/bootchartd.c b/init/bootchartd.c
index 750f67356..ae1ee9d9a 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -218,10 +218,10 @@ static char *make_tempdir(void)
 
 static void do_logging(unsigned sample_period_us, int process_accounting)
 {
-        FILE *proc_stat = xfopen("proc_stat.log", "w");
-        FILE *proc_diskstats = xfopen("proc_diskstats.log", "w");
-        //FILE *proc_netdev = xfopen("proc_netdev.log", "w");
-        FILE *proc_ps = xfopen("proc_ps.log", "w");
+        FILE *proc_stat = xfopen_for_write("proc_stat.log");
+        FILE *proc_diskstats = xfopen_for_write("proc_diskstats.log");
+        //FILE *proc_netdev = xfopen_for_write("proc_netdev.log");
+        FILE *proc_ps = xfopen_for_write("proc_ps.log");
         int look_for_login_process = (getppid() == 1);
         unsigned count = 60*1000*1000 / sample_period_us; /* ~1 minute */
 
@@ -268,7 +268,7 @@ static void finalize(char *tempdir, const char *prog, int process_accounting)
         //local pacct=
         //[ -e kernel_pacct ] && pacct=kernel_pacct
 
-        FILE *header_fp = xfopen("header", "w");
+        FILE *header_fp = xfopen_for_write("header");
 
         if (process_accounting)
                 acct(NULL);
diff --git a/init/halt.c b/init/halt.c
index 785c38130..fe3cb9e75 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -65,7 +65,7 @@
 //kbuild:lib-$(CONFIG_REBOOT) += halt.o
 
 //usage:#define halt_trivial_usage
-//usage:       "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
+//usage:       "[-d DELAY] [-nf"IF_FEATURE_WTMP("w")"]"
 //usage:#define halt_full_usage "\n\n"
 //usage:       "Halt the system\n"
 //usage:     "\n        -d SEC  Delay interval"
@@ -76,7 +76,7 @@
 //usage:        )
 //usage:
 //usage:#define poweroff_trivial_usage
-//usage:       "[-d DELAY] [-n] [-f]"
+//usage:       "[-d DELAY] [-nf]"
 //usage:#define poweroff_full_usage "\n\n"
 //usage:       "Halt and shut off power\n"
 //usage:     "\n        -d SEC  Delay interval"
@@ -84,7 +84,7 @@
 //usage:     "\n        -f      Force (don't go through init)"
 //usage:
 //usage:#define reboot_trivial_usage
-//usage:       "[-d DELAY] [-n] [-f]"
+//usage:       "[-d DELAY] [-nf]"
 //usage:#define reboot_full_usage "\n\n"
 //usage:       "Reboot the system\n"
 //usage:     "\n        -d SEC  Delay interval"
@@ -144,14 +144,14 @@ static int init_was_not_there(void)
          */
 #if 0
         while (kill(1, 0) != 0 && --cnt >= 0)
-                sleep(1);
+                sleep1();
 #endif
         /* ... so let's wait for some evidence a usual startup event,
          * mounting of /proc, happened. By that time init should be ready
          * for signals.
          */
         while (access("/proc/meminfo", F_OK) != 0 && --cnt >= 0)
-                sleep(1);
+                sleep1();
 
         /* Does it look like init wasn't there? */
         return (cnt != initial - 1);
diff --git a/init/init.c b/init/init.c
index 28775a65c..efab5dcb4 100644
--- a/init/init.c
+++ b/init/init.c
@@ -736,7 +736,7 @@ static void pause_and_low_level_reboot(unsigned magic)
         pid_t pid;
 
         /* Allow time for last message to reach serial console, etc */
-        sleep(1);
+        sleep1();
 
         /* We have to fork here, since the kernel calls do_exit(EXIT_SUCCESS)
          * in linux/kernel/sys.c, which can cause the machine to panic when
@@ -751,7 +751,7 @@ static void pause_and_low_level_reboot(unsigned magic)
          * we would eternally sleep here - not what we want.
          */
         waitpid(pid, NULL, 0);
-        sleep(1); /* paranoia */
+        sleep1(); /* paranoia */
         _exit(EXIT_SUCCESS);
 }
 
@@ -768,12 +768,12 @@ static void run_shutdown_and_kill_processes(void)
         kill(-1, SIGTERM);
         message(L_CONSOLE, "Sent SIG%s to all processes", "TERM");
         sync();
-        sleep(1);
+        sleep1();
 
         kill(-1, SIGKILL);
         message(L_CONSOLE, "Sent SIG%s to all processes", "KILL");
         sync();
-        /*sleep(1); - callers take care about making a pause */
+        /*sleep1(); - callers take care about making a pause */
 }
 
 /* Signal handling by init:
@@ -904,7 +904,7 @@ static void stop_handler(int sig UNUSED_PARAM)
                 wpid = wait_any_nohang(NULL);
                 mark_terminated(wpid);
                 if (wpid <= 0) /* no processes exited? sleep a bit */
-                        sleep(1);
+                        sleep1();
         }
 
         signal(SIGCONT, SIG_DFL);
@@ -1209,7 +1209,7 @@ int init_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 /* Don't consume all CPU time - sleep a bit */
-                sleep(1);
+                sleep1();
         } /* while (1) */
 }
 
diff --git a/klibc-utils/nuke.c b/klibc-utils/nuke.c
index d7c16f5cf..8c20c5e11 100644
--- a/klibc-utils/nuke.c
+++ b/klibc-utils/nuke.c
@@ -5,7 +5,7 @@
  */
 //config:config NUKE
 //config:       bool "nuke (2.9 kb)"
-//config:       default y
+//config:       default n  # off by default: too "accidentally destructive"
 //config:       help
 //config:       Alias to "rm -rf".
 
diff --git a/libbb/bb_do_delay.c b/libbb/bb_do_delay.c
index 65541704b..9a84fa24b 100644
--- a/libbb/bb_do_delay.c
+++ b/libbb/bb_do_delay.c
@@ -8,13 +8,60 @@
  */
 #include "libbb.h"
 
-void FAST_FUNC bb_do_delay(int seconds)
+/* void FAST_FUNC bb_do_delay(unsigned seconds) { ... } - no users yet */
+
+#ifndef LOGIN_FAIL_DELAY
+#define LOGIN_FAIL_DELAY 3
+#endif
+void FAST_FUNC pause_after_failed_login(void)
 {
-        time_t start, now;
+#if 0 /* over-engineered madness */
+        time_t end, diff;
 
-        start = time(NULL);
+        end = time(NULL) + LOGIN_FAIL_DELAY;
+        diff = LOGIN_FAIL_DELAY;
         do {
-                sleep(seconds);
-                now = time(NULL);
-        } while ((now - start) < seconds);
+                sleep(diff);
+                diff = end - time(NULL);
+        } while (diff > 0);
+#else
+        sleep(LOGIN_FAIL_DELAY);
+#endif
+}
+
+void FAST_FUNC sleep1(void)
+{
+        sleep(1);
+}
+
+void FAST_FUNC msleep(unsigned ms)
+{
+#if 0
+        /* 1. usleep(n) is not guaranteed by standards to accept n >= 1000000
+         * 2. multiplication in usleep(ms * 1000) can overflow if ms > 4294967
+         *    (sleep of ~71.5 minutes)
+         * Let's play safe and loop:
+         */
+        while (ms > 500) {
+                usleep(500000);
+                ms -= 500;
+        }
+        usleep(ms * 1000);
+#else
+//usleep is often implemented as a call to nanosleep.
+//Simply do the same to implement msleep.
+//it's marginally larger, but wakes your CPU less often:
+//function    old     new   delta
+//msleep       45      52      +7
+        struct timespec ts;
+        ts.tv_sec = ms / 1000;
+        ts.tv_nsec = (ms % 1000) * 1000000;
+        /*
+         * If a signal has non-default handler, nanosleep returns early.
+         * Our version of msleep doesn't return early
+         * if interrupted by such signals:
+         */
+        while (nanosleep(&ts, &ts) != 0)
+                continue;
+#endif
 }
diff --git a/libbb/capability.c b/libbb/capability.c
index 23afd8eb9..e3c252a5a 100644
--- a/libbb/capability.c
+++ b/libbb/capability.c
@@ -17,7 +17,7 @@ extern int capget(cap_user_header_t header, const cap_user_data_t data);
 // This way, libcap needs not be installed in build environment.
 #include "libbb.h"
 
-static const char *const capabilities[] = {
+static const char *const capabilities[] ALIGN_PTR = {
         "chown",
         "dac_override",
         "dac_read_search",
diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index d41fd10f0..7f9d92ea9 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -75,10 +75,7 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
                                 goto use_small_buf;
                         /* We want page-aligned buffer, just in case kernel is clever
                          * and can do page-aligned io more efficiently */
-                        buffer = mmap(NULL, CONFIG_FEATURE_COPYBUF_KB * 1024,
-                                        PROT_READ | PROT_WRITE,
-                                        MAP_PRIVATE | MAP_ANON,
-                                        /* ignored: */ -1, 0);
+                        buffer = mmap_anon(CONFIG_FEATURE_COPYBUF_KB * 1024);
                         buffer_size = CONFIG_FEATURE_COPYBUF_KB * 1024;
                         if (buffer == MAP_FAILED) {
  use_small_buf:
diff --git a/libbb/die_if_bad_username.c b/libbb/die_if_bad_username.c
index e5e1160c4..d05dc74c5 100644
--- a/libbb/die_if_bad_username.c
+++ b/libbb/die_if_bad_username.c
@@ -8,6 +8,10 @@
  */
 #include "libbb.h"
 
+#ifndef LOGIN_NAME_MAX
+#define LOGIN_NAME_MAX 256
+#endif
+
 /* To avoid problems, the username should consist only of
  * letters, digits, underscores, periods, at signs and dashes,
  * and not start with a dash (as defined by IEEE Std 1003.1-2001).
diff --git a/libbb/duration.c b/libbb/duration.c
index 22b209f4d..086da15fb 100644
--- a/libbb/duration.c
+++ b/libbb/duration.c
@@ -21,7 +21,7 @@
 
 #include "libbb.h"
 
-static const struct suffix_mult duration_suffixes[] = {
+static const struct suffix_mult duration_suffixes[] ALIGN_SUFFIX = {
         { "s", 1 },
         { "m", 60 },
         { "h", 60*60 },
diff --git a/libbb/executable.c b/libbb/executable.c
index f549a7aae..bd3022b13 100644
--- a/libbb/executable.c
+++ b/libbb/executable.c
@@ -100,12 +100,3 @@ void FAST_FUNC BB_EXECVP_or_die(char **argv)
         xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
         bb_perror_msg_and_die("can't execute '%s'", argv[0]);
 }
-
-/* Typical idiom for applets which exec *optional* PROG [ARGS] */
-void FAST_FUNC exec_prog_or_SHELL(char **argv)
-{
-        if (argv[0]) {
-                BB_EXECVP_or_die(argv);
-        }
-        run_shell(getenv("SHELL"), /*login:*/ 1, NULL);
-}
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index d8f210173..e0db8ce67 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -111,7 +111,7 @@ static void FAST_FUNC md5_process_block64(md5_ctx_t *ctx)
            They are defined in RFC 1321 as
            T[i] = (int)(2^32 * fabs(sin(i))), i=1..64
          */
-        static const uint32_t C_array[] = {
+        static const uint32_t C_array[] ALIGN4 = {
                 /* round 1 */
                 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
                 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
@@ -492,7 +492,7 @@ unsigned FAST_FUNC md5_end(md5_ctx_t *ctx, void *resbuf)
 
 static void FAST_FUNC sha1_process_block64(sha1_ctx_t *ctx)
 {
-        static const uint32_t rconsts[] = {
+        static const uint32_t rconsts[] ALIGN4 = {
                 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xCA62C1D6
         };
         int i, j;
@@ -567,7 +567,7 @@ typedef uint64_t sha_K_int;
 typedef uint32_t sha_K_int;
 # define K(v) (uint32_t)(v >> 32)
 #endif
-static const sha_K_int sha_K[] = {
+static const sha_K_int sha_K[] ALIGN8 = {
         K(0x428a2f98d728ae22ULL), K(0x7137449123ef65cdULL),
         K(0xb5c0fbcfec4d3b2fULL), K(0xe9b5dba58189dbbcULL),
         K(0x3956c25bf348b538ULL), K(0x59f111f1b605d019ULL),
@@ -760,7 +760,7 @@ void FAST_FUNC sha1_begin(sha1_ctx_t *ctx)
         ctx->process_block = sha1_process_block64;
 }
 
-static const uint32_t init256[] = {
+static const uint32_t init256[] ALIGN4 = {
         0,
         0,
         0x6a09e667,
@@ -773,7 +773,7 @@ static const uint32_t init256[] = {
         0x5be0cd19,
 };
 #if NEED_SHA512
-static const uint32_t init512_lo[] = {
+static const uint32_t init512_lo[] ALIGN4 = {
         0,
         0,
         0xf3bcc908,
@@ -1009,7 +1009,7 @@ static void sha3_process_block72(uint64_t *state)
 
 #if OPTIMIZE_SHA3_FOR_32
         /*
-        static const uint32_t IOTA_CONST_0[NROUNDS] = {
+        static const uint32_t IOTA_CONST_0[NROUNDS] ALIGN4 = {
                 0x00000001UL,
                 0x00000000UL,
                 0x00000000UL,
@@ -1038,7 +1038,7 @@ static void sha3_process_block72(uint64_t *state)
         ** bits are in lsb: 0101 0000 1111 0100 1111 0001
         */
         uint32_t IOTA_CONST_0bits = (uint32_t)(0x0050f4f1);
-        static const uint32_t IOTA_CONST_1[NROUNDS] = {
+        static const uint32_t IOTA_CONST_1[NROUNDS] ALIGN4 = {
                 0x00000000UL,
                 0x00000089UL,
                 0x8000008bUL,
@@ -1174,7 +1174,7 @@ static void sha3_process_block72(uint64_t *state)
         combine_halves(state);
 #else
         /* Native 64-bit algorithm */
-        static const uint16_t IOTA_CONST[NROUNDS] = {
+        static const uint16_t IOTA_CONST[NROUNDS] ALIGN2 = {
                 /* Elements should be 64-bit, but top half is always zero
                  * or 0x80000000. We encode 63rd bits in a separate word below.
                  * Same is true for 31th bits, which lets us use 16-bit table
@@ -1210,15 +1210,15 @@ static void sha3_process_block72(uint64_t *state)
         /* bit for CONST[0] is in msb: 0001 0110 0011 1000 0001 1011 */
         const uint32_t IOTA_CONST_bit31 = (uint32_t)(0x16381b00);
 
-        static const uint8_t ROT_CONST[24] = {
+        static const uint8_t ROT_CONST[24] ALIGN1 = {
                 1, 3, 6, 10, 15, 21, 28, 36, 45, 55, 2, 14,
                 27, 41, 56, 8, 25, 43, 62, 18, 39, 61, 20, 44,
         };
-        static const uint8_t PI_LANE[24] = {
+        static const uint8_t PI_LANE[24] ALIGN1 = {
                 10, 7, 11, 17, 18, 3, 5, 16, 8, 21, 24, 4,
                 15, 23, 19, 13, 12, 2, 20, 14, 22, 9, 6, 1,
         };
-        /*static const uint8_t MOD5[10] = { 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, };*/
+        /*static const uint8_t MOD5[10] ALIGN1 = { 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, };*/
 
         unsigned x;
         unsigned round;
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index b35da1874..f3cbc512c 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -57,12 +57,23 @@
 #if ENABLE_FEATURE_EDITING
 
 
+#if !ENABLE_SHELL_ASH && !ENABLE_SHELL_HUSH
+/* so far only shells use these features */
+# undef ENABLE_FEATURE_EDITING_FANCY_PROMPT
+# undef ENABLE_FEATURE_TAB_COMPLETION
+# undef ENABLE_FEATURE_USERNAME_COMPLETION
+# define ENABLE_FEATURE_EDITING_FANCY_PROMPT 0
+# define ENABLE_FEATURE_TAB_COMPLETION       0
+# define ENABLE_FEATURE_USERNAME_COMPLETION  0
+#endif
+
+
 #define ENABLE_USERNAME_OR_HOMEDIR \
         (ENABLE_FEATURE_USERNAME_COMPLETION || ENABLE_FEATURE_EDITING_FANCY_PROMPT)
-#define IF_USERNAME_OR_HOMEDIR(...)
 #if ENABLE_USERNAME_OR_HOMEDIR
-# undef IF_USERNAME_OR_HOMEDIR
 # define IF_USERNAME_OR_HOMEDIR(...) __VA_ARGS__
+#else
+# define IF_USERNAME_OR_HOMEDIR(...) /*nothing*/
 #endif
 
 
@@ -205,9 +216,6 @@ extern struct lineedit_statics *const lineedit_ptr_to_statics;
 #define INIT_S() do { \
         (*(struct lineedit_statics**)not_const_pp(&lineedit_ptr_to_statics)) = xzalloc(sizeof(S)); \
         barrier(); \
-        cmdedit_termw = 80; \
-        IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;) \
-        IF_FEATURE_EDITING_VI(delptr = delbuf;) \
 } while (0)
 
 static void deinit_S(void)
@@ -796,16 +804,18 @@ enum {
         FIND_FILE_ONLY = 2,
 };
 
-static int path_parse(char ***p)
+static unsigned path_parse(char ***p)
 {
-        int npth;
+        unsigned npth;
         const char *pth;
         char *tmp;
         char **res;
 
+# if EDITING_HAS_path_lookup
         if (state->flags & WITH_PATH_LOOKUP)
                 pth = state->path_lookup;
         else
+# endif
                 pth = getenv("PATH");
 
         /* PATH="" or PATH=":"? */
@@ -824,7 +834,7 @@ static int path_parse(char ***p)
                 npth++;
         }
 
-        *p = res = xmalloc(npth * sizeof(res[0]));
+        *p = res = xzalloc((npth + 1) * sizeof(res[0]));
         res[0] = tmp = xstrdup(pth);
         npth = 1;
         while (1) {
@@ -836,6 +846,8 @@ static int path_parse(char ***p)
                         break; /* :<empty> */
                 res[npth++] = tmp;
         }
+        /* special case: "match subdirectories of the current directory" */
+        /*res[npth++] = NULL; - filled by xzalloc() */
         return npth;
 }
 
@@ -846,49 +858,49 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
 {
         char *path1[1];
         char **paths = path1;
-        int npaths;
-        int i;
-        unsigned pf_len;
-        const char *pfind;
+        unsigned npaths;
+        unsigned i;
+        unsigned baselen;
+        const char *basecmd;
         char *dirbuf = NULL;
 
         npaths = 1;
         path1[0] = (char*)".";
 
-        pfind = strrchr(command, '/');
+        basecmd = strrchr(command, '/');
 #if ENABLE_PLATFORM_MINGW32
-        if (!pfind && has_dos_drive_prefix(command) && command[2] != '\0') {
+        if (!basecmd && has_dos_drive_prefix(command) && command[2] != '\0') {
                 char buffer[PATH_MAX];
 
                 /* path is of form c:path with no '/' */
                 if (get_drive_cwd(command, buffer, PATH_MAX)) {
-                        pfind = command + 2;
+                        basecmd = command + 2;
                         path1[0] = dirbuf = xstrdup(buffer);
                 }
         } else
 #endif
-        if (!pfind) {
+        if (!basecmd) {
                 if (type == FIND_EXE_ONLY)
                         npaths = path_parse(&paths);
-                pfind = command;
+                basecmd = command;
         } else {
                 /* point to 'l' in "..../last_component" */
-                pfind++;
+                basecmd++;
                 /* dirbuf = ".../.../.../" */
-                dirbuf = xstrndup(command, pfind - command);
+                dirbuf = xstrndup(command, basecmd - command);
 # if ENABLE_FEATURE_USERNAME_COMPLETION
                 if (dirbuf[0] == '~')   /* ~/... or ~user/... */
                         dirbuf = username_path_completion(dirbuf);
 # endif
                 path1[0] = dirbuf;
         }
-        pf_len = strlen(pfind);
+        baselen = strlen(basecmd);
 
         if (type == FIND_EXE_ONLY && !dirbuf) {
 # if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
                 const char *p = applet_names;
                 while (*p) {
-                        if (strncmp(pfind, p, pf_len) == 0)
+                        if (strncmp(basecmd, p, baselen) == 0)
                                 add_match(xstrdup(p));
                         while (*p++ != '\0')
                                 continue;
@@ -901,7 +913,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                                 const char *b = state->get_exe_name(i++);
                                 if (!b)
                                         break;
-                                if (strncmp(pfind, b, pf_len) == 0)
+                                if (strncmp(basecmd, b, baselen) == 0)
                                         add_match(xstrdup(b));
                         }
                 }
@@ -913,9 +925,20 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                 struct dirent *next;
                 struct stat st;
                 char *found;
+#if ENABLE_PLATFORM_MINGW32
+                char *lpath;
+#endif
+
+                if (paths[i] == NULL) { /* path_parse()'s last component? */
+                        /* in PATH completion, current dir's subdir names
+                         * can be completions (but only subdirs, not files).
+                         */
+                        type = FIND_DIR_ONLY;
+                        paths[i] = (char *)".";
+                }
 
 #if ENABLE_PLATFORM_MINGW32
-                char *lpath = auto_string(alloc_system_drive(paths[i]));
+                lpath = auto_string(alloc_system_drive(paths[i]));
                 dir = opendir(lpath);
 #else
                 dir = opendir(paths[i]);
@@ -928,10 +951,10 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                         const char *name_found = next->d_name;
 
                         /* .../<tab>: bash 3.2.0 shows dotfiles, but not . and .. */
-                        if (!pfind[0] && DOT_OR_DOTDOT(name_found))
+                        if (!basecmd[0] && DOT_OR_DOTDOT(name_found))
                                 continue;
                         /* match? */
-                        if (!is_prefixed_with(name_found, pfind))
+                        if (strncmp(basecmd, name_found, baselen) != 0)
                                 continue; /* no */
 
 #if ENABLE_PLATFORM_MINGW32
@@ -957,6 +980,9 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                         strcpy(found, name_found);
 
                         if (S_ISDIR(st.st_mode)) {
+                                /* skip directories if searching PATH */
+                                if (type == FIND_EXE_ONLY && !dirbuf)
+                                        goto cont;
                                 /* name is a directory, add slash */
                                 found[len] = '/';
                                 found[len + 1] = '\0';
@@ -980,7 +1006,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
         }
         free(dirbuf);
 
-        return pf_len;
+        return baselen;
 }
 
 /* build_match_prefix:
@@ -1492,15 +1518,19 @@ void FAST_FUNC show_history(const line_input_t *st)
                 printf("%4d %s\n", i, st->history[i]);
 }
 
+# if ENABLE_FEATURE_EDITING_SAVEHISTORY
 void FAST_FUNC free_line_input_t(line_input_t *n)
 {
-# if ENABLE_FEATURE_EDITING_SAVEHISTORY
-        int i = n->cnt_history;
-        while (i > 0)
-                free(n->history[--i]);
-#endif
-        free(n);
+        if (n) {
+                int i = n->cnt_history;
+                while (i > 0)
+                        free(n->history[--i]);
+                free(n);
+        }
 }
+# else
+/* #defined to free() in libbb.h */
+# endif
 
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
 /* We try to ensure that concurrent additions to the history
@@ -1581,7 +1611,7 @@ void save_history(line_input_t *st)
 {
         FILE *fp;
 
-        if (!st->hist_file)
+        if (!st || !st->hist_file)
                 return;
         if (st->cnt_history <= st->cnt_history_in_file)
                 return;
@@ -1971,9 +2001,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
 {
         int prmt_size = 0;
         char *prmt_mem_ptr = xzalloc(1);
-# if ENABLE_USERNAME_OR_HOMEDIR
         char *cwd_buf = NULL;
-# endif
         char flg_not_length = '[';
         char cbuf[2];
 
@@ -2040,11 +2068,9 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                 c = *prmt_ptr++;
 
                                 switch (c) {
-# if ENABLE_USERNAME_OR_HOMEDIR
                                 case 'u':
                                         pbuf = user_buf ? user_buf : (char*)"";
                                         break;
-# endif
                                 case 'H':
                                 case 'h':
                                         pbuf = free_me = safe_gethostname();
@@ -2062,7 +2088,6 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                         strftime_HHMMSS(timebuf, sizeof(timebuf), NULL)[-3] = '\0';
                                         pbuf = timebuf;
                                         break;
-# if ENABLE_USERNAME_OR_HOMEDIR
                                 case 'w': /* current dir */
                                 case 'W': /* basename of cur dir */
                                         if (!cwd_buf) {
@@ -2089,7 +2114,6 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                         if (cp)
                                                 pbuf = (char*)cp + 1;
                                         break;
-# endif
 // bb_process_escape_sequence does this now:
 //                              case 'e': case 'E':     /* \e \E = \033 */
 //                                      c = '\033';
@@ -2130,10 +2154,17 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                         if (c == '\n')
                                 cmdedit_prmt_len = 0;
                         else if (flg_not_length != ']') {
-#if 0 /*ENABLE_UNICODE_SUPPORT*/
-/* Won't work, pbuf is one BYTE string here instead of an one Unicode char string. */
-/* FIXME */
-                                cmdedit_prmt_len += unicode_strwidth(pbuf);
+#if ENABLE_UNICODE_SUPPORT
+                                if (n == 1) {
+                                        /* Only count single-byte characters and the first of multi-byte characters */
+                                        if ((unsigned char)*pbuf < 0x80  /* single byte character */
+                                         || (unsigned char)*pbuf >= 0xc0 /* first of multi-byte characters */
+                                        ) {
+                                                cmdedit_prmt_len += n;
+                                        }
+                                } else {
+                                        cmdedit_prmt_len += unicode_strwidth(pbuf);
+                                }
 #else
                                 cmdedit_prmt_len += n;
 #endif
@@ -2143,10 +2174,8 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                 free(free_me);
         } /* while */
 
-# if ENABLE_USERNAME_OR_HOMEDIR
         if (cwd_buf != (char *)bb_msg_unknown)
                 free(cwd_buf);
-# endif
         /* see comment (above this function) about multiline prompt redrawing */
         cmdedit_prompt = prompt_last_line = prmt_mem_ptr;
         prmt_ptr = strrchr(cmdedit_prompt, '\n');
@@ -2154,7 +2183,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                 prompt_last_line = prmt_ptr + 1;
         put_prompt();
 }
-#endif
+#endif /* FEATURE_EDITING_FANCY_PROMPT */
 
 #if ENABLE_FEATURE_EDITING_WINCH
 static void cmdedit_setwidth(void)
@@ -2467,6 +2496,11 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         char read_key_buffer[KEYCODE_BUFFER_SIZE];
 
         INIT_S();
+        //command_len = 0; - done by INIT_S()
+        //cmdedit_y = 0;  /* quasireal y, not true if line > xt*yt */
+        cmdedit_termw = 80;
+        IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;)
+        IF_FEATURE_EDITING_VI(delptr = delbuf;)
 
 #if !ENABLE_PLATFORM_MINGW32
         n = get_termios_and_make_raw(STDIN_FILENO, &new_settings, &initial_settings, 0
@@ -2521,8 +2555,6 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
 #endif
 
         /* prepare before init handlers */
-        cmdedit_y = 0;  /* quasireal y, not true if line > xt*yt */
-        command_len = 0;
 #if ENABLE_UNICODE_SUPPORT
         command_ps = xzalloc(maxsize * sizeof(command_ps[0]));
 #else
@@ -3005,6 +3037,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                  * before it comes in. UGLY!
                  */
                 usleep(20*1000);
+// MAYBE? tcflush(STDIN_FILENO, TCIFLUSH); /* flushes data received but not read */
         }
 #endif
 
diff --git a/libbb/loop.c b/libbb/loop.c
index 85b2724e5..cb8fa2442 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -98,9 +98,7 @@ int FAST_FUNC get_free_loop(void)
 
 /* Returns opened fd to the loop device, <0 on error.
  * *device is loop device to use, or if *device==NULL finds a loop device to
- * mount it on and sets *device to a strdup of that loop device name.  This
- * search will re-use an existing loop device already bound to that
- * file/offset if it finds one.
+ * mount it on and sets *device to a strdup of that loop device name.
  */
 int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offset,
                 unsigned long long sizelimit, unsigned flags)
@@ -109,9 +107,7 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
         char *try;
         bb_loop_info loopinfo;
         struct stat statbuf;
-        int i, dfd, ffd, mode, rc;
-
-        rc = dfd = -1;
+        int i, lfd, ffd, mode, rc;
 
         /* Open the file.  Barf if this doesn't work.  */
         mode = (flags & BB_LO_FLAGS_READ_ONLY) ? O_RDONLY : O_RDWR;
@@ -127,24 +123,23 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
 
         try = *device;
         if (!try) {
+ get_free_loopN:
                 i = get_free_loop();
-                if (i == -2) { /* no /dev/loop-control */
-                        i = 0;
-                        try = dev;
-                        goto old_style;
-                }
                 if (i == -1) {
                         close(ffd);
                         return -1; /* no free loop devices */
                 }
-                try = *device = xasprintf(LOOP_FORMAT, i);
-                goto try_to_open;
+                if (i >= 0) {
+                        try = xasprintf(LOOP_FORMAT, i);
+                        goto open_lfd;
+                }
+                /* i == -2: no /dev/loop-control. Do an old-style search for a free device */
+                try = dev;
         }
 
- old_style:
-        /* Find a loop device.  */
-        /* 1048575 (0xfffff) is a max possible minor number in Linux circa 2010 */
-        for (i = 0; rc && i < 1048576; i++) {
+        /* Find a loop device */
+        /* 0xfffff is a max possible minor number in Linux circa 2010 */
+        for (i = 0; i <= 0xfffff; i++) {
                 sprintf(dev, LOOP_FORMAT, i);
 
                 IF_FEATURE_MOUNT_LOOP_CREATE(errno = 0;)
@@ -153,72 +148,86 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
                          && errno == ENOENT
                          && try == dev
                         ) {
-                                /* Node doesn't exist, try to create it.  */
+                                /* Node doesn't exist, try to create it */
                                 if (mknod(dev, S_IFBLK|0644, makedev(7, i)) == 0)
-                                        goto try_to_open;
+                                        goto open_lfd;
                         }
-                        /* Ran out of block devices, return failure.  */
+                        /* Ran out of block devices, return failure */
                         rc = -1;
                         break;
                 }
- try_to_open:
-                /* Open the sucker and check its loopiness.  */
-                dfd = open(try, mode);
-                if (dfd < 0 && errno == EROFS) {
+ open_lfd:
+                /* Open the sucker and check its loopiness */
+                lfd = rc = open(try, mode);
+                if (lfd < 0 && errno == EROFS) {
                         mode = O_RDONLY;
-                        dfd = open(try, mode);
+                        lfd = rc = open(try, mode);
                 }
-                if (dfd < 0) {
+                if (lfd < 0) {
                         if (errno == ENXIO) {
                                 /* Happens if loop module is not loaded */
-                                rc = -1;
+                                /* rc is -1; */
                                 break;
                         }
-                        goto try_again;
+                        goto try_next_loopN;
                 }
 
-                rc = ioctl(dfd, BB_LOOP_GET_STATUS, &loopinfo);
+                rc = ioctl(lfd, BB_LOOP_GET_STATUS, &loopinfo);
 
-                /* If device is free, claim it.  */
+                /* If device is free, try to claim it */
                 if (rc && errno == ENXIO) {
-                        /* Associate free loop device with file.  */
-                        if (ioctl(dfd, LOOP_SET_FD, ffd) == 0) {
-                                memset(&loopinfo, 0, sizeof(loopinfo));
-                                safe_strncpy((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
-                                loopinfo.lo_offset = offset;
-                                loopinfo.lo_sizelimit = sizelimit;
-                                /*
-                                 * Used by mount to set LO_FLAGS_AUTOCLEAR.
-                                 * LO_FLAGS_READ_ONLY is not set because RO is controlled by open type of the file.
-                                 * Note that closing LO_FLAGS_AUTOCLEARed dfd before mount
-                                 * is wrong (would free the loop device!)
-                                 */
-                                loopinfo.lo_flags = (flags & ~BB_LO_FLAGS_READ_ONLY);
-                                rc = ioctl(dfd, BB_LOOP_SET_STATUS, &loopinfo);
-                                if (rc != 0 && (loopinfo.lo_flags & BB_LO_FLAGS_AUTOCLEAR)) {
-                                        /* Old kernel, does not support LO_FLAGS_AUTOCLEAR? */
-                                        /* (this code path is not tested) */
-                                        loopinfo.lo_flags -= BB_LO_FLAGS_AUTOCLEAR;
-                                        rc = ioctl(dfd, BB_LOOP_SET_STATUS, &loopinfo);
-                                }
-                                if (rc != 0) {
-                                        ioctl(dfd, LOOP_CLR_FD, 0); // actually, 0 param is unnecessary
+                        /* Associate free loop device with file */
+                        if (ioctl(lfd, LOOP_SET_FD, ffd)) {
+                                /* Ouch. Are we racing with other mount? */
+                                if (!*device   /* yes */
+                                 && try != dev /* tried a _kernel-offered_ loopN? */
+                                ) {
+                                        free(try);
+                                        close(lfd);
+//TODO: add "if (--failcount != 0) ..."?
+                                        goto get_free_loopN;
                                 }
+                                goto close_and_try_next_loopN;
                         }
-                } else {
-                        rc = -1;
-                }
-                if (rc != 0) {
-                        close(dfd);
+                        memset(&loopinfo, 0, sizeof(loopinfo));
+                        safe_strncpy((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
+                        loopinfo.lo_offset = offset;
+                        loopinfo.lo_sizelimit = sizelimit;
+                        /*
+                         * Used by mount to set LO_FLAGS_AUTOCLEAR.
+                         * LO_FLAGS_READ_ONLY is not set because RO is controlled by open type of the file.
+                         * Note that closing LO_FLAGS_AUTOCLEARed lfd before mount
+                         * is wrong (would free the loop device!)
+                         */
+                        loopinfo.lo_flags = (flags & ~BB_LO_FLAGS_READ_ONLY);
+                        rc = ioctl(lfd, BB_LOOP_SET_STATUS, &loopinfo);
+                        if (rc != 0 && (loopinfo.lo_flags & BB_LO_FLAGS_AUTOCLEAR)) {
+                                /* Old kernel, does not support LO_FLAGS_AUTOCLEAR? */
+                                /* (this code path is not tested) */
+                                loopinfo.lo_flags -= BB_LO_FLAGS_AUTOCLEAR;
+                                rc = ioctl(lfd, BB_LOOP_SET_STATUS, &loopinfo);
+                        }
+                        if (rc == 0) {
+                                /* SUCCESS! */
+                                if (try != dev) /* tried a kernel-offered free loopN? */
+                                        *device = try; /* malloced */
+                                if (!*device)   /* was looping in search of free "/dev/loopN"? */
+                                        *device = xstrdup(dev);
+                                rc = lfd; /* return this */
+                                break;
+                        }
+                        /* failure, undo LOOP_SET_FD */
+                        ioctl(lfd, LOOP_CLR_FD, 0); // actually, 0 param is unnecessary
                 }
- try_again:
-                if (*device) break;
-        }
+                /* else: device is not free (rc == 0) or error other than ENXIO */
+ close_and_try_next_loopN:
+                close(lfd);
+ try_next_loopN:
+                rc = -1;
+                if (*device) /* was looking for a particular "/dev/loopN"? */
+                        break; /* yes, do not try other names */
+        } /* for() */
+
         close(ffd);
-        if (rc == 0) {
-                if (!*device)
-                        *device = xstrdup(dev);
-                return dfd;
-        }
         return rc;
 }
diff --git a/libbb/mode_string.c b/libbb/mode_string.c
index 6c5c08acd..dc3f9f88c 100644
--- a/libbb/mode_string.c
+++ b/libbb/mode_string.c
@@ -27,7 +27,7 @@
 #define mode_t unsigned short
 #endif
 
-static const mode_t mode_flags[] = {
+static const mode_t mode_flags[] ALIGN4 = {
         S_IRUSR, S_IWUSR, S_IXUSR, S_ISUID,
         S_IRGRP, S_IWGRP, S_IXGRP, S_ISGID,
         S_IROTH, S_IWOTH, S_IXOTH, S_ISVTX
diff --git a/libbb/platform.c b/libbb/platform.c
index 03bbb798b..329b0237e 100644
--- a/libbb/platform.c
+++ b/libbb/platform.c
@@ -27,7 +27,6 @@ int FAST_FUNC usleep(unsigned usec)
          * If a signal has non-default handler, nanosleep returns early.
          * Our version of usleep doesn't return early
          * if interrupted by such signals:
-         *
          */
         while (nanosleep(&ts, &ts) != 0)
                 continue;
@@ -107,7 +106,8 @@ void* FAST_FUNC memrchr(const void *s, int c, size_t n)
 /* This is now actually part of POSIX.1, but was only added in 2008 */
 char* FAST_FUNC mkdtemp(char *template)
 {
-        if (mktemp(template) == NULL || mkdir(template, 0700) != 0)
+        /* NB: on error, mktemp returns an empty string, not NULL */
+        if (mktemp(template)[0] == '\0' || mkdir(template, 0700) != 0)
                 return NULL;
         return template;
 }
diff --git a/libbb/procps.c b/libbb/procps.c
index 4f9705bc1..8c9cac125 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -21,40 +21,29 @@ typedef struct cache_t {
         int size;
 } cache_t;
 
-static cache_t username, groupname;
+static cache_t *cache_user_group;
 
-static void clear_cache(cache_t *cp)
-{
-        free(cp->cache);
-        cp->cache = NULL;
-        cp->size = 0;
-}
 void FAST_FUNC clear_username_cache(void)
 {
-        clear_cache(&username);
-        clear_cache(&groupname);
-}
-
-#if 0 /* more generic, but we don't need that yet */
-/* Returns -N-1 if not found. */
-/* cp->cache[N] is allocated and must be filled in this case */
-static int get_cached(cache_t *cp, uid_t id)
-{
-        int i;
-        for (i = 0; i < cp->size; i++)
-                if (cp->cache[i].id == id)
-                        return i;
-        i = cp->size++;
-        cp->cache = xrealloc_vector(cp->cache, 2, i);
-        cp->cache[i++].id = id;
-        return -i;
+        if (cache_user_group) {
+                free(cache_user_group[0].cache);
+                free(cache_user_group[1].cache);
+                free(cache_user_group);
+                cache_user_group = NULL;
+        }
 }
-#endif
 
-static char* get_cached(cache_t *cp, uid_t id,
+static char* get_cached(int user_group, uid_t id,
                         char* FAST_FUNC x2x_utoa(uid_t id))
 {
+        cache_t *cp;
         int i;
+
+        if (!cache_user_group)
+                cache_user_group = xzalloc(sizeof(cache_user_group[0]) * 2);
+
+        cp = &cache_user_group[user_group];
+
         for (i = 0; i < cp->size; i++)
                 if (cp->cache[i].id == id)
                         return cp->cache[i].name;
@@ -67,11 +56,11 @@ static char* get_cached(cache_t *cp, uid_t id,
 }
 const char* FAST_FUNC get_cached_username(uid_t uid)
 {
-        return get_cached(&username, uid, uid2uname_utoa);
+        return get_cached(0, uid, uid2uname_utoa);
 }
 const char* FAST_FUNC get_cached_groupname(gid_t gid)
 {
-        return get_cached(&groupname, gid, gid2group_utoa);
+        return get_cached(1, gid, gid2group_utoa);
 }
 
 #if !ENABLE_PLATFORM_MINGW32
@@ -95,15 +84,15 @@ static int read_to_buf(const char *filename, void *buf)
 
 static procps_status_t* FAST_FUNC alloc_procps_scan(void)
 {
-        unsigned n = getpagesize();
         procps_status_t* sp = xzalloc(sizeof(procps_status_t));
-        sp->dir = xopendir("/proc");
+        unsigned n = bb_getpagesize();
         while (1) {
                 n >>= 1;
                 if (!n) break;
                 sp->shift_pages_to_bytes++;
         }
         sp->shift_pages_to_kb = sp->shift_pages_to_bytes - 10;
+        sp->dir = xopendir("/proc");
         return sp;
 }
 
@@ -178,6 +167,7 @@ static char *skip_fields(char *str, int count)
 }
 #endif
 
+#if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP
 static char* skip_whitespace_if_prefixed_with(char *buf, const char *prefix)
 {
         char *tp = is_prefixed_with(buf, prefix);
@@ -187,7 +177,6 @@ static char* skip_whitespace_if_prefixed_with(char *buf, const char *prefix)
         return tp;
 }
 
-#if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP
 int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
                 void (*cb)(struct smaprec *, void *), void *data)
 {
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index 47c20690f..3463fd95b 100644
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -7,7 +7,9 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #if !ENABLE_USE_BB_CRYPT
-#include <crypt.h>
+# if !defined(__FreeBSD__)
+#  include <crypt.h>
+# endif
 #endif
 #include "libbb.h"
 
@@ -120,6 +122,7 @@ static char *my_crypt(const char *key, const char *salt)
         if (!des_cctx)
                 des_cctx = const_des_init();
         des_ctx = des_init(des_ctx, des_cctx);
+        /* Can return NULL if salt is bad ("" or "<one_char>") */
         return des_crypt(des_ctx, xzalloc(DES_OUT_BUFSIZE), (unsigned char*)key, (unsigned char*)salt);
 }
 
@@ -137,6 +140,8 @@ char* FAST_FUNC pw_encrypt(const char *clear, const char *salt, int cleanup)
         char *encrypted;
 
         encrypted = my_crypt(clear, salt);
+        if (!encrypted)
+                bb_simple_error_msg_and_die("bad salt");
 
         if (cleanup)
                 my_crypt_cleanup();
@@ -148,14 +153,16 @@ char* FAST_FUNC pw_encrypt(const char *clear, const char *salt, int cleanup)
 
 char* FAST_FUNC pw_encrypt(const char *clear, const char *salt, int cleanup)
 {
-        char *s;
+        char *encrypted;
 
-        s = crypt(clear, salt);
+        encrypted = crypt(clear, salt);
         /*
          * glibc used to return "" on malformed salts (for example, ""),
          * but since 2.17 it returns NULL.
          */
-        return xstrdup(s ? s : "");
+        if (!encrypted || !encrypted[0])
+                bb_simple_error_msg_and_die("bad salt");
+        return xstrdup(encrypted);
 }
 
 #endif
diff --git a/libbb/pw_encrypt_des.c b/libbb/pw_encrypt_des.c
index 19a9ab15b..dcd3521e2 100644
--- a/libbb/pw_encrypt_des.c
+++ b/libbb/pw_encrypt_des.c
@@ -65,25 +65,25 @@
 
 
 /* A pile of data */
-static const uint8_t IP[64] = {
+static const uint8_t IP[64] ALIGN1 = {
         58, 50, 42, 34, 26, 18, 10,  2, 60, 52, 44, 36, 28, 20, 12,  4,
         62, 54, 46, 38, 30, 22, 14,  6, 64, 56, 48, 40, 32, 24, 16,  8,
         57, 49, 41, 33, 25, 17,  9,  1, 59, 51, 43, 35, 27, 19, 11,  3,
         61, 53, 45, 37, 29, 21, 13,  5, 63, 55, 47, 39, 31, 23, 15,  7
 };
 
-static const uint8_t key_perm[56] = {
+static const uint8_t key_perm[56] ALIGN1 = {
         57, 49, 41, 33, 25, 17,  9,  1, 58, 50, 42, 34, 26, 18,
         10,  2, 59, 51, 43, 35, 27, 19, 11,  3, 60, 52, 44, 36,
         63, 55, 47, 39, 31, 23, 15,  7, 62, 54, 46, 38, 30, 22,
         14,  6, 61, 53, 45, 37, 29, 21, 13,  5, 28, 20, 12,  4
 };
 
-static const uint8_t key_shifts[16] = {
+static const uint8_t key_shifts[16] ALIGN1 = {
         1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
 };
 
-static const uint8_t comp_perm[48] = {
+static const uint8_t comp_perm[48] ALIGN1 = {
         14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
         23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
         41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
@@ -181,13 +181,12 @@ static const uint8_t u_sbox[8][32] = {
 };
 #endif
 
-static const uint8_t pbox[32] = {
+static const uint8_t pbox[32] ALIGN1 = {
         16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,  5, 18, 31, 10,
          2,  8, 24, 14, 32, 27,  3,  9, 19, 13, 30,  6, 22, 11,  4, 25
 };
 
-static const uint32_t bits32[32] =
-{
+static const uint32_t bits32[32] ALIGN4 = {
         0x80000000, 0x40000000, 0x20000000, 0x10000000,
         0x08000000, 0x04000000, 0x02000000, 0x01000000,
         0x00800000, 0x00400000, 0x00200000, 0x00100000,
@@ -198,7 +197,7 @@ static const uint32_t bits32[32] =
         0x00000008, 0x00000004, 0x00000002, 0x00000001
 };
 
-static const uint8_t bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
+static const uint8_t bits8[8] ALIGN1 = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
 
 
 static int
@@ -714,11 +713,15 @@ to64_msb_first(char *s, unsigned v)
 static char *
 NOINLINE
 des_crypt(struct des_ctx *ctx, char output[DES_OUT_BUFSIZE],
-                const unsigned char *key, const unsigned char *setting)
+                const unsigned char *key, const unsigned char *salt_str)
 {
         uint32_t salt, r0, r1, keybuf[2];
         uint8_t *q;
 
+        /* Bad salt? Mimic crypt() API - return NULL */
+        if (!salt_str[0] || !salt_str[1])
+                return NULL;
+
         /*
          * Copy the key, shifting each character up by one bit
          * and padding with zeros.
@@ -733,22 +736,15 @@ des_crypt(struct des_ctx *ctx, char output[DES_OUT_BUFSIZE],
         des_setkey(ctx, (char *)keybuf);
 
         /*
-         * setting - 2 bytes of salt
+         * salt_str - 2 bytes of salt
          * key - up to 8 characters
          */
-        salt = (ascii_to_bin(setting[1]) << 6)
-             |  ascii_to_bin(setting[0]);
-
-        output[0] = setting[0];
-        /*
-         * If the encrypted password that the salt was extracted from
-         * is only 1 character long, the salt will be corrupted.  We
-         * need to ensure that the output string doesn't have an extra
-         * NUL in it!
-         */
-        output[1] = setting[1] ? setting[1] : output[0];
-
+        output[0] = salt_str[0];
+        output[1] = salt_str[1];
+        salt = (ascii_to_bin(salt_str[1]) << 6)
+             |  ascii_to_bin(salt_str[0]);
         setup_salt(ctx, salt);
+
         /* Do it. */
         do_des(ctx, /*0, 0,*/ &r0, &r1, 25 /* count */);
 
diff --git a/libbb/rtc.c b/libbb/rtc.c
index c4117ba34..54b52f23a 100644
--- a/libbb/rtc.c
+++ b/libbb/rtc.c
@@ -7,12 +7,6 @@
 #include "libbb.h"
 #include "rtc_.h"
 
-#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS
-# define ADJTIME_PATH "/var/lib/hwclock/adjtime"
-#else
-# define ADJTIME_PATH "/etc/adjtime"
-#endif
-
 int FAST_FUNC rtc_adjtime_is_utc(void)
 {
         int utc = 0;
diff --git a/libbb/run_shell.c b/libbb/run_shell.c
index a0420d982..c22bba87b 100644
--- a/libbb/run_shell.c
+++ b/libbb/run_shell.c
@@ -48,10 +48,10 @@ void FAST_FUNC set_current_security_context(security_context_t sid)
 
 #endif
 
-/* Run SHELL, or DEFAULT_SHELL if SHELL is "" or NULL.
+/* Exec SHELL, or DEFAULT_SHELL if SHELL is "" or NULL.
  * If ADDITIONAL_ARGS is not NULL, pass them to the shell.
  */
-void FAST_FUNC run_shell(const char *shell, int loginshell, const char **additional_args)
+void FAST_FUNC exec_shell(const char *shell, int loginshell, const char **additional_args)
 {
         const char **args;
 
@@ -59,7 +59,7 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char **additio
         while (args && *args)
                 args++;
 
-        args = xmalloc(sizeof(char*) * (2 + (args - additional_args)));
+        args = xzalloc(sizeof(args[0]) * (2 + (args - additional_args)));
 
         if (!shell || !shell[0])
                 shell = DEFAULT_SHELL;
@@ -67,12 +67,11 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char **additio
         args[0] = bb_get_last_path_component_nostrip(shell);
         if (loginshell)
                 args[0] = xasprintf("-%s", args[0]);
-        args[1] = NULL;
+        /*args[1] = NULL; - already is */
         if (additional_args) {
-                int cnt = 1;
-                for (;;)
-                        if ((args[cnt++] = *additional_args++) == NULL)
-                                break;
+                int cnt = 0;
+                while (*additional_args)
+                        args[++cnt] = *additional_args++;
         }
 
 #if ENABLE_SELINUX
@@ -84,3 +83,20 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char **additio
         execv(shell, (char **) args);
         bb_perror_msg_and_die("can't execute '%s'", shell);
 }
+
+void FAST_FUNC exec_login_shell(const char *shell)
+{
+        exec_shell(shell, 1, NULL);
+}
+
+/* Typical idiom for applets which exec *optional* PROG [ARGS] */
+void FAST_FUNC exec_prog_or_SHELL(char **argv)
+{
+        if (argv[0]) {
+                BB_EXECVP_or_die(argv);
+        }
+        /* Both users (nsenter and unshare) do indeed exec
+         * a _login_ shell (with dash in argv[0])!
+         */
+        exec_login_shell(getenv("SHELL"));
+}
diff --git a/libbb/speed_table.c b/libbb/speed_table.c
index 967cf8de8..cf7101e64 100644
--- a/libbb/speed_table.c
+++ b/libbb/speed_table.c
@@ -28,7 +28,7 @@ struct speed_map {
 };
 
 /* On Linux, Bxx constants are 0..15 (up to B38400) and 0x1001..0x100f */
-static const struct speed_map speeds[] = {
+static const struct speed_map speeds[] ALIGN4 = {
         {B0, 0},
         {B50, 50},
         {B75, 75},
diff --git a/libbb/time.c b/libbb/time.c
index e66a9cba8..cf5f2e5c8 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -90,7 +90,11 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                 ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
         } else
         if (date_str[0] == '@') {
-                time_t t = bb_strtol(date_str + 1, NULL, 10);
+                time_t t;
+                if (sizeof(t) <= sizeof(long))
+                        t = bb_strtol(date_str + 1, NULL, 10);
+                else /* time_t is 64 bits but longs are smaller */
+                        t = bb_strtoll(date_str + 1, NULL, 10);
                 if (!errno) {
                         struct tm *lt = localtime(&t);
                         if (lt) {
@@ -246,7 +250,6 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
 
 #if ENABLE_MONOTONIC_SYSCALL
 
-#include <sys/syscall.h>
 /* Old glibc (< 2.3.4) does not provide this constant. We use syscall
  * directly so this definition is safe. */
 #ifndef CLOCK_MONOTONIC
@@ -288,19 +291,19 @@ unsigned FAST_FUNC monotonic_sec(void)
 unsigned long long FAST_FUNC monotonic_ns(void)
 {
         struct timeval tv;
-        gettimeofday(&tv, NULL);
+        xgettimeofday(&tv);
         return tv.tv_sec * 1000000000ULL + tv.tv_usec * 1000;
 }
 unsigned long long FAST_FUNC monotonic_us(void)
 {
         struct timeval tv;
-        gettimeofday(&tv, NULL);
+        xgettimeofday(&tv);
         return tv.tv_sec * 1000000ULL + tv.tv_usec;
 }
 unsigned long long FAST_FUNC monotonic_ms(void)
 {
         struct timeval tv;
-        gettimeofday(&tv, NULL);
+        xgettimeofday(&tv);
         return tv.tv_sec * 1000ULL + tv.tv_usec / 1000;
 }
 unsigned FAST_FUNC monotonic_sec(void)
diff --git a/libbb/unicode.c b/libbb/unicode.c
index 79481f159..e98cbbf35 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -25,7 +25,7 @@ uint8_t unicode_status;
 
 void FAST_FUNC reinit_unicode(const char *LANG)
 {
-        static const char unicode_0x394[] = { 0xce, 0x94, 0 };
+        static const char unicode_0x394[] ALIGN1 = { 0xce, 0x94, 0 };
         size_t width;
 
         /* We pass "" instead of "C" because some libc's have
@@ -306,8 +306,10 @@ static int in_uint16_table(unsigned ucs, const uint16_t *table, unsigned max)
         unsigned first, last;
 
         first = table[0] >> 2;
-        last = first + (table[0] & 3);
-        if (ucs < first || ucs > last)
+        if (ucs < first)
+                return 0;
+        last = (table[max] >> 2) + (table[max] & 3);
+        if (ucs > last)
                 return 0;
 
         min = 0;
@@ -587,12 +589,12 @@ int FAST_FUNC wcwidth(unsigned ucs)
                 BIG_(0xFE20, 0xFE23) \
                 BIG_(0xFEFF, 0xFEFF) \
                 BIG_(0xFFF9, 0xFFFB)
-        static const struct interval combining[] = { ARRAY };
+        static const struct interval combining[] ALIGN4 = { ARRAY };
 #  undef BIG_
 #  undef PAIR
 #  define BIG_(a,b)
 #  define PAIR(a,b) (a << 2) | (b-a),
-        static const uint16_t combining1[] = { ARRAY };
+        static const uint16_t combining1[] ALIGN2 = { ARRAY };
 #  undef BIG_
 #  undef PAIR
 #  define BIG_(a,b) char big_##a[b < 0x4000 && b-a <= 3 ? -1 : 1];
@@ -646,7 +648,7 @@ int FAST_FUNC wcwidth(unsigned ucs)
 #   if CONFIG_LAST_SUPPORTED_WCHAR >= 0x10000
         if (ucs >= 0x10000) {
                 /* Combining chars in Supplementary Multilingual Plane 0x1xxxx */
-                static const struct interval combining0x10000[] = {
+                static const struct interval combining0x10000[] ALIGN4 = {
                         { 0x0A01, 0x0A03 }, { 0x0A05, 0x0A06 }, { 0x0A0C, 0x0A0F },
                         { 0x0A38, 0x0A3A }, { 0x0A3F, 0x0A3F }, { 0xD167, 0xD169 },
                         { 0xD173, 0xD182 }, { 0xD185, 0xD18B }, { 0xD1AA, 0xD1AD },
@@ -757,12 +759,12 @@ int FAST_FUNC unicode_bidi_isrtl(wint_t wc)
                 {0x10E7F, 0x10FFF},
                 {0x1E800, 0x1EFFF}
                 */
-        static const struct interval rtl_b[] = { ARRAY };
+        static const struct interval rtl_b[] ALIGN4 = { ARRAY };
 #  undef BIG_
 #  undef PAIR
 #  define BIG_(a,b)
 #  define PAIR(a,b) (a << 2) | (b-a),
-        static const uint16_t rtl_p[] = { ARRAY };
+        static const uint16_t rtl_p[] ALIGN2 = { ARRAY };
 #  undef BIG_
 #  undef PAIR
 #  define BIG_(a,b) char big_##a[b < 0x4000 && b-a <= 3 ? -1 : 1];
@@ -961,12 +963,12 @@ int FAST_FUNC unicode_bidi_is_neutral_wchar(wint_t wc)
                 {0x1F030, 0x1F093},
                 {0x1F100, 0x1F10A}
                 */
-        static const struct interval neutral_b[] = { ARRAY };
+        static const struct interval neutral_b[] ALIGN4 = { ARRAY };
 #  undef BIG_
 #  undef PAIR
 #  define BIG_(a,b)
 #  define PAIR(a,b) (a << 2) | (b-a),
-        static const uint16_t neutral_p[] = { ARRAY };
+        static const uint16_t neutral_p[] ALIGN2 = { ARRAY };
 #  undef BIG_
 #  undef PAIR
 #  define BIG_(a,b) char big_##a[b < 0x4000 && b-a <= 3 ? -1 : 1];
diff --git a/libbb/uuencode.c b/libbb/uuencode.c
index d36b34f63..21af7a8c9 100644
--- a/libbb/uuencode.c
+++ b/libbb/uuencode.c
@@ -8,8 +8,18 @@
  */
 #include "libbb.h"
 
-/* Conversion table.  for base 64 */
-const char bb_uuenc_tbl_base64[65 + 1] ALIGN1 = {
+/* Conversion tables */
+#if ENABLE_BASE32
+const char bb_uuenc_tbl_base32[] ALIGN1 = {
+        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+        'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+        'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+        'Y', 'Z', '2', '3', '4', '5', '6', '7',
+        /* unused: '=', */
+};
+#endif
+/* for base 64 */
+const char bb_uuenc_tbl_base64[] ALIGN1 = {
         'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
         'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
         'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
@@ -18,11 +28,9 @@ const char bb_uuenc_tbl_base64[65 + 1] ALIGN1 = {
         'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
         'w', 'x', 'y', 'z', '0', '1', '2', '3',
         '4', '5', '6', '7', '8', '9', '+', '/',
-        '=' /* termination character */,
-        '\0' /* needed for uudecode.c only */
+        '=' /* termination character */
 };
-
-const char bb_uuenc_tbl_std[65] ALIGN1 = {
+const char bb_uuenc_tbl_std[] ALIGN1 = {
         '`', '!', '"', '#', '$', '%', '&', '\'',
         '(', ')', '*', '+', ',', '-', '.', '/',
         '0', '1', '2', '3', '4', '5', '6', '7',
@@ -30,7 +38,7 @@ const char bb_uuenc_tbl_std[65] ALIGN1 = {
         '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
         'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
         'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-        'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
+        'X', 'Y', 'Z', '[', '\\',']', '^', '_',
         '`' /* termination character */
 };
 
@@ -72,86 +80,124 @@ void FAST_FUNC bb_uuencode(char *p, const void *src, int length, const char *tbl
 }
 
 /*
- * Decode base64 encoded string. Stops on '\0'.
+ * Decode base64 encoded string.
  *
- * Returns: pointer to the undecoded part of source.
+ * Returns: pointer past the last written output byte,
+ * the result is not NUL-terminated.
+ * (*pp_src) is advanced past the last read byte.
  * If points to '\0', then the source was fully decoded.
- * (*pp_dst): advanced past the last written byte.
  */
-const char* FAST_FUNC decode_base64(char **pp_dst, const char *src)
+char* FAST_FUNC decode_base64(char *dst, const char **pp_src)
 {
-        char *dst = *pp_dst;
-        const char *src_tail;
+        const char *src = pp_src ? *pp_src : dst; /* for httpd.c, support NULL 2nd param */
+        unsigned ch = 0;
+        unsigned t;
+        int i = 0;
 
-        while (1) {
-                unsigned char six_bit[4];
-                int count = 0;
-
-                /* Fetch up to four 6-bit values */
-                src_tail = src;
-                while (count < 4) {
-                        char *table_ptr;
-                        int ch;
-
-                        /* Get next _valid_ character.
-                         * bb_uuenc_tbl_base64[] contains this string:
-                         *  0         1         2         3         4         5         6
-                         *  01234567890123456789012345678901234567890123456789012345678901234
-                         * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
-                         */
-                        do {
-                                ch = *src;
-                                if (ch == '\0') {
-                                        if (count == 0) {
-                                                /* Example:
-                                                 * If we decode "QUJD <NUL>", we want
-                                                 * to return ptr to NUL, not to ' ',
-                                                 * because we did fully decode
-                                                 * the string (to "ABC").
-                                                 */
-                                                src_tail = src;
-                                        }
-                                        goto ret;
-                                }
-                                src++;
-                                table_ptr = strchr(bb_uuenc_tbl_base64, ch);
-//TODO: add BASE64_FLAG_foo to die on bad char?
-                        } while (!table_ptr);
+        while ((t = (unsigned char)*src) != '\0') {
+                src++;
 
-                        /* Convert encoded character to decimal */
-                        ch = table_ptr - bb_uuenc_tbl_base64;
+                /* "if" forest is faster than strchr(bb_uuenc_tbl_base64, t) */
+                if (t >= '0' && t <= '9')
+                        t = t - '0' + 52;
+                else if (t >= 'A' && t <= 'Z')
+                        t = t - 'A';
+                else if (t >= 'a' && t <= 'z')
+                        t = t - 'a' + 26;
+                else if (t == '+')
+                        t = 62;
+                else if (t == '/')
+                        t = 63;
+                else if (t == '=' && (i == 3 || (i == 2 && *src == '=')))
+                        /* the above disallows "==AA", "A===", "AA=A" etc */
+                        t = 0x1000000;
+                else
+//TODO: add BASE64_FLAG_foo to die on bad char?
+                        continue;
 
-                        /* ch is 64 if char was '=', otherwise 0..63 */
-                        if (ch == 64)
+                ch = (ch << 6) | t;
+                i = (i + 1) & 3;
+                if (i == 0) {
+                        *dst++ = (char) (ch >> 16);
+                        *dst++ = (char) (ch >> 8);
+                        *dst++ = (char) ch;
+                        if (ch & 0x1000000) { /* was last input char '='? */
+                                dst--;
+                                if (ch & (0x1000000 << 6)) /* was it "=="? */
+                                        dst--;
                                 break;
-                        six_bit[count] = ch;
-                        count++;
+                        }
+                        ch = 0;
+                }
+        }
+        /* i is zero here if full 4-char block was decoded */
+        if (pp_src)
+                *pp_src = src - i; /* -i signals truncation: e.g. "MQ" and "MQ=" (correct encoding is "MQ==" -> "1") */
+        return dst;
+}
+
+#if ENABLE_BASE32
+char* FAST_FUNC decode_base32(char *dst, const char **pp_src)
+{
+        const char *src = *pp_src;
+        uint64_t ch = 0;
+        unsigned t;
+        int i = 0;
+
+        while ((t = (unsigned char)*src) != '\0') {
+                src++;
+
+                /* "if" forest is faster than strchr(bb_uuenc_tbl_base32, t) */
+                if (t >= '2' && t <= '7')
+                        t = t - '2' + 26;
+                else if (t == '=' && i > 1)
+                        t = 0;
+                else {
+                        t = (t | 0x20) - 'a';
+                        if (t > 25)
+//TODO: add BASE64_FLAG_foo to die on bad char?
+                                continue;
                 }
 
-                /* Transform 6-bit values to 8-bit ones.
-                 * count can be < 4 when we decode the tail:
-                 * "eQ==" -> "y", not "y NUL NUL".
-                 * Note that (count > 1) is always true,
-                 * "x===" encoding is not valid:
-                 * even a single zero byte encodes as "AA==".
-                 * However, with current logic we come here with count == 1
-                 * when we decode "==" tail.
-                 */
-                if (count > 1)
-                        *dst++ = six_bit[0] << 2 | six_bit[1] >> 4;
-                if (count > 2)
-                        *dst++ = six_bit[1] << 4 | six_bit[2] >> 2;
-                if (count > 3)
-                        *dst++ = six_bit[2] << 6 | six_bit[3];
-                /* Note that if we decode "AA==" and ate first '=',
-                 * we just decoded one char (count == 2) and now we'll
-                 * do the loop once more to decode second '='.
+                ch = (ch << 5) | t;
+                i = (i + 1) & 7;
+                if (i == 0) {
+                        *dst++ = (char) (ch >> 32);
+                        if (src[-1] == '=') /* was last input char '='? */
+                                goto tail;
+                        *dst++ = (char) (ch >> 24);
+                        *dst++ = (char) (ch >> 16);
+                        *dst++ = (char) (ch >> 8);
+                        *dst++ = (char) ch;
+                }
+        }
+        /* i is zero here if full 8-char block was decoded */
+        *pp_src = src - i;
+        return dst;
+ tail:
+        {
+                const char *s = src;
+                while (*--s == '=')
+                        i++;
+                /* Why duplicate the below code? Testcase:
+                 * echo ' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18' | base32 | base32 -d
+                 * IOW, decoding of
+                 * EAYSAMRAGMQDIIBVEA3CANZAHAQDSIBRGAQDCMJAGEZCAMJTEAYTIIBRGUQDCNRAGE3SAMJYBI==
+                 * ====
+                 * must correctly stitch together the tail, must not overwrite
+                 * the tail before it is analyzed! (we can be decoding in-place)
+                 * Else testcase fails, prints trailing extra NUL bytes.
                  */
-        } /* while (1) */
- ret:
-        *pp_dst = dst;
-        return src_tail;
+                *dst++ = (char) (ch >> 24);
+                *dst++ = (char) (ch >> 16);
+                *dst++ = (char) (ch >> 8);
+                *dst++ = (char) ch;
+                dst -= (i+1) * 2 / 3; /* discard last 1, 2, 3 or 4 bytes */
+        }
+        *pp_src = src;
+        return dst;
 }
+#endif
 
 /*
  * Decode base64 encoded stream.
@@ -163,20 +209,22 @@ void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags)
 /* Note that EOF _can_ be passed as exit_char too */
 #define exit_char    ((int)(signed char)flags)
 #define uu_style_end (flags & BASE64_FLAG_UU_STOP)
+#define base32       (flags & BASE64_32)
 
-        /* uuencoded files have 61 byte lines. Use 64 byte buffer
-         * to process line at a time.
+        /* uuencoded files have 61 byte lines.
+         * base32/64 have 76 byte lines by default.
+         * Use 80 byte buffer to process one line at a time.
          */
-        enum { BUFFER_SIZE = 64 };
-
-        char in_buf[BUFFER_SIZE + 2];
-        char out_buf[BUFFER_SIZE / 4 * 3 + 2];
-        char *out_tail;
-        const char *in_tail;
+        enum { BUFFER_SIZE = 80 };
+        /* decoded data is shorter than input, can use single buffer for both */
+        char buf[BUFFER_SIZE + 2];
         int term_seen = 0;
         int in_count = 0;
 
         while (1) {
+                char *out_tail;
+                const char *in_tail;
+
                 while (in_count < BUFFER_SIZE) {
                         int ch = fgetc(src_stream);
                         if (ch == exit_char) {
@@ -195,29 +243,34 @@ void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags)
                          */
                         if (ch <= ' ')
                                 break;
-                        in_buf[in_count++] = ch;
+                        buf[in_count++] = ch;
                 }
-                in_buf[in_count] = '\0';
+                buf[in_count] = '\0';
 
                 /* Did we encounter "====" line? */
-                if (uu_style_end && strcmp(in_buf, "====") == 0)
+                if (uu_style_end && strcmp(buf, "====") == 0)
                         return;
 
-                out_tail = out_buf;
-                in_tail = decode_base64(&out_tail, in_buf);
+                in_tail = buf;
+#if ENABLE_BASE32
+                if (base32)
+                        out_tail = decode_base32(buf, &in_tail);
+                else
+#endif
+                        out_tail = decode_base64(buf, &in_tail);
 
-                fwrite(out_buf, (out_tail - out_buf), 1, dst_stream);
+                fwrite(buf, (out_tail - buf), 1, dst_stream);
 
                 if (term_seen) {
                         /* Did we consume ALL characters? */
                         if (*in_tail == '\0')
                                 return;
                         /* No */
-                        bb_simple_error_msg_and_die("truncated base64 input");
+                        bb_simple_error_msg_and_die("truncated input");
                 }
 
                 /* It was partial decode */
                 in_count = strlen(in_tail);
-                memmove(in_buf, in_tail, in_count);
+                memmove(buf, in_tail, in_count);
         }
 }
diff --git a/libbb/xatonum.c b/libbb/xatonum.c
index 7639a62aa..36b06c849 100644
--- a/libbb/xatonum.c
+++ b/libbb/xatonum.c
@@ -68,14 +68,14 @@ uint16_t FAST_FUNC xatou16(const char *numstr)
         return xatou_range(numstr, 0, 0xffff);
 }
 
-const struct suffix_mult bkm_suffixes[] = {
+const struct suffix_mult bkm_suffixes[] ALIGN_SUFFIX = {
         { "b", 512 },
         { "k", 1024 },
         { "m", 1024*1024 },
         { "", 0 }
 };
 
-const struct suffix_mult cwbkMG_suffixes[] = {
+const struct suffix_mult cwbkMG_suffixes[] ALIGN_SUFFIX = {
         { "c", 1 },
         { "w", 2 },
         { "b", 512 },
@@ -96,7 +96,7 @@ const struct suffix_mult cwbkMG_suffixes[] = {
         { "", 0 }
 };
 
-const struct suffix_mult kmg_i_suffixes[] = {
+const struct suffix_mult kmg_i_suffixes[] ALIGN_SUFFIX = {
         { "KiB", 1024 },
         { "kiB", 1024 },
         { "K", 1024 },
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 38faef38e..f5c514b2c 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -428,17 +428,14 @@ int FAST_FUNC create_and_bind_to_netlink(int proto, int grp, unsigned rcvbuf)
         struct sockaddr_nl sa;
         int fd;
 
-        memset(&sa, 0, sizeof(sa));
-        sa.nl_family = AF_NETLINK;
-        sa.nl_pid = getpid();
-        sa.nl_groups = grp;
         fd = xsocket(AF_NETLINK, SOCK_DGRAM, proto);
-        xbind(fd, (struct sockaddr *) &sa, sizeof(sa));
-        close_on_exec_on(fd);
 
+        /* Set receive buffer size before binding the socket
+         * We want to have enough space before we start receiving messages.
+         */
         if (rcvbuf != 0) {
-                // SO_RCVBUFFORCE (root only) can go above net.core.rmem_max sysctl
-                setsockopt_SOL_SOCKET_int(fd, SO_RCVBUF,      rcvbuf);
+                setsockopt_SOL_SOCKET_int(fd, SO_RCVBUF, rcvbuf);
+                /* SO_RCVBUFFORCE (root only) can go above net.core.rmem_max */
                 setsockopt_SOL_SOCKET_int(fd, SO_RCVBUFFORCE, rcvbuf);
 # if 0
                 {
@@ -450,6 +447,13 @@ int FAST_FUNC create_and_bind_to_netlink(int proto, int grp, unsigned rcvbuf)
 # endif
         }
 
+        memset(&sa, 0, sizeof(sa));
+        sa.nl_family = AF_NETLINK;
+        sa.nl_pid = getpid();
+        sa.nl_groups = grp;
+        xbind(fd, (struct sockaddr *) &sa, sizeof(sa));
+        close_on_exec_on(fd);
+
         return fd;
 }
 #endif
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index c92436683..ef990118e 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -421,15 +421,3 @@ int FAST_FUNC wait4pid(pid_t pid)
                 return WTERMSIG(status) + 0x180;
         return 0;
 }
-
-// Useful when we do know that pid is valid, and we just want to wait
-// for it to exit. Not existing pid is fatal. waitpid() status is not returned.
-int FAST_FUNC wait_for_exitstatus(pid_t pid)
-{
-        int exit_status, n;
-
-        n = safe_waitpid(pid, &exit_status, 0);
-        if (n < 0)
-                bb_simple_perror_msg_and_die("waitpid");
-        return exit_status;
-}
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 6fdc0f6a4..4bd19d471 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -111,6 +111,29 @@ void* FAST_FUNC xmemdup(const void *s, int n)
         return memcpy(xmalloc(n), s, n);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
+void* FAST_FUNC mmap_read(int fd, size_t size)
+{
+        return mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+}
+
+void* FAST_FUNC mmap_anon(size_t size)
+{
+        return mmap(NULL, size,
+                        PROT_READ | PROT_WRITE,
+                        MAP_PRIVATE | MAP_ANONYMOUS,
+                        /* ignored: */ -1, 0);
+}
+
+void* FAST_FUNC xmmap_anon(size_t size)
+{
+        void *p = mmap_anon(size);
+        if (p == MAP_FAILED)
+                bb_die_memory_exhausted();
+        return p;
+}
+#endif
+
 // Die if we can't open a file and return a FILE* to it.
 // Notice we haven't got xfread(), This is for use with fscanf() and friends.
 FILE* FAST_FUNC xfopen(const char *path, const char *mode)
@@ -502,22 +525,22 @@ void FAST_FUNC xfstat(int fd, struct stat *stat_buf, const char *errmsg)
                 bb_simple_perror_msg_and_die(errmsg);
 }
 
-#if !ENABLE_PLATFORM_MINGW32
+#if ENABLE_SELINUX
 // selinux_or_die() - die if SELinux is disabled.
 void FAST_FUNC selinux_or_die(void)
 {
-#if ENABLE_SELINUX
         int rc = is_selinux_enabled();
         if (rc == 0) {
                 bb_simple_error_msg_and_die("SELinux is disabled");
         } else if (rc < 0) {
                 bb_simple_error_msg_and_die("is_selinux_enabled() failed");
         }
+}
 #else
-        bb_simple_error_msg_and_die("SELinux support is disabled");
+/* not defined, other code must have no calls to it */
 #endif
-}
 
+#if !ENABLE_PLATFORM_MINGW32
 int FAST_FUNC ioctl_or_perror_and_die(int fd, unsigned request, void *argp, const char *fmt,...)
 {
         int ret;
@@ -634,14 +657,11 @@ void FAST_FUNC generate_uuid(uint8_t *buf)
         pid_t pid;
         int i;
 
-        i = open("/dev/urandom", O_RDONLY);
-        if (i >= 0) {
-                read(i, buf, 16);
-                close(i);
-        }
+        open_read_close("/dev/urandom", buf, 16);
         /* Paranoia. /dev/urandom may be missing.
          * rand() is guaranteed to generate at least [0, 2^15) range,
-         * but lowest bits in some libc are not so "random".  */
+         * but lowest bits in some libc are not so "random".
+         */
         srand(monotonic_us()); /* pulls in printf */
         pid = getpid();
         while (1) {
@@ -686,3 +706,34 @@ void FAST_FUNC xvfork_parent_waits_and_exits(void)
         /* Child continues */
 }
 #endif /* !ENABLE_PLATFORM_MINGW32 */
+
+// Useful when we do know that pid is valid, and we just want to wait
+// for it to exit. Not existing pid is fatal. waitpid() status is not returned.
+int FAST_FUNC wait_for_exitstatus(pid_t pid)
+{
+        int exit_status, n;
+
+        n = safe_waitpid(pid, &exit_status, 0);
+        if (n < 0)
+                bb_simple_perror_msg_and_die("waitpid");
+        return exit_status;
+}
+
+#if !ENABLE_PLATFORM_MINGW32
+void FAST_FUNC xsettimeofday(const struct timeval *tv)
+{
+        if (settimeofday(tv, NULL))
+                bb_simple_perror_msg_and_die("settimeofday");
+}
+#endif
+
+void FAST_FUNC xgettimeofday(struct timeval *tv)
+{
+#if 0
+        if (gettimeofday(tv, NULL))
+                bb_simple_perror_msg_and_die("gettimeofday");
+#else
+        /* Never fails on Linux */
+        gettimeofday(tv, NULL);
+#endif
+}
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 4e70b2557..a032abbed 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -24,21 +24,13 @@
 //kbuild:lib-$(CONFIG_CHPASSWD) += chpasswd.o
 
 //usage:#define chpasswd_trivial_usage
-//usage:        IF_LONG_OPTS("[--md5|--encrypted|--crypt-method|--root]") IF_NOT_LONG_OPTS("[-m|-e|-c|-R]")
+//usage:        "[-me] [-c ALG] [-R DIR]"
 //usage:#define chpasswd_full_usage "\n\n"
 //usage:       "Read user:password from stdin and update /etc/passwd\n"
-//usage:        IF_LONG_OPTS(
-//usage:     "\n        -e,--encrypted          Supplied passwords are in encrypted form"
-//usage:     "\n        -m,--md5                Encrypt using md5, not des"
-//usage:     "\n        -c,--crypt-method ALG   "CRYPT_METHODS_HELP_STR
-//usage:     "\n        -R,--root DIR           Directory to chroot into"
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -e      Supplied passwords are in encrypted form"
 //usage:     "\n        -m      Encrypt using md5, not des"
 //usage:     "\n        -c ALG  "CRYPT_METHODS_HELP_STR
 //usage:     "\n        -R DIR  Directory to chroot into"
-//usage:        )
 
 #include "libbb.h"
 
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index fbb7f0515..645f1bb09 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -32,22 +32,14 @@
 //kbuild:lib-$(CONFIG_MKPASSWD) += cryptpw.o
 
 //usage:#define cryptpw_trivial_usage
-//usage:       "[OPTIONS] [PASSWORD] [SALT]"
+//usage:       "[-s] [-p N] [-m TYPE] [-S SALT] [PASSWORD] [SALT]"
 /* We do support -s, we just don't mention it */
 //usage:#define cryptpw_full_usage "\n\n"
 //usage:       "Print crypt(3) hashed PASSWORD\n"
-//usage:        IF_LONG_OPTS(
-//usage:     "\n        -P,--password-fd N      Read password from fd N"
-/* //usage:  "\n        -s,--stdin              Use stdin; like -P0" */
-//usage:     "\n        -m,--method TYPE        "CRYPT_METHODS_HELP_STR
-//usage:     "\n        -S,--salt SALT"
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -P N    Read password from fd N"
 /* //usage:  "\n        -s      Use stdin; like -P0" */
 //usage:     "\n        -m TYPE "CRYPT_METHODS_HELP_STR
 //usage:     "\n        -S SALT"
-//usage:        )
 
 #include "libbb.h"
 
diff --git a/loginutils/getty.c b/loginutils/getty.c
index 7393a3d1c..6c6d409f4 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -404,7 +404,7 @@ static void finalize_tty_attrs(void)
         set_tty_attrs();
 
         /* Now the newline character should be properly written */
-        full_write(STDOUT_FILENO, "\n", 1);
+        full_write1_str("\n");
 }
 
 /* extract baud rate from modem status message */
@@ -434,7 +434,7 @@ static void auto_baud(void)
          * Wait for a while, then read everything the modem has said so far and
          * try to extract the speed of the dial-in call.
          */
-        sleep(1);
+        sleep1();
         nread = safe_read(STDIN_FILENO, G.line_buf, sizeof(G.line_buf) - 1);
         if (nread > 0) {
                 int speed;
@@ -498,13 +498,13 @@ static char *get_logname(void)
                         case 0x7f:
                                 G.tty_attrs.c_cc[VERASE] = c;
                                 if (bp > G.line_buf) {
-                                        full_write(STDOUT_FILENO, "\010 \010", 3);
+                                        full_write1_str("\010 \010");
                                         bp--;
                                 }
                                 break;
                         case CTL('U'):
                                 while (bp > G.line_buf) {
-                                        full_write(STDOUT_FILENO, "\010 \010", 3);
+                                        full_write1_str("\010 \010");
                                         bp--;
                                 }
                                 break;
diff --git a/loginutils/login.c b/loginutils/login.c
index 4e65b3a19..21c32fc25 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -341,6 +341,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_LOGIN_SESSION_AS_CHILD
         pid_t child_pid;
 #endif
+        IF_FEATURE_UTMP(pid_t my_pid;)
 
         INIT_G();
 
@@ -504,16 +505,14 @@ int login_main(int argc UNUSED_PARAM, char **argv)
 #endif /* ENABLE_PAM */
  auth_failed:
                 opt &= ~LOGIN_OPT_f;
-                bb_do_delay(LOGIN_FAIL_DELAY);
+                pause_after_failed_login();
                 /* TODO: doesn't sound like correct English phrase to me */
                 puts("Login incorrect");
+                syslog(LOG_WARNING, "invalid password for '%s'%s",
+                                        username, fromhost);
                 if (++count == 3) {
-                        syslog(LOG_WARNING, "invalid password for '%s'%s",
-                                                username, fromhost);
-
                         if (ENABLE_FEATURE_CLEAN_UP)
                                 free(fromhost);
-
                         return EXIT_FAILURE;
                 }
                 username[0] = '\0';
@@ -525,6 +524,9 @@ int login_main(int argc UNUSED_PARAM, char **argv)
         if (pw->pw_uid != 0)
                 die_if_nologin();
 
+        IF_FEATURE_UTMP(my_pid = getpid();)
+        update_utmp(my_pid, USER_PROCESS, short_tty, username, run_by_root ? opt_host : NULL);
+
 #if ENABLE_LOGIN_SESSION_AS_CHILD
         child_pid = vfork();
         if (child_pid != 0) {
@@ -532,8 +534,8 @@ int login_main(int argc UNUSED_PARAM, char **argv)
                         bb_simple_perror_msg("vfork");
                 else {
                         wait_for_exitstatus(child_pid);
-                        update_utmp_DEAD_PROCESS(child_pid);
                 }
+                update_utmp_DEAD_PROCESS(my_pid);
                 login_pam_end(pamh);
                 return 0;
         }
@@ -546,8 +548,6 @@ int login_main(int argc UNUSED_PARAM, char **argv)
         fchown(0, pw->pw_uid, pw->pw_gid);
         fchmod(0, 0600);
 
-        update_utmp(getpid(), USER_PROCESS, short_tty, username, run_by_root ? opt_host : NULL);
-
         /* We trust environment only if we run by root */
         if (ENABLE_LOGIN_SCRIPTS && run_by_root)
                 run_login_script(pw, full_tty);
@@ -602,7 +602,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
         signal(SIGINT, SIG_DFL);
 
         /* Exec login shell with no additional parameters */
-        run_shell(pw->pw_shell, 1, NULL);
+        exec_login_shell(pw->pw_shell);
 
         /* return EXIT_FAILURE; - not reached */
 }
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 6c643d3d0..acc942275 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -28,7 +28,7 @@
 //kbuild:lib-$(CONFIG_PASSWD) += passwd.o
 
 //usage:#define passwd_trivial_usage
-//usage:       "[OPTIONS] [USER]"
+//usage:       "[-a ALG] [-dlu] [USER]"
 //usage:#define passwd_full_usage "\n\n"
 //usage:       "Change USER's password (default: current user)"
 //usage:     "\n"
@@ -57,7 +57,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo
                 encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */
                 if (strcmp(encrypted, pw->pw_passwd) != 0) {
                         syslog(LOG_WARNING, "incorrect password for %s", pw->pw_name);
-                        bb_do_delay(LOGIN_FAIL_DELAY);
+                        pause_after_failed_login();
                         puts("Incorrect password");
                         goto err_ret;
                 }
diff --git a/loginutils/su.c b/loginutils/su.c
index 79edbc44a..e46bbf78b 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -147,7 +147,7 @@ int su_main(int argc UNUSED_PARAM, char **argv)
                 if (ENABLE_FEATURE_SU_SYSLOG)
                         syslog(LOG_NOTICE, "%c %s %s:%s",
                                 '-', tty, old_user, opt_username);
-                bb_do_delay(LOGIN_FAIL_DELAY);
+                pause_after_failed_login();
                 bb_simple_error_msg_and_die("incorrect password");
         }
 
@@ -205,7 +205,7 @@ int su_main(int argc UNUSED_PARAM, char **argv)
          */
 
         /* Never returns */
-        run_shell(opt_shell, flags & SU_OPT_l, (const char**)argv);
+        exec_shell(opt_shell, flags & SU_OPT_l, (const char**)argv);
 
         /* return EXIT_FAILURE; - not reached */
 }
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 099085340..69d8b5ec7 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -74,7 +74,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
                 if (r > 0) {
                         break;
                 }
-                bb_do_delay(LOGIN_FAIL_DELAY);
+                pause_after_failed_login();
                 bb_simple_info_msg("Login incorrect");
         }
 
@@ -89,5 +89,5 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
                 shell = pwd->pw_shell;
 
         /* Exec login shell with no additional parameters. Never returns. */
-        run_shell(shell, 1, NULL);
+        exec_login_shell(shell);
 }
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 9e319fe61..334b7d2ad 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -120,7 +120,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
                 if (ask_and_check_password(pw) > 0) {
                         break;
                 }
-                bb_do_delay(LOGIN_FAIL_DELAY);
+                pause_after_failed_login();
                 puts("Incorrect password");
         }
 
diff --git a/mailutils/mail.c b/mailutils/mail.c
index 3a1fd6949..f48b41bab 100644
--- a/mailutils/mail.c
+++ b/mailutils/mail.c
@@ -6,39 +6,45 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-#include <sys/prctl.h>
+#if defined(__linux__)
+# include <sys/prctl.h>
+# define PRCTL
+#elif defined(__FreeBSD__)
+# include <sys/procctl.h>
+# define PROCCTL
+#endif
 #include "libbb.h"
 #include "mail.h"
 
-// generic signal handler
+// common signal handler
 static void signal_handler(int signo)
 {
-#define err signo
         if (SIGALRM == signo) {
                 bb_simple_error_msg_and_die("timed out");
         }
 
-        // SIGCHLD. reap zombies
-        if (safe_waitpid(G.helper_pid, &err, WNOHANG) > 0) {
-                if (WIFSIGNALED(err))
-                        bb_error_msg_and_die("helper killed by signal %u", WTERMSIG(err));
-                if (WIFEXITED(err)) {
-                        G.helper_pid = 0;
-                        if (WEXITSTATUS(err))
-                                bb_error_msg_and_die("helper exited (%u)", WEXITSTATUS(err));
-                }
+        // SIGCHLD. reap the zombie if we expect one
+        if (G.helper_pid == 0)
+                return;
+#define status signo
+        if (safe_waitpid(G.helper_pid, &status, WNOHANG) > 0) {
+                G.helper_pid = 0;
+                if (WIFSIGNALED(status))
+                        bb_error_msg_and_die("helper killed by signal %u", WTERMSIG(status));
+                if (WIFEXITED(status) && WEXITSTATUS(status) != 0)
+                        bb_error_msg_and_die("helper exited (%u)", WEXITSTATUS(status));
         }
-#undef err
+#undef status
 }
 
 void FAST_FUNC launch_helper(const char **argv)
 {
-        // setup vanilla unidirectional pipes interchange
-        int i;
-        int pipes[4];
+        pid_t pid;
+        struct fd_pair child_out;
+        struct fd_pair child_in;
 
-        xpipe(pipes);
-        xpipe(pipes + 2);
+        xpiped_pair(child_out);
+        xpiped_pair(child_in);
 
         // NB: handler must be installed before vfork
         bb_signals(0
@@ -46,40 +52,52 @@ void FAST_FUNC launch_helper(const char **argv)
                 + (1 << SIGALRM)
                 , signal_handler);
 
-        G.helper_pid = xvfork();
-
-        i = (!G.helper_pid) * 2; // for parent:0, for child:2
-        close(pipes[i + 1]);     // 1 or 3 - closing one write end
-        close(pipes[2 - i]);     // 2 or 0 - closing one read end
-        xmove_fd(pipes[i], STDIN_FILENO);      // 0 or 2 - using other read end
-        xmove_fd(pipes[3 - i], STDOUT_FILENO); // 3 or 1 - using other write end
-        // End result:
-        // parent stdout [3] -> child stdin [2]
-        // child stdout [1] -> parent stdin [0]
-
-        if (!G.helper_pid) {
+        fflush_all();
+        pid = xvfork();
+        if (pid == 0) {
                 // child
+                close(child_in.wr);
+                close(child_out.rd);
+                xmove_fd(child_in.rd, STDIN_FILENO);
+                xmove_fd(child_out.wr, STDOUT_FILENO);
                 // if parent dies, get SIGTERM
+#if defined(PRCTL)
                 prctl(PR_SET_PDEATHSIG, SIGTERM, 0, 0, 0);
+#elif defined(PROCCTL)
+                {
+                        int signum = SIGTERM;
+                        procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &signum);
+                }
+#endif
                 // try to execute connection helper
                 // NB: SIGCHLD & SIGALRM revert to SIG_DFL on exec
                 BB_EXECVP_or_die((char**)argv);
         }
+        G.helper_pid = pid;
+        close(child_out.wr);
+        close(child_in.rd);
+        xmove_fd(child_out.rd, STDIN_FILENO);
+        xmove_fd(child_in.wr, STDOUT_FILENO);
 
         // parent goes on
 }
 
+void FAST_FUNC send_r_n(const char *s)
+{
+        if (G.verbose)
+                bb_error_msg("send:'%s'", s);
+        printf("%s\r\n", s);
+}
+
 char* FAST_FUNC send_mail_command(const char *fmt, const char *param)
 {
         char *msg;
-        if (timeout)
-                alarm(timeout);
+        if (G.timeout)
+                alarm(G.timeout);
         msg = (char*)fmt;
         if (fmt) {
                 msg = xasprintf(fmt, param);
-                if (verbose)
-                        bb_error_msg("send:'%s'", msg);
-                printf("%s\r\n", msg);
+                send_r_n(msg);
         }
         fflush_all();
         return msg;
diff --git a/mailutils/mail.h b/mailutils/mail.h
index b14228a4a..a07d535cf 100644
--- a/mailutils/mail.h
+++ b/mailutils/mail.h
@@ -11,7 +11,6 @@ struct globals {
         pid_t helper_pid;
         unsigned timeout;
         unsigned verbose;
-        unsigned opts;
         char *user;
         char *pass;
         FILE *fp0; // initial stdin
@@ -19,9 +18,6 @@ struct globals {
 };
 
 #define G (*ptr_to_globals)
-#define timeout         (G.timeout  )
-#define verbose         (G.verbose  )
-#define opts            (G.opts     )
 #define INIT_G() do { \
         SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
         G.opt_charset = (char *)CONFIG_FEATURE_MIME_CHARSET; \
@@ -32,6 +28,7 @@ struct globals {
 void launch_helper(const char **argv) FAST_FUNC;
 void get_cred_or_die(int fd) FAST_FUNC;
 
+void send_r_n(const char *s) FAST_FUNC;
 char *send_mail_command(const char *fmt, const char *param) FAST_FUNC;
 
 void printbuf_base64(const char *buf, unsigned len) FAST_FUNC;
diff --git a/mailutils/makemime.c b/mailutils/makemime.c
index 53a1820f1..1ff2012d5 100644
--- a/mailutils/makemime.c
+++ b/mailutils/makemime.c
@@ -173,6 +173,7 @@ Content-Transfer-Encoding: 7bit
 int makemime_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int makemime_main(int argc UNUSED_PARAM, char **argv)
 {
+        unsigned opts;
         llist_t *opt_headers = NULL, *l;
         const char *opt_output;
         const char *content_type = "application/octet-stream";
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c
index c5522f1b7..1f2db2892 100644
--- a/mailutils/popmaildir.c
+++ b/mailutils/popmaildir.c
@@ -68,10 +68,11 @@
 static void pop3_checkr(const char *fmt, const char *param, char **ret)
 {
         char *msg = send_mail_command(fmt, param);
+//FIXME: limit max len!!!
         char *answer = xmalloc_fgetline(stdin);
         if (answer && '+' == answer[0]) {
                 free(msg);
-                if (timeout)
+                if (G.timeout)
                         alarm(0);
                 if (ret) {
                         // skip "+OK "
@@ -92,6 +93,7 @@ static void pop3_check(const char *fmt, const char *param)
 int popmaildir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int popmaildir_main(int argc UNUSED_PARAM, char **argv)
 {
+        unsigned opts;
         char *buf;
         unsigned nmsg;
         char *hostname;
@@ -128,7 +130,7 @@ int popmaildir_main(int argc UNUSED_PARAM, char **argv)
         opts = getopt32(argv, "^"
                 "bdmVcasTkt:+" "R:+Z:L:+H:+" IF_FEATURE_POPMAILDIR_DELIVERY("M:F:")
                 "\0" "-1:dd",
-                &timeout, NULL, NULL, NULL, &opt_nlines
+                &G.timeout, NULL, NULL, NULL, &opt_nlines
                 IF_FEATURE_POPMAILDIR_DELIVERY(, &delivery, &delivery) // we treat -M and -F the same
         );
         //argc -= optind;
diff --git a/mailutils/reformime.c b/mailutils/reformime.c
index 307656a15..a1d3f4e8b 100644
--- a/mailutils/reformime.c
+++ b/mailutils/reformime.c
@@ -166,7 +166,7 @@ static int parse(const char *boundary, char **argv)
                         else
                                 filename = bb_get_last_path_component_strip(xstrdup(filename));
 
-                        if (opts & OPT_X) {
+                        if (option_mask32 & OPT_X) {
                                 int fd[2];
 
                                 /* start external helper */
@@ -219,7 +219,7 @@ static int parse(const char *boundary, char **argv)
                         fclose(fp);
 
                         /* Wait for child */
-                        if (opts & OPT_X) {
+                        if (option_mask32 & OPT_X) {
                                 int rc;
                                 signal(SIGPIPE, SIG_DFL);
                                 rc = (wait4pid(pid) & 0xff);
@@ -275,6 +275,7 @@ Usage: reformime [options]
 int reformime_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int reformime_main(int argc UNUSED_PARAM, char **argv)
 {
+        unsigned opts;
         const char *opt_prefix = "";
 
         INIT_G();
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index 1bdc1c300..1a01b7110 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -102,13 +102,6 @@
 // set to 0 to not limit
 #define MAX_HEADERS 256
 
-static void send_r_n(const char *s)
-{
-        if (verbose)
-                bb_error_msg("send:'%s'", s);
-        printf("%s\r\n", s);
-}
-
 static int smtp_checkp(const char *fmt, const char *param, int code)
 {
         char *answer;
@@ -119,8 +112,9 @@ static int smtp_checkp(const char *fmt, const char *param, int code)
         // if code = -1 then just return this number
         // if code != -1 then checks whether the number equals the code
         // if not equal -> die saying msg
+//FIXME: limit max len!!!
         while ((answer = xmalloc_fgetline(stdin)) != NULL) {
-                if (verbose)
+                if (G.verbose)
                         bb_error_msg("recv:'%.*s'", (int)(strchrnul(answer, '\r') - answer), answer);
                 if (strlen(answer) <= 3 || '-' != answer[3])
                         break;
@@ -128,7 +122,7 @@ static int smtp_checkp(const char *fmt, const char *param, int code)
         }
         if (answer) {
                 int n = atoi(answer);
-                if (timeout)
+                if (G.timeout)
                         alarm(0);
                 free(answer);
                 if (-1 == code || n == code) {
@@ -223,6 +217,7 @@ static void rcptto_list(const char *list)
 int sendmail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int sendmail_main(int argc UNUSED_PARAM, char **argv)
 {
+        unsigned opts;
         char *opt_connect;
         char *opt_from = NULL;
         char *s;
@@ -276,7 +271,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
                         // -v is a counter, -H and -S are mutually exclusive, -a is a list
                         "vv:H--S:S--H",
                         &opt_from, NULL,
-                        &timeout, &opt_connect, &opt_connect, &list, &verbose
+                        &G.timeout, &opt_connect, &opt_connect, &list, &G.verbose
         );
         //argc -= optind;
         argv += optind;
@@ -425,6 +420,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
         // this means we scan stdin for To:, Cc:, Bcc: lines until an empty line
         // and then use the rest of stdin as message body
         code = 0; // set "analyze headers" mode
+//FIXME: limit max len!!!
         while ((s = xmalloc_fgetline(G.fp0)) != NULL) {
  dump:
                 // put message lines doubling leading dots
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index a9de0f9aa..209d1d560 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -22,7 +22,7 @@
 //kbuild:lib-$(CONFIG_ADJTIMEX) += adjtimex.o
 
 //usage:#define adjtimex_trivial_usage
-//usage:       "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
+//usage:       "[-q] [-o OFS] [-f FREQ] [-p TCONST] [-t TICK]"
 //usage:#define adjtimex_full_usage "\n\n"
 //usage:       "Read or set kernel time variables. See adjtimex(2)\n"
 //usage:     "\n        -q      Quiet"
diff --git a/miscutils/bc.c b/miscutils/bc.c
index 4d987325e..53eb5c799 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -231,7 +231,7 @@ typedef struct BcNum {
 #define BC_NUM_MAX_IBASE        36
 // larger value might speed up BIGNUM calculations a bit:
 #define BC_NUM_DEF_SIZE         16
-#define BC_NUM_PRINT_WIDTH      69
+#define BC_NUM_PRINT_WIDTH      70
 
 #define BC_NUM_KARATSUBA_LEN    32
 
@@ -517,7 +517,7 @@ struct BcLexKeyword {
 };
 #define LEX_KW_ENTRY(a, b) \
         { .name8 = a /*, .posix = b */ }
-static const struct BcLexKeyword bc_lex_kws[20] = {
+static const struct BcLexKeyword bc_lex_kws[20] ALIGN8 = {
         LEX_KW_ENTRY("auto"    , 1), // 0
         LEX_KW_ENTRY("break"   , 1), // 1
         LEX_KW_ENTRY("continue", 0), // 2 note: this one has no terminating NUL
@@ -1827,7 +1827,7 @@ static FAST_FUNC BC_STATUS zbc_num_k(BcNum *restrict a, BcNum *restrict b,
 #define zbc_num_k(...) (zbc_num_k(__VA_ARGS__) COMMA_SUCCESS)
 {
         BcStatus s;
-        size_t max = BC_MAX(a->len, b->len), max2 = (max + 1) / 2;
+        size_t max, max2;
         BcNum l1, h1, l2, h2, m2, m1, z0, z1, z2, temp;
         bool aone;
 
@@ -1841,9 +1841,9 @@ static FAST_FUNC BC_STATUS zbc_num_k(BcNum *restrict a, BcNum *restrict b,
                 RETURN_STATUS(BC_STATUS_SUCCESS);
         }
 
-        if (a->len + b->len < BC_NUM_KARATSUBA_LEN
-         || a->len < BC_NUM_KARATSUBA_LEN
+        if (a->len < BC_NUM_KARATSUBA_LEN
          || b->len < BC_NUM_KARATSUBA_LEN
+        /* || a->len + b->len < BC_NUM_KARATSUBA_LEN - redundant check */
         ) {
                 size_t i, j, len;
 
@@ -1877,6 +1877,7 @@ static FAST_FUNC BC_STATUS zbc_num_k(BcNum *restrict a, BcNum *restrict b,
                 RETURN_STATUS(BC_STATUS_SUCCESS);
         }
 
+        max = BC_MAX(a->len, b->len);
         bc_num_init(&l1, max);
         bc_num_init(&h1, max);
         bc_num_init(&l2, max);
@@ -1888,6 +1889,7 @@ static FAST_FUNC BC_STATUS zbc_num_k(BcNum *restrict a, BcNum *restrict b,
         bc_num_init(&z2, max);
         bc_num_init(&temp, max + max);
 
+        max2 = (max + 1) / 2;
         bc_num_split(a, max2, &l1, &h1);
         bc_num_split(b, max2, &l2, &h2);
 
@@ -2201,8 +2203,8 @@ static BC_STATUS zbc_num_sqrt(BcNum *a, BcNum *restrict b, size_t scale)
         BcStatus s;
         BcNum num1, num2, half, f, fprime, *x0, *x1, *temp;
         BcDig half_digs[1];
-        size_t pow, len, digs, digs1, resrdx, req, times = 0;
-        ssize_t cmp = 1, cmp1 = SSIZE_MAX, cmp2 = SSIZE_MAX;
+        size_t pow, len, digs, digs1, resrdx, req, times;
+        ssize_t cmp, cmp1, cmp2;
 
         req = BC_MAX(scale, a->rdx) + ((BC_NUM_INT(a) + 1) >> 1) + 1;
         bc_num_expand(b, req);
@@ -2255,11 +2257,12 @@ static BC_STATUS zbc_num_sqrt(BcNum *a, BcNum *restrict b, size_t scale)
                 x0->rdx -= pow;
         }
 
-        x0->rdx = digs = digs1 = 0;
+        x0->rdx = digs = digs1 = times = 0;
         resrdx = scale + 2;
-        len = BC_NUM_INT(x0) + resrdx - 1;
-
-        while (cmp != 0 || digs < len) {
+        len = x0->len + resrdx - 1;
+        cmp = 1;
+        cmp1 = cmp2 = SSIZE_MAX;
+        do {
                 s = zbc_num_div(a, x0, &f, resrdx);
                 if (s) goto err;
                 s = zbc_num_add(x0, &f, &fprime, resrdx);
@@ -2284,11 +2287,12 @@ static BC_STATUS zbc_num_sqrt(BcNum *a, BcNum *restrict b, size_t scale)
                 temp = x0;
                 x0 = x1;
                 x1 = temp;
-        }
+        } while (cmp != 0 || digs < len);
 
         bc_num_copy(b, x0);
         scale -= 1;
-        if (b->rdx > scale) bc_num_truncate(b, b->rdx - scale);
+        if (b->rdx > scale)
+                bc_num_truncate(b, b->rdx - scale);
  err:
         bc_num_free(&fprime);
         bc_num_free(&f);
@@ -2522,9 +2526,6 @@ static void xc_read_line(BcVec *vec, FILE *fp)
 
 #if ENABLE_FEATURE_BC_INTERACTIVE
         if (G_interrupt) { // ^C was pressed
-# if ENABLE_FEATURE_EDITING
- intr:
-# endif
                 if (fp != stdin) {
                         // ^C while running a script (bc SCRIPT): die.
                         // We do not return to interactive prompt:
@@ -2535,22 +2536,25 @@ static void xc_read_line(BcVec *vec, FILE *fp)
                         // the shell would be unexpected.
                         xfunc_die();
                 }
-                // ^C while interactive input
+                // There was ^C while running calculations
                 G_interrupt = 0;
-                // GNU bc says "interrupted execution."
+                // GNU bc says "interrupted execution." (to stdout, not stderr)
                 // GNU dc says "Interrupt!"
-                fputs("\ninterrupted execution\n", stderr);
+                puts("\ninterrupted execution");
         }
 
 # if ENABLE_FEATURE_EDITING
         if (G_ttyin && fp == stdin) {
                 int n, i;
+                if (!G.line_input_state)
+                        G.line_input_state = new_line_input_t(DO_HISTORY);
 #  define line_buf bb_common_bufsiz1
                 n = read_line_input(G.line_input_state, "", line_buf, COMMON_BUFSIZE);
                 if (n <= 0) { // read errors or EOF, or ^D, or ^C
-                        if (n == 0) // ^C
-                                goto intr;
-                        bc_vec_pushZeroByte(vec); // ^D or EOF (or error)
+                        //GNU bc prints this on ^C:
+                        //if (n == 0) // ^C
+                        //      puts("(interrupt) Exiting bc.");
+                        bc_vec_pushZeroByte(vec);
                         return;
                 }
                 i = 0;
@@ -6872,22 +6876,6 @@ static BC_STATUS zxc_program_exec(void)
 }
 #define zxc_program_exec(...) (zxc_program_exec(__VA_ARGS__) COMMA_SUCCESS)
 
-static unsigned xc_vm_envLen(const char *var)
-{
-        char *lenv;
-        unsigned len;
-
-        lenv = getenv(var);
-        len = BC_NUM_PRINT_WIDTH;
-        if (!lenv) return len;
-
-        len = bb_strtou(lenv, NULL, 10) - 1;
-        if (errno || len < 2 || len >= INT_MAX)
-                len = BC_NUM_PRINT_WIDTH;
-
-        return len;
-}
-
 static BC_STATUS zxc_vm_process(const char *text)
 {
         BcStatus s;
@@ -7377,12 +7365,43 @@ static void xc_program_init(void)
         bc_char_vec_init(&G.input_buffer);
 }
 
+static unsigned xc_vm_envLen(const char *var)
+{
+        char *lenv;
+        unsigned len;
+
+        lenv = getenv(var);
+        len = BC_NUM_PRINT_WIDTH;
+        if (lenv) {
+                len = bb_strtou(lenv, NULL, 10);
+                if (len == 0 || len > INT_MAX)
+                        len = INT_MAX;
+                if (errno)
+                        len = BC_NUM_PRINT_WIDTH;
+        }
+
+        // dc (GNU bc 1.07.1) 1.4.1 seems to use width
+        // 1 char wider than bc from the same package.
+        // Both default width, and xC_LINE_LENGTH=N are wider:
+        // "DC_LINE_LENGTH=5 dc -e'123456 p'" prints:
+        //      |1234\   |
+        //      |56      |
+        // "echo '123456' | BC_LINE_LENGTH=5 bc" prints:
+        //      |123\    |
+        //      |456     |
+        // Do the same, but it might be a bug in GNU package
+        if (IS_BC)
+                len--;
+
+        if (len < 2)
+                len = IS_BC ? BC_NUM_PRINT_WIDTH - 1 : BC_NUM_PRINT_WIDTH;
+
+        return len;
+}
+
 static int xc_vm_init(const char *env_len)
 {
         G.prog.len = xc_vm_envLen(env_len);
-#if ENABLE_FEATURE_EDITING
-        G.line_input_state = new_line_input_t(DO_HISTORY);
-#endif
         bc_vec_init(&G.files, sizeof(char *), NULL);
 
         xc_program_init();
@@ -7466,16 +7485,6 @@ int dc_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        // TODO: dc (GNU bc 1.07.1) 1.4.1 seems to use width
-        // 1 char wider than bc from the same package.
-        // Both default width, and xC_LINE_LENGTH=N are wider:
-        // "DC_LINE_LENGTH=5 dc -e'123456 p'" prints:
-        //      |1234\   |
-        //      |56      |
-        // "echo '123456' | BC_LINE_LENGTH=5 bc" prints:
-        //      |123\    |
-        //      |456     |
-        // Do the same, or it's a bug?
         xc_vm_init("DC_LINE_LENGTH");
 
         // Run -e'SCRIPT' and -fFILE in order of appearance, then handle FILEs
diff --git a/miscutils/beep.c b/miscutils/beep.c
index 1669332fd..7c60aed08 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -114,10 +114,10 @@ int beep_main(int argc, char **argv)
                 while (rep) {
 //bb_error_msg("rep[%d] freq=%d, length=%d, delay=%d", rep, freq, length, delay);
                         xioctl(speaker, KIOCSOUND, (void*)(uintptr_t)tickrate_div_freq);
-                        usleep(1000 * length);
+                        msleep(length);
                         ioctl(speaker, KIOCSOUND, (void*)0);
                         if (--rep)
-                                usleep(1000 * delay);
+                                msleep(delay);
                 }
         }
 
diff --git a/miscutils/chat.c b/miscutils/chat.c
index a04565063..86a114df6 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -379,7 +379,7 @@ int chat_main(int argc UNUSED_PARAM, char **argv)
                                         // dump device input if ECHO ON
                                         if (echo) {
 //                                              if (buf[buf_len] < ' ') {
-//                                                      full_write(STDERR_FILENO, "^", 1);
+//                                                      full_write2_str("^");
 //                                                      buf[buf_len] += '@';
 //                                              }
                                                 full_write(STDERR_FILENO, buf+buf_len, 1);
@@ -473,7 +473,7 @@ int chat_main(int argc UNUSED_PARAM, char **argv)
                                         if ('\\' == c) {
                                                 c = *++buf;
                                                 if ('d' == c) {
-                                                        sleep(1);
+                                                        sleep1();
                                                         len--;
                                                         continue;
                                                 }
@@ -509,7 +509,7 @@ int chat_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_CHAT_IMPLICIT_CR
                                 // or terminate command with \r (if not inhibited)
                                 else if (!nocr)
-                                        xwrite(STDOUT_FILENO, "\r", 1);
+                                        xwrite_str(STDOUT_FILENO, "\r");
 #endif
                                 // bail out unless we sent command successfully
                                 if (exitcode)
diff --git a/miscutils/crond.c b/miscutils/crond.c
index 2e8ca8b68..b74427351 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -63,7 +63,7 @@
 //kbuild:lib-$(CONFIG_CROND) += crond.o
 
 //usage:#define crond_trivial_usage
-//usage:       "-fbS -l N " IF_FEATURE_CROND_D("-d N ") "-L LOGFILE -c DIR"
+//usage:       "[-fbS] [-l N] " IF_FEATURE_CROND_D("[-d N] ") "[-L LOGFILE] [-c DIR]"
 //usage:#define crond_full_usage "\n\n"
 //usage:       "        -f      Foreground"
 //usage:     "\n        -b      Background (default)"
@@ -492,7 +492,7 @@ static void load_crontab(const char *fileName)
                                         const char *name;
                                         const char tokens[8];
                                 } SpecialEntry;
-                                static const SpecialEntry SpecAry[] = {
+                                static const SpecialEntry SpecAry[] ALIGN8 = {
                                         /*              hour  day   month weekday */
                                         { "yearly",     "0\0" "1\0" "1\0" "*" },
                                         { "annually",   "0\0" "1\0" "1\0" "*" },
diff --git a/miscutils/dc.c b/miscutils/dc.c
index b6c6795b6..918f2b5c8 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -100,7 +100,7 @@ static void mod(void)
          * 0
          */
         if (d == 0) {
-                bb_error_msg("remainder by zero");
+                bb_simple_error_msg("remainder by zero");
                 pop();
                 push(0);
                 return;
@@ -195,7 +195,7 @@ struct op {
         void (*function) (void);
 };
 
-static const struct op operators[] = {
+static const struct op operators[] ALIGN_PTR = {
 #if ENABLE_FEATURE_DC_LIBM
         {"^",   power},
 //      {"exp", power},
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 17d8fb6b9..e5bb8a2d8 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -362,7 +362,7 @@ static const char bb_msg_variable_not_found[] ALIGN1 = "variable: %s not found";
 
 static void safe_memcpy(char *dest, const char *src, int len)
 {
-        memcpy(dest , src, len);
+        memcpy(dest, src, len);
         dest[len] = '\0';
 }
 
@@ -1106,7 +1106,7 @@ static int copy_inode(const char *destpath, const struct stat *dest_stat,
 do_chown:
                         if (chown(destpath, source_stat->st_uid, source_stat->st_gid) == 0)
                                 return TRUE;
-                /*break;*/
+                        /*break;*/
         }
         return FALSE;
 }   /*  End Function copy_inode  */
diff --git a/miscutils/devmem.c b/miscutils/devmem.c
index e8dce5225..f9f0276bc 100644
--- a/miscutils/devmem.c
+++ b/miscutils/devmem.c
@@ -75,7 +75,7 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage(); /* one of bb_strtouXX failed */
 
         fd = xopen("/dev/mem", argv[3] ? (O_RDWR | O_SYNC) : (O_RDONLY | O_SYNC));
-        mapped_size = page_size = getpagesize();
+        mapped_size = page_size = bb_getpagesize();
         offset_in_page = (unsigned)target & (page_size - 1);
         if (offset_in_page + width > page_size) {
                 /* This access spans pages.
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index d25a2466e..01b4e8e2e 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1366,7 +1366,7 @@ static NOINLINE void dump_identity(const struct hd_driveid *id)
         }
         if (id->capability & 1) {
                 if (id->dma_1word | id->dma_mword) {
-                        static const int dma_wmode_masks[] = { 0x100, 1, 0x200, 2, 0x400, 4, 0xf800, 0xf8 };
+                        static const int dma_wmode_masks[] ALIGN4 = { 0x100, 1, 0x200, 2, 0x400, 4, 0xf800, 0xf8 };
                         printf("\n DMA modes:  ");
                         print_flags_separated(dma_wmode_masks,
                                 "*\0""sdma0 \0""*\0""sdma1 \0""*\0""sdma2 \0""*\0""sdma? \0",
@@ -1436,7 +1436,7 @@ static void flush_buffer_cache(/*int fd*/ void)
         fsync(fd);                              /* flush buffers */
         ioctl_or_warn(fd, BLKFLSBUF, NULL); /* do it again, big time */
 #ifdef HDIO_DRIVE_CMD
-        sleep(1);
+        sleep1();
         if (ioctl(fd, HDIO_DRIVE_CMD, NULL) && errno != EINVAL) {       /* await completion */
                 if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */
                         bb_simple_perror_msg("HDIO_DRIVE_CMD");
@@ -1511,7 +1511,7 @@ static void do_time(int cache /*,int fd*/)
          * NB: *small* delay. User is expected to have a clue and to not run
          * heavy io in parallel with measurements. */
         sync();
-        sleep(1);
+        sleep1();
         if (cache) { /* Time cache */
                 seek_to_zero();
                 read_big_block(buf);
diff --git a/miscutils/hexedit.c b/miscutils/hexedit.c
index 898d77376..f8ff9b62b 100644
--- a/miscutils/hexedit.c
+++ b/miscutils/hexedit.c
@@ -31,7 +31,8 @@ struct globals {
         int fd;
         unsigned height;
         unsigned row;
-        unsigned pagesize;
+        IF_VARIABLE_ARCH_PAGESIZE(unsigned pagesize;)
+#define G_pagesize cached_pagesize(G.pagesize)
         uint8_t *baseaddr;
         uint8_t *current_byte;
         uint8_t *eof_byte;
@@ -46,15 +47,6 @@ struct globals {
         SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
 } while (0)
 
-//TODO: move to libbb
-#if defined(__x86_64__) || defined(i386)
-# define G_pagesize 4096
-# define INIT_PAGESIZE() ((void)0)
-#else
-# define G_pagesize (G.pagesize)
-# define INIT_PAGESIZE() ((void)(G.pagesize = getpagesize()))
-#endif
-
 /* hopefully there aren't arches with PAGE_SIZE > 64k */
 #define G_mapsize  (64*1024)
 
@@ -262,7 +254,7 @@ int hexedit_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int hexedit_main(int argc UNUSED_PARAM, char **argv)
 {
         INIT_G();
-        INIT_PAGESIZE();
+        INIT_PAGESIZE(G.pagesize);
 
         get_terminal_width_height(-1, NULL, &G.height);
         if (1) {
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index cc8b99a92..48135921d 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -273,7 +273,7 @@ static int i2c_bus_lookup(const char *bus_str)
         return xstrtou_range(bus_str, 10, 0, 0xfffff);
 }
 
-#if ENABLE_I2CGET || ENABLE_I2CSET || ENABLE_I2CDUMP || ENABLE_I2CTRANSFER
+#if ENABLE_I2CGET || ENABLE_I2CSET || ENABLE_I2CDUMP
 static int i2c_parse_bus_addr(const char *addr_str)
 {
         /* Slave address must be in range 0x03 - 0x77. */
@@ -286,14 +286,16 @@ static void i2c_set_pec(int fd, int pec)
                                 itoptr(pec ? 1 : 0),
                                 "can't set PEC");
 }
+#endif
 
+#if ENABLE_I2CGET || ENABLE_I2CSET || ENABLE_I2CDUMP || ENABLE_I2CTRANSFER
 static void i2c_set_slave_addr(int fd, int addr, int force)
 {
         ioctl_or_perror_and_die(fd, force ? I2C_SLAVE_FORCE : I2C_SLAVE,
                                 itoptr(addr),
                                 "can't set address to 0x%02x", addr);
 }
-#endif /* ENABLE_I2CGET || ENABLE_I2CSET || ENABLE_I2CDUMP */
+#endif
 
 #if ENABLE_I2CGET || ENABLE_I2CSET
 static int i2c_parse_data_addr(const char *data_addr)
@@ -1052,24 +1054,19 @@ struct adap_desc {
         const char *algo;
 };
 
-static const struct adap_desc adap_descs[] = {
-        { .funcs        = "dummy",
-          .algo         = "Dummy bus", },
-        { .funcs        = "isa",
-          .algo         = "ISA bus", },
-        { .funcs        = "i2c",
-          .algo         = "I2C adapter", },
-        { .funcs        = "smbus",
-          .algo         = "SMBus adapter", },
+static const struct adap_desc adap_descs[] ALIGN_PTR = {
+        { .funcs = "dummy", .algo = "Dummy bus", },
+        { .funcs = "isa",   .algo = "ISA bus", },
+        { .funcs = "i2c",   .algo = "I2C adapter", },
+        { .funcs = "smbus", .algo = "SMBus adapter", },
 };
 
-struct i2c_func
-{
+struct i2c_func {
         long value;
         const char* name;
 };
 
-static const struct i2c_func i2c_funcs_tab[] = {
+static const struct i2c_func i2c_funcs_tab[] ALIGN_PTR = {
         { .value = I2C_FUNC_I2C,
           .name = "I2C" },
         { .value = I2C_FUNC_SMBUS_QUICK,
@@ -1152,12 +1149,12 @@ static void NORETURN list_i2c_busses_and_exit(void)
                 /* Simple version for ISA chips. */
                 snprintf(path, NAME_MAX, "%s/%s/name",
                          i2cdev_path, de->d_name);
-                fp = fopen(path, "r");
+                fp = fopen_for_read(path);
                 if (fp == NULL) {
                         snprintf(path, NAME_MAX,
                                  "%s/%s/device/name",
                                  i2cdev_path, de->d_name);
-                        fp = fopen(path, "r");
+                        fp = fopen_for_read(path);
                 }
 
                 /* Non-ISA chips require the hard-way. */
@@ -1178,7 +1175,7 @@ static void NORETURN list_i2c_busses_and_exit(void)
                                                  "%s/%s/device/%s/name",
                                                  i2cdev_path, de->d_name,
                                                  subde->d_name);
-                                        fp = fopen(path, "r");
+                                        fp = fopen_for_read(path);
                                         break;
                                 }
                         }
diff --git a/miscutils/man.c b/miscutils/man.c
index 6724b4b5d..052b50054 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -13,7 +13,7 @@
 //kbuild:lib-$(CONFIG_MAN) += man.o
 
 //usage:#define man_trivial_usage
-//usage:       "[-aw] MANPAGE..."
+//usage:       "[-aw] [SECTION] MANPAGE[.SECTION]..."
 //usage:#define man_full_usage "\n\n"
 //usage:       "Display manual page\n"
 //usage:     "\n        -a      Display all pages"
@@ -239,10 +239,21 @@ static const char *if_redefined(const char *var, const char *key, const char *li
         return xstrdup(skip_whitespace(line));
 }
 
+static int is_section_name(const char *sections, const char *str)
+{
+        const char *s = strstr(sections, str);
+        if (s) {
+                int l = strlen(str);
+                return (s[l] == ':' || s[l] == '\0');
+        }
+        return 0;
+}
+
 int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int man_main(int argc UNUSED_PARAM, char **argv)
 {
         parser_t *parser;
+        char *conf_sec_list;
         char *sec_list;
         char **man_path_list;
         int count_mp;
@@ -267,7 +278,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         chdir_system_drive();
 #endif
 
-        sec_list = xstrdup("0p:1:1p:2:3:3p:4:5:6:7:8:9");
+        conf_sec_list = xstrdup("0p:1:1p:2:3:3p:4:5:6:7:8:9");
 
         count_mp = 0;
         man_path_list = add_MANPATH(NULL, &count_mp,
@@ -297,8 +308,8 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                         man_path_list = add_MANPATH(man_path_list, &count_mp, token[1]);
                 }
                 if (strcmp("MANSECT", token[0]) == 0) {
-                        free(sec_list);
-                        sec_list = xstrdup(token[1]);
+                        free(conf_sec_list);
+                        conf_sec_list = xstrdup(token[1]);
                 }
         }
         config_close(parser);
@@ -337,6 +348,13 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                 G.pager = xasprintf("%s -b -p -x", G.col);
         }
 
+        /* is 1st ARG a SECTION? */
+        sec_list = conf_sec_list;
+        if (is_section_name(conf_sec_list, *argv)) {
+                /* yes */
+                sec_list = *argv++;
+        }
+
         not_found = 0;
         do { /* for each argv[] */
                 const char *cur_path;
@@ -347,11 +365,20 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                         found = show_manpage(*argv, /*man:*/ 1, 0);
                         goto check_found;
                 }
+
+                /* for each MANPATH */
                 cur_mp = 0;
                 while ((cur_path = man_path_list[cur_mp++]) != NULL) {
-                        /* for each MANPATH */
                         const char *cur_sect = sec_list;
-                        do { /* for each section */
+
+                        /* is MANPAGE of the form NAME.SECTION? */
+                        char *sect_ext = strrchr(*argv, '.');
+                        if (sect_ext && is_section_name(conf_sec_list, sect_ext + 1)) {
+                                *sect_ext = '\0';
+                                cur_sect = sect_ext + 1;
+                        }
+
+                        do { /* for each SECTION in cur_sect */
                                 char *next_sect = strchrnul(cur_sect, ':');
                                 int sect_len = next_sect - cur_sect;
                                 char *man_filename;
@@ -378,6 +405,8 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                                 while (*cur_sect == ':')
                                         cur_sect++;
                         } while (*cur_sect);
+
+                        if (sect_ext) *sect_ext = '.';
                 }
  check_found:
                 if (!found) {
diff --git a/miscutils/mt.c b/miscutils/mt.c
index 9f1aecfca..1a4214664 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -15,7 +15,7 @@
 //kbuild:lib-$(CONFIG_MT) += mt.o
 
 //usage:#define mt_trivial_usage
-//usage:       "[-f device] opcode value"
+//usage:       "[-f DEVICE] OPCODE VALUE"
 //usage:#define mt_full_usage "\n\n"
 //usage:       "Control magnetic tape drive operation\n"
 //usage:       "\n"
@@ -30,7 +30,7 @@
 #include <sys/mtio.h>
 
 /* missing: eod/seod, stoptions, stwrthreshold, densities */
-static const short opcode_value[] = {
+static const short opcode_value[] ALIGN2 = {
         MTBSF,
         MTBSFM,
         MTBSR,
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index 1e75bf433..2006861e2 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -381,8 +381,7 @@ static bool cmd_needs_arg(int cmd)
 # error "Unexpected flags size"
 #endif
 
-static const uint16_t setbits[CMD_FLAG_LAST + 1] =
-{
+static const uint16_t setbits[CMD_FLAG_LAST + 1] ALIGN2 = {
         0,
         ASYNC_SPD_HI,
         ASYNC_SPD_VHI,
diff --git a/miscutils/time.c b/miscutils/time.c
index dcc3a5b4c..12c540211 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -127,6 +127,10 @@ static void printargv(char *const *argv)
    This is funky since the pagesize could be less than 1K.
    Note: Some machines express getrusage statistics in terms of K,
    others in terms of pages.  */
+#ifdef BB_ARCH_FIXED_PAGESIZE
+# define pagesize BB_ARCH_FIXED_PAGESIZE
+# define ptok(pagesize, pages) ptok(pages)
+#endif
 static unsigned long ptok(const unsigned pagesize, const unsigned long pages)
 {
         unsigned long tmp;
@@ -140,6 +144,7 @@ static unsigned long ptok(const unsigned pagesize, const unsigned long pages)
         tmp = pages * pagesize; /* Larger first, */
         return tmp / 1024;      /* then smaller.  */
 }
+#undef pagesize
 #endif
 
 /* summarize: Report on the system use of a command.
@@ -199,7 +204,7 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
 #if !ENABLE_PLATFORM_MINGW32
         unsigned vv_ms;     /* Elapsed virtual (CPU) milliseconds */
         unsigned cpu_ticks; /* Same, in "CPU ticks" */
-        unsigned pagesize = getpagesize();
+        unsigned pagesize = bb_getpagesize();
 #endif
 
         /* Impossible: we do not use WUNTRACED flag in wait()...
diff --git a/miscutils/ts.c b/miscutils/ts.c
index f769d663b..3eecb7464 100644
--- a/miscutils/ts.c
+++ b/miscutils/ts.c
@@ -50,13 +50,13 @@ int ts_main(int argc UNUSED_PARAM, char **argv)
 
 #define date_buf bb_common_bufsiz1
         setup_common_bufsiz();
-        gettimeofday(&base, NULL);
+        xgettimeofday(&base);
 
         while ((line = xmalloc_fgets(stdin)) != NULL) {
                 struct timeval ts;
                 struct tm tm_time;
 
-                gettimeofday(&ts, NULL);
+                xgettimeofday(&ts);
                 if (opt) {
                         /* -i and/or -s */
                         struct timeval ts1 = ts1;
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index 94a637eee..69ead7a13 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -97,7 +97,7 @@ static unsigned get_num_from_file(const char *path, unsigned max)
 int ubi_tools_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
 {
-        static const struct suffix_mult size_suffixes[] = {
+        static const struct suffix_mult size_suffixes[] ALIGN_SUFFIX = {
                 { "KiB", 1024 },
                 { "MiB", 1024*1024 },
                 { "GiB", 1024*1024*1024 },
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 8c8d7217f..0ed10bcf1 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -88,7 +88,7 @@ int watchdog_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int watchdog_main(int argc UNUSED_PARAM, char **argv)
 {
         static const int enable = WDIOS_ENABLECARD;
-        static const struct suffix_mult suffixes[] = {
+        static const struct suffix_mult suffixes[] ALIGN_SUFFIX = {
                 { "ms", 1 },
                 { "", 1000 },
                 { "", 0 }
@@ -143,7 +143,7 @@ int watchdog_main(int argc UNUSED_PARAM, char **argv)
                  * as the counter value is undefined at this point -- PFM
                  */
                 write(3, "", 1); /* write zero byte */
-                usleep(stimer_duration * 1000L);
+                msleep(stimer_duration);
         }
         return EXIT_SUCCESS; /* - not reached, but gcc 4.2.1 is too dumb! */
 }
diff --git a/modutils/insmod.c b/modutils/insmod.c
index bd79a0f26..8f7163e25 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -26,7 +26,7 @@
 
 //usage:#if !ENABLE_MODPROBE_SMALL
 //usage:#define insmod_trivial_usage
-//usage:        IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE")
+//usage:        IF_FEATURE_2_4_MODULES("[-fkvqLx] MODULE")
 //usage:        IF_NOT_FEATURE_2_4_MODULES("FILE")
 //usage:        IF_FEATURE_CMDLINE_MODULE_OPTIONS(" [SYMBOL=VALUE]...")
 //usage:#define insmod_full_usage "\n\n"
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index c5cdc7980..d15772f0d 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -20,7 +20,7 @@
 #include "libbb.h"
 #include "modutils.h"
 
-static const char *const shortcuts[] = {
+static const char *const shortcuts[] ALIGN_PTR = {
         "filename",     // -n
         "author",       // -a
         "description",  // -d
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 18cfac481..db44a2ed0 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -377,11 +377,11 @@ static int parse_module(module_info *info, const char *pathname)
         return info->open_read_failed;
 }
 
-static FAST_FUNC int fileAction(const char *pathname,
-                struct stat *sb UNUSED_PARAM,
-                void *modname_to_match,
-                int depth UNUSED_PARAM)
+static FAST_FUNC int fileAction(struct recursive_state *state,
+                const char *pathname,
+                struct stat *sb UNUSED_PARAM)
 {
+        const char *modname_to_match = state->userData;
         int cur;
         const char *fname;
         bool is_remove = (ENABLE_RMMOD && ONLY_APPLET)
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index eeeff7609..c334186b8 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -663,6 +663,25 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 load_modules_dep();
         }
 
+        /* Handle modprobe.blacklist=module1,module2,... */
+        if (ENABLE_FEATURE_MODPROBE_BLACKLIST) {
+                char *options;
+                char *substr;
+
+                options = parse_and_add_kcmdline_module_options(NULL, "modprobe");
+                while ((substr = strsep(&options, " ")) != NULL) {
+                        char *fn = is_prefixed_with(substr, "blacklist=");
+                        if (!fn)
+                                continue;
+                        while ((substr = strsep(&fn, ",")) != NULL) {
+                                /* blacklist <modulename> */
+                                get_or_add_modentry(substr)->flags |= MODULE_FLAG_BLACKLISTED;
+                                DBG("blacklist: %s", substr);
+                        }
+                }
+                /*free(options); - WRONG, strsep may have advanced it */
+        }
+
         rc = 0;
         while ((me = llist_pop(&G.probes)) != NULL) {
                 if (me->realnames == NULL) {
diff --git a/modutils/modutils.c b/modutils/modutils.c
index 6f7cd9721..f7ad5e805 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -169,7 +169,7 @@ void* FAST_FUNC try_to_mmap_module(const char *filename, size_t *image_size_p)
         /* st.st_size is off_t, we can't just pass it to mmap */
         if (st.st_size <= *image_size_p) {
                 size_t image_size = st.st_size;
-                image = mmap(NULL, image_size, PROT_READ, MAP_PRIVATE, fd, 0);
+                image = mmap_read(fd, image_size);
                 if (image == MAP_FAILED) {
                         image = NULL;
                 } else if (*(uint32_t*)image != SWAP_BE32(0x7f454C46)) {
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 7b6b89057..f1d5ca571 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -43,7 +43,7 @@
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -u USER Username"
 //usage:     "\n        -p PASS Password"
-//usage:     "\n        -P NUM  Port"
+//usage:     "\n        -P PORT"
 //usage:
 //usage:#define ftpput_trivial_usage
 //usage:       "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE"
@@ -52,7 +52,7 @@
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -u USER Username"
 //usage:     "\n        -p PASS Password"
-//usage:     "\n        -P NUM  Port number"
+//usage:     "\n        -P PORT"
 
 #include "libbb.h"
 #include "common_bufsiz.h"
diff --git a/networking/hostname.c b/networking/hostname.c
index f96daed95..549103485 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -29,9 +29,9 @@
 //kbuild: lib-$(CONFIG_DNSDOMAINNAME) += hostname.o
 
 //usage:#define hostname_trivial_usage
-//usage:       "[OPTIONS] [HOSTNAME | -F FILE]"
+//usage:       "[-sidf] [HOSTNAME | -F FILE]"
 //usage:#define hostname_full_usage "\n\n"
-//usage:       "Get or set hostname or DNS domain name\n"
+//usage:       "Show or set hostname or DNS domain name\n"
 //usage:     "\n        -s      Short"
 //usage:     "\n        -i      Addresses for the hostname"
 //usage:     "\n        -d      DNS domain name"
diff --git a/networking/httpd.c b/networking/httpd.c
index daa3ca1d0..02f544593 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -305,6 +305,11 @@
 # include <sys/sendfile.h>
 #endif
 
+/* see sys/netinet6/in6.h */
+#if defined(__FreeBSD__)
+# define s6_addr32 __u6_addr.__u6_addr32
+#endif
+
 #define DEBUG 0
 
 #define IOBUF_SIZE 8192
@@ -1036,48 +1041,9 @@ static char *encodeString(const char *string)
  * Parameter: a pointer to a base64 encoded string.
  * Decoded data is stored in-place.
  */
-static void decodeBase64(char *Data)
+static void decodeBase64(char *data)
 {
-# if ENABLE_BASE64 || ENABLE_UUDECODE
-        /* Call decode_base64() from uuencode.c */
-        char *eptr = Data;
-        decode_base64(&eptr, Data);
-        *eptr = '\0';
-# else
-        const unsigned char *in = (const unsigned char *)Data;
-        /* The decoded size will be at most 3/4 the size of the encoded */
-        unsigned ch = 0;
-        int i = 0;
-
-        while (*in) {
-                int t = *in++;
-
-                if (t >= '0' && t <= '9')
-                        t = t - '0' + 52;
-                else if (t >= 'A' && t <= 'Z')
-                        t = t - 'A';
-                else if (t >= 'a' && t <= 'z')
-                        t = t - 'a' + 26;
-                else if (t == '+')
-                        t = 62;
-                else if (t == '/')
-                        t = 63;
-                else if (t == '=')
-                        t = 0;
-                else
-                        continue;
-
-                ch = (ch << 6) | t;
-                i++;
-                if (i == 4) {
-                        *Data++ = (char) (ch >> 16);
-                        *Data++ = (char) (ch >> 8);
-                        *Data++ = (char) ch;
-                        i = 0;
-                }
-        }
-        *Data = '\0';
-# endif
+        decode_base64(data, NULL)[0] = '\0';
 }
 #endif
 
@@ -1945,7 +1911,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
                 send_headers(HTTP_OK);
 #if ENABLE_FEATURE_USE_SENDFILE
         {
-                off_t offset = range_start;
+                off_t offset = (range_start < 0) ? 0 : range_start;
                 while (1) {
                         /* sz is rounded down to 64k */
                         ssize_t sz = MAXINT(ssize_t) - 0xffff;
@@ -2590,8 +2556,8 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                 if (STRNCASECMP(iobuf, "Range:") == 0) {
                         /* We know only bytes=NNN-[MMM] */
                         char *s = skip_whitespace(iobuf + sizeof("Range:")-1);
-                        if (is_prefixed_with(s, "bytes=")) {
-                                s += sizeof("bytes=")-1;
+                        s = is_prefixed_with(s, "bytes=");
+                        if (s) {
                                 range_start = BB_STRTOOFF(s, &s, 10);
                                 if (s[0] != '-' || range_start < 0) {
                                         range_start = -1;
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 3c9a2dfb3..9ee232a66 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -76,7 +76,7 @@
 //kbuild:lib-$(CONFIG_IFCONFIG) += ifconfig.o interface.o
 
 //usage:#define ifconfig_trivial_usage
-//usage:        IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
+//usage:        IF_FEATURE_IFCONFIG_STATUS("[-a]") " [IFACE] [ADDRESS]"
 //usage:#define ifconfig_full_usage "\n\n"
 //usage:       "Configure a network interface\n"
 //usage:     "\n"
@@ -247,7 +247,7 @@ struct options {
  * Set up the tables.  Warning!  They must have corresponding order!
  */
 
-static const struct arg1opt Arg1Opt[] = {
+static const struct arg1opt Arg1Opt[] ALIGN_PTR = {
         { "SIFMETRIC",  SIOCSIFMETRIC,  ifreq_offsetof(ifr_metric) },
         { "SIFMTU",     SIOCSIFMTU,     ifreq_offsetof(ifr_mtu) },
         { "SIFTXQLEN",  SIOCSIFTXQLEN,  ifreq_offsetof(ifr_qlen) },
@@ -277,7 +277,7 @@ static const struct arg1opt Arg1Opt[] = {
         { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) },
 };
 
-static const struct options OptArray[] = {
+static const struct options OptArray[] ALIGN_PTR = {
         { "metric",      N_ARG,         ARG_METRIC,      0 },
         { "mtu",         N_ARG,         ARG_MTU,         0 },
         { "txqueuelen",  N_ARG,         ARG_TXQUEUELEN,  0 },
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 0d17b7d8c..18dcaff96 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -304,7 +304,7 @@ static const char api_modes[] ALIGN1 = "empwia";
 static const struct {
         const char *name;
         smallint (*func)(void);
-} method_table[] = {
+} method_table[] ALIGN_PTR = {
         { "SIOCETHTOOL"       , &detect_link_ethtool },
         { "SIOCGMIIPHY"       , &detect_link_mii     },
         { "SIOCDEVPRIVATE"    , &detect_link_priv    },
@@ -735,7 +735,7 @@ int ifplugd_main(int argc UNUSED_PARAM, char **argv)
                                         delay_time += G.delay_down;
 #if 0  /* if you are back in 1970... */
                                 if (delay_time == 0) {
-                                        sleep(1);
+                                        sleep1();
                                         delay_time = 1;
                                 }
 #endif
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 60ceb5a1f..737113dd4 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -113,30 +113,30 @@
 //kbuild:lib-$(CONFIG_IFDOWN) += ifupdown.o
 
 //usage:#define ifup_trivial_usage
-//usage:       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
+//usage:       "[-n"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] -a | IFACE..."
 //usage:#define ifup_full_usage "\n\n"
 //usage:       "        -a      Configure all interfaces"
 //usage:     "\n        -i FILE Use FILE instead of /etc/network/interfaces"
-//usage:     "\n        -n      Print out what would happen, but don't do it"
+//usage:     "\n        -n      Dry run"
 //usage:        IF_FEATURE_IFUPDOWN_MAPPING(
 //usage:     "\n                (note: doesn't disable mappings)"
 //usage:     "\n        -m      Don't run any mappings"
 //usage:        )
 //usage:     "\n        -v      Print out what would happen before doing it"
-//usage:     "\n        -f      Force configuration"
+//usage:     "\n        -f      Force"
 //usage:
 //usage:#define ifdown_trivial_usage
-//usage:       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
+//usage:       "[-n"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] -a | IFACE..."
 //usage:#define ifdown_full_usage "\n\n"
 //usage:       "        -a      Deconfigure all interfaces"
-//usage:     "\n        -i FILE Use FILE for interface definitions"
-//usage:     "\n        -n      Print out what would happen, but don't do it"
+//usage:     "\n        -i FILE Use FILE instead of /etc/network/interfaces"
+//usage:     "\n        -n      Dry run"
 //usage:        IF_FEATURE_IFUPDOWN_MAPPING(
 //usage:     "\n                (note: doesn't disable mappings)"
 //usage:     "\n        -m      Don't run any mappings"
 //usage:        )
 //usage:     "\n        -v      Print out what would happen before doing it"
-//usage:     "\n        -f      Force deconfiguration"
+//usage:     "\n        -f      Force"
 
 #include <net/if.h>
 #include "libbb.h"
@@ -1357,15 +1357,15 @@ static FILE *open_new_state_file(void)
                                         IFSTATE_FILE_PATH".new");
                 }
                 /* Someone else created the .new file */
-                if (cnt > 30 * 1000) {
+                if (cnt > 30) {
                         /* Waited for 30*30/2 = 450 milliseconds, still EEXIST.
                          * Assuming a stale file, rewriting it.
                          */
                         flags = (O_WRONLY | O_CREAT | O_TRUNC);
                         continue;
                 }
-                usleep(cnt);
-                cnt += 1000;
+                msleep(cnt);
+                cnt++;
         }
 
         return xfdopen_for_write(fd);
diff --git a/networking/inetd.c b/networking/inetd.c
index 3cd2b11f0..febfb7b73 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -361,7 +361,7 @@ struct builtin {
         void (*bi_dgram_fn)(int, servtab_t *) FAST_FUNC;
 };
 
-static const struct builtin builtins[] = {
+static const struct builtin builtins[] ALIGN_PTR = {
 #if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
         { "echo", 1, echo_stream, echo_dg },
 #endif
@@ -1305,7 +1305,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
                 if (ready_fd_cnt < 0) {
                         if (errno != EINTR) {
                                 bb_simple_perror_msg("select");
-                                sleep(1);
+                                sleep1();
                         }
                         continue;
                 }
@@ -1406,7 +1406,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
 
                                 if (pid < 0) { /* fork error */
                                         bb_simple_perror_msg("vfork"+1);
-                                        sleep(1);
+                                        sleep1();
                                         restore_sigmask(&omask);
                                         maybe_close(new_udp_fd);
                                         maybe_close(accepted_fd);
@@ -1701,7 +1701,7 @@ static uint32_t machtime(void)
 {
         struct timeval tv;
 
-        gettimeofday(&tv, NULL);
+        xgettimeofday(&tv);
         return htonl((uint32_t)(tv.tv_sec + 2208988800U));
 }
 /* ARGSUSED */
diff --git a/networking/interface.c b/networking/interface.c
index e5e55d8d4..ea6a2c8a8 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -746,7 +746,7 @@ static const struct hwtype *const hwtypes[] = {
 };
 
 #ifdef IFF_PORTSEL
-static const char *const if_port_text[] = {
+static const char *const if_port_text[] ALIGN_PTR = {
         /* Keep in step with <linux/netdevice.h> */
         "unknown",
         "10base2",
diff --git a/networking/ip.c b/networking/ip.c
index 33bea5f49..85b1ba080 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -400,7 +400,7 @@ int ip_main(int argc UNUSED_PARAM, char **argv)
                 IF_FEATURE_IP_RULE("rule\0")
                 IF_FEATURE_IP_NEIGH("neigh\0")
                 ;
-        static const ip_func_ptr_t ip_func_ptrs[] = {
+        static const ip_func_ptr_t ip_func_ptrs[] ALIGN_PTR = {
                 ip_print_help,
                 IF_FEATURE_IP_ADDRESS(do_ipaddr,)
                 IF_FEATURE_IP_ROUTE(do_iproute,)
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 09b146872..e82e35dd5 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -36,7 +36,7 @@
 //kbuild:lib-$(CONFIG_IPCALC) += ipcalc.o
 
 //usage:#define ipcalc_trivial_usage
-//usage:       "[OPTIONS] ADDRESS"
+//usage:       "[-bnm"IF_FEATURE_IPCALC_FANCY("phs")"] ADDRESS"
 //usage:       IF_FEATURE_IPCALC_FANCY("[/PREFIX]") " [NETMASK]"
 //usage:#define ipcalc_full_usage "\n\n"
 //usage:       "Calculate and display network settings from IP address\n"
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 71e8fb6a7..dfd84c000 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -21,6 +21,17 @@
 #define IFF_LOWER_UP  0x10000  /* driver signals L1 up */
 #endif
 
+/* for old uclibc */
+#ifndef IFA_F_NOPREFIXROUTE
+# define IFA_FLAGS           8
+# define IFA_F_NOPREFIXROUTE 0x200
+enum { /* can't do this with preporcessor, IFA_MAX is an (enum - 1), not preprocessor constant */
+        REAL_IFA_MAX = (IFA_MAX >= IFA_FLAGS) ? IFA_MAX : IFA_FLAGS,
+};
+# undef IFA_MAX
+# define IFA_MAX REAL_IFA_MAX
+#endif
+
 struct filter_t {
         char *label;
         /* Flush cmd buf. If !NULL, print_addrinfo() constructs flush commands in it */
diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c
index 51f2e9bdb..3c2fad912 100644
--- a/networking/libiproute/rt_names.c
+++ b/networking/libiproute/rt_names.c
@@ -77,7 +77,7 @@ static rtnl_tab_t *rtnl_rtprot_tab;
 
 static void rtnl_rtprot_initialize(void)
 {
-        static const char *const init_tab[] = {
+        static const char *const init_tab[] ALIGN_PTR = {
                 "none",
                 "redirect",
                 "kernel",
diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c
index e94c99ab6..8b94c2f24 100644
--- a/networking/libiproute/rtm_map.c
+++ b/networking/libiproute/rtm_map.c
@@ -11,33 +11,55 @@
 #include "rt_names.h"
 #include "utils.h"
 
+static const char keywords[] ALIGN1 =
+        "local\0""nat\0""broadcast\0""brd\0""anycast\0"
+        "multicast\0""prohibit\0""unreachable\0""blackhole\0"
+        "xresolve\0""unicast\0""throw\0";
+enum {
+        ARG_local = 1, ARG_nat, ARG_broadcast, ARG_brd, ARG_anycast,
+        ARG_multicast, ARG_prohibit, ARG_unreachable, ARG_blackhole,
+        ARG_xresolve, ARG_unicast, ARG_throw
+};
+#define str_local       keywords
+#define str_nat         (str_local       + sizeof("local"))
+#define str_broadcast   (str_nat         + sizeof("nat"))
+#define str_brd         (str_broadcast   + sizeof("broadcast"))
+#define str_anycast     (str_brd         + sizeof("brd"))
+#define str_multicast   (str_anycast     + sizeof("anycast"))
+#define str_prohibit    (str_multicast   + sizeof("multicast"))
+#define str_unreachable (str_prohibit    + sizeof("prohibit"))
+#define str_blackhole   (str_unreachable + sizeof("unreachable"))
+#define str_xresolve    (str_blackhole   + sizeof("blackhole"))
+#define str_unicast     (str_xresolve    + sizeof("xresolve"))
+#define str_throw       (str_unicast     + sizeof("unicast"))
+
 const char* FAST_FUNC rtnl_rtntype_n2a(int id)
 {
         switch (id) {
         case RTN_UNSPEC:
                 return "none";
         case RTN_UNICAST:
-                return "unicast";
+                return str_unicast;
         case RTN_LOCAL:
-                return "local";
+                return str_local;
         case RTN_BROADCAST:
-                return "broadcast";
+                return str_broadcast;
         case RTN_ANYCAST:
-                return "anycast";
+                return str_anycast;
         case RTN_MULTICAST:
-                return "multicast";
+                return str_multicast;
         case RTN_BLACKHOLE:
-                return "blackhole";
+                return str_blackhole;
         case RTN_UNREACHABLE:
-                return "unreachable";
+                return str_unreachable;
         case RTN_PROHIBIT:
-                return "prohibit";
+                return str_prohibit;
         case RTN_THROW:
-                return "throw";
+                return str_throw;
         case RTN_NAT:
-                return "nat";
+                return str_nat;
         case RTN_XRESOLVE:
-                return "xresolve";
+                return str_xresolve;
         default:
                 return itoa(id);
         }
@@ -45,15 +67,6 @@ const char* FAST_FUNC rtnl_rtntype_n2a(int id)
 
 int FAST_FUNC rtnl_rtntype_a2n(int *id, char *arg)
 {
-        static const char keywords[] ALIGN1 =
-                "local\0""nat\0""broadcast\0""brd\0""anycast\0"
-                "multicast\0""prohibit\0""unreachable\0""blackhole\0"
-                "xresolve\0""unicast\0""throw\0";
-        enum {
-                ARG_local = 1, ARG_nat, ARG_broadcast, ARG_brd, ARG_anycast,
-                ARG_multicast, ARG_prohibit, ARG_unreachable, ARG_blackhole,
-                ARG_xresolve, ARG_unicast, ARG_throw
-        };
         const smalluint key = index_in_substrings(keywords, arg) + 1;
         char *end;
         unsigned long res;
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
index 3db3b46f9..755b42ccd 100644
--- a/networking/nbd-client.c
+++ b/networking/nbd-client.c
@@ -270,7 +270,7 @@ int nbdclient_main(int argc, char **argv)
                                                 close(fd);
                                         break;
                                 }
-                                sleep(1);
+                                sleep1();
                         }
                         open(device, O_RDONLY);
                         return 0;
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 88eda6b28..25b95246f 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -196,7 +196,7 @@ enum {
 /* Debug: squirt whatever message and sleep a bit so we can see it go by. */
 /* Beware: writes to stdOUT... */
 #if 0
-#define Debug(...) do { printf(__VA_ARGS__); printf("\n"); fflush_all(); sleep(1); } while (0)
+#define Debug(...) do { printf(__VA_ARGS__); printf("\n"); fflush_all(); sleep1(); } while (0)
 #else
 #define Debug(...) do { } while (0)
 #endif
diff --git a/networking/netstat.c b/networking/netstat.c
index 3ab7b0d21..807800a62 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -114,7 +114,7 @@ enum {
         TCP_CLOSING, /* now a valid state */
 };
 
-static const char *const tcp_state[] = {
+static const char *const tcp_state[] ALIGN_PTR = {
         "",
         "ESTABLISHED",
         "SYN_SENT",
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 759de5c83..c43ad46f3 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -273,7 +273,7 @@ struct query {
 static const struct {
         unsigned char type;
         char name[7];
-} qtypes[] = {
+} qtypes[] ALIGN1 = {
         { ns_t_soa,   "SOA"   },
         { ns_t_ns,    "NS"    },
         { ns_t_a,     "A"     },
@@ -288,7 +288,7 @@ static const struct {
         { ns_t_any,   "ANY"   },
 };
 
-static const char *const rcodes[] = {
+static const char *const rcodes[] ALIGN_PTR = {
         "NOERROR",    // 0
         "FORMERR",    // 1
         "SERVFAIL",   // 2
@@ -349,6 +349,8 @@ static int parse_reply(const unsigned char *msg, size_t len)
         header = (HEADER *)msg;
         if (!header->aa)
                 printf("Non-authoritative answer:\n");
+        else if (option_mask32 & OPT_debug)
+                printf("Non-authoritative answer:\n" + 4);
 
         if (ns_initparse(msg, len, &handle) != 0) {
                 //printf("Unable to parse reply: %s\n", strerror(errno));
@@ -381,7 +383,7 @@ static int parse_reply(const unsigned char *msg, size_t len)
                                 return -1;
                         }
                         inet_ntop(AF_INET6, ns_rr_rdata(rr), astr, sizeof(astr));
-                        /* bind-utils-9.11.3 uses the same format for A and AAAA answers */
+                        /* bind-utils 9.11.3 uses the same format for A and AAAA answers */
                         printf("Name:\t%s\nAddress: %s\n", ns_rr_name(rr), astr);
                         break;
 #endif
@@ -580,7 +582,7 @@ static int send_queries(struct ns *ns)
                         printf("Address:\t%s\n\n",
                                 auto_string(xmalloc_sockaddr2dotted(&ns->lsa->u.sa))
                         );
-                        /* In "Address", bind-utils-9.11.3 show port after a hash: "1.2.3.4#53" */
+                        /* In "Address", bind-utils 9.11.3 show port after a hash: "1.2.3.4#53" */
                         /* Should we do the same? */
                 }
 
@@ -640,12 +642,26 @@ static int send_queries(struct ns *ns)
                                 printf("*** Can't find %s: Parse error\n", G.query[qn].name);
                                 G.exitcode = EXIT_FAILURE;
                                 break;
-
-                        case 0:
-                                printf("*** Can't find %s: No answer\n", G.query[qn].name);
-                                break;
+                        /* bind-utils 9.11.25 just says nothing in this case */
+                        //case 0:
+                        //      break;
                         }
                 }
+/* NB: in case of authoritative, empty answer (NODATA), IOW: one with
+ * ns_msg_count() == 0, bind-utils 9.11.25 shows no trace of this answer
+ * (unless -debug, where it says:
+ * ------------
+ *     QUESTIONS:
+ *     host.com, type = AAAA, class = IN
+ *     ANSWERS:
+ *     AUTHORITY RECORDS:
+ *     ADDITIONAL RECORDS:
+ * ------------
+ * ). Due to printing of below '\n', we do show an additional empty line.
+ * This is better than not showing any indication of this reply at all,
+ * yet maintains "compatibility". I wonder whether it's better to break compat
+ * and emit something more meaningful, e.g. print "Empty answer (NODATA)"?
+ */
                 bb_putchar('\n');
                 n_replies++;
                 if (n_replies >= G.query_count)
@@ -697,7 +713,7 @@ static void parse_resolvconf(void)
 {
         FILE *resolv;
 
-        resolv = fopen("/etc/resolv.conf", "r");
+        resolv = fopen_for_read("/etc/resolv.conf");
         if (resolv) {
                 char line[512]; /* "search" is defined to be up to 256 chars */
 
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 44e711232..1f17b08ef 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -77,7 +77,7 @@
 //usage:        IF_FEATURE_NTP_AUTH(" [-k KEYFILE] [-p [keyno:N:]PEER]...")
 //usage:#define ntpd_full_usage "\n\n"
 //usage:       "NTP client/server\n"
-//usage:     "\n        -d      Verbose (may be repeated)"
+//usage:     "\n        -d[d]   Verbose"
 //usage:     "\n        -n      Do not daemonize"
 //usage:     "\n        -q      Quit after clock is set"
 //usage:     "\n        -N      Run at high priority"
@@ -113,6 +113,13 @@
 # define IPTOS_DSCP_AF21 0x48
 #endif
 
+#if defined(__FreeBSD__)
+/* see sys/timex.h */
+# define adjtimex ntp_adjtime
+# define ADJ_OFFSET     MOD_OFFSET
+# define ADJ_STATUS     MOD_STATUS
+# define ADJ_TIMECONST  MOD_TIMECONST
+#endif
 
 /* Verbosity control (max level of -dddd options accepted).
  * max 6 is very talkative (and bloated). 3 is non-bloated,
@@ -560,7 +567,7 @@ static double
 gettime1900d(void)
 {
         struct timeval tv;
-        gettimeofday(&tv, NULL); /* never fails */
+        xgettimeofday(&tv);
         G.cur_time = tv.tv_sec + (1.0e-6 * tv.tv_usec) + OFFSET_1900_1970;
         return G.cur_time;
 }
@@ -1144,11 +1151,10 @@ step_time(double offset)
         char buf[sizeof("yyyy-mm-dd hh:mm:ss") + /*paranoia:*/ 4];
         time_t tval;
 
-        gettimeofday(&tvc, NULL); /* never fails */
+        xgettimeofday(&tvc);
         dtime = tvc.tv_sec + (1.0e-6 * tvc.tv_usec) + offset;
         d_to_tv(dtime, &tvn);
-        if (settimeofday(&tvn, NULL) == -1)
-                bb_simple_perror_msg_and_die("settimeofday");
+        xsettimeofday(&tvn);
 
         VERB2 {
                 tval = tvc.tv_sec;
@@ -2462,9 +2468,6 @@ static NOINLINE void ntp_init(char **argv)
 
         srand(getpid());
 
-        if (getuid())
-                bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
-
         /* Set some globals */
         G.discipline_jitter = G_precision_sec;
         G.stratum = MAXSTRAT;
diff --git a/networking/ping.c b/networking/ping.c
index 5f7e5b9b5..86d8088de 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -58,16 +58,16 @@
 //usage:# define ping_trivial_usage
 //usage:       "HOST"
 //usage:# define ping_full_usage "\n\n"
-//usage:       "Send ICMP ECHO_REQUEST packets to network hosts"
+//usage:       "Send ICMP ECHO_REQUESTs to HOST"
 //usage:# define ping6_trivial_usage
 //usage:       "HOST"
 //usage:# define ping6_full_usage "\n\n"
-//usage:       "Send ICMP ECHO_REQUEST packets to network hosts"
+//usage:       "Send ICMP ECHO_REQUESTs to HOST"
 //usage:#else
 //usage:# define ping_trivial_usage
 //usage:       "[OPTIONS] HOST"
 //usage:# define ping_full_usage "\n\n"
-//usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
+//usage:       "Send ICMP ECHO_REQUESTs to HOST\n"
 //usage:        IF_PING6(
 //usage:     "\n        -4,-6           Force IP or IPv6 name resolution"
 //usage:        )
@@ -81,22 +81,26 @@
 //usage:     "\n                        (after all -c CNT packets are sent)"
 //usage:     "\n        -w SEC          Seconds until ping exits (default:infinite)"
 //usage:     "\n                        (can exit earlier with -c CNT)"
-//usage:     "\n        -q              Quiet, only display output at start"
-//usage:     "\n                        and when finished"
-//usage:     "\n        -p HEXBYTE      Pattern to use for payload"
+//usage:     "\n        -q              Quiet, only display output at start/finish"
+//usage:     "\n        -p HEXBYTE      Payload pattern"
 //usage:
 //usage:# define ping6_trivial_usage
 //usage:       "[OPTIONS] HOST"
 //usage:# define ping6_full_usage "\n\n"
-//usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
+//usage:       "Send ICMP ECHO_REQUESTs to HOST\n"
 //usage:     "\n        -c CNT          Send only CNT pings"
 //usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default 56)"
 //usage:     "\n        -i SECS         Interval"
 //usage:     "\n        -A              Ping as soon as reply is recevied"
+///////:     "\n        -t TTL          Set TTL"
+///////^^^^^ -t not tested for IPv6, might be not working
 //usage:     "\n        -I IFACE/IP     Source interface or IP address"
-//usage:     "\n        -q              Quiet, only display output at start"
-//usage:     "\n                        and when finished"
-//usage:     "\n        -p HEXBYTE      Pattern to use for payload"
+//usage:     "\n        -W SEC          Seconds to wait for the first response (default 10)"
+//usage:     "\n                        (after all -c CNT packets are sent)"
+//usage:     "\n        -w SEC          Seconds until ping exits (default:infinite)"
+//usage:     "\n                        (can exit earlier with -c CNT)"
+//usage:     "\n        -q              Quiet, only display output at start/finish"
+//usage:     "\n        -p HEXBYTE      Payload pattern"
 //usage:
 //usage:#endif
 //usage:
@@ -118,6 +122,10 @@
 //usage:       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
 
 #include <net/if.h>
+#if defined(__FreeBSD__)
+# include <netinet/in.h> /* struct ip and friends */
+# include <netinet/ip.h>
+#endif
 #include <netinet/ip_icmp.h>
 #include "libbb.h"
 #include "common_bufsiz.h"
@@ -156,6 +164,40 @@
 # endif
 #endif
 
+#if defined(__FreeBSD__)
+/**
+ * On BSD the IPv4 struct is called struct ip and instead of iXX
+ * the members are called ip_XX. One could change this code to use
+ * struct ip but that would require to define _BSD_SOURCE and that
+ * might have other complications. Instead make sure struct iphdr
+ * is present on FreeBSD. The below is taken from GLIBC.
+ *
+ * The GNU C Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ */
+struct iphdr {
+# if BYTE_ORDER == LITTLE_ENDIAN
+        unsigned int ihl:4;
+        unsigned int version:4;
+# elif BYTE_ORDER == BIG_ENDIAN
+        unsigned int version:4;
+        unsigned int ihl:4;
+# endif
+        uint8_t  tos;
+        uint16_t tot_len;
+        uint16_t id;
+        uint16_t frag_off;
+        uint8_t  ttl;
+        uint8_t  protocol;
+        uint16_t check;
+        uint32_t saddr;
+        uint32_t daddr;
+        /*The options start here. */
+};
+#endif
+
 enum {
         DEFDATALEN = 56,
         MAXIPLEN = 60,
@@ -332,6 +374,11 @@ static int common_ping_main(sa_family_t af, char **argv)
 
         create_icmp_socket(lsa);
         G.myid = (uint16_t) getpid();
+        /* we can use native-endian ident, but other Unix ping/traceroute
+         * utils use *big-endian pid*, and e.g. traceroute on our machine may be
+         * *not* from busybox, idents may collide. Follow the convention:
+         */
+        G.myid = htons(G.myid);
 #if ENABLE_PING6
         if (lsa->u.sa.sa_family == AF_INET6)
                 ping6(lsa);
@@ -466,17 +513,16 @@ static void sendping_tail(void (*sp)(int), int size_pkt)
 {
         int sz;
 
-        CLR((uint16_t)G.ntransmitted % MAX_DUP_CHK);
-        G.ntransmitted++;
-
-        size_pkt += datalen;
-
         if (G.deadline_us) {
                 unsigned n = G.cur_us - G.deadline_us;
                 if ((int)n >= 0)
                         print_stats_and_exit(0);
         }
 
+        CLR((uint16_t)G.ntransmitted % MAX_DUP_CHK);
+        G.ntransmitted++;
+        size_pkt += datalen;
+
         /* sizeof(pingaddr) can be larger than real sa size, but I think
          * it doesn't matter */
         sz = xsendto(pingsock, G.snd_packet, size_pkt, &pingaddr.sa, sizeof(pingaddr));
@@ -927,6 +973,11 @@ static int common_ping_main(int opt, char **argv)
         G.interval_us = interval * 1000000;
 
         myid = (uint16_t) getpid();
+        /* we can use native-endian ident, but other Unix ping/traceroute
+         * utils use *big-endian pid*, and e.g. traceroute on our machine may be
+         * *not* from busybox, idents may collide. Follow the convention:
+         */
+        myid = htons(myid);
         hostname = argv[optind];
 #if ENABLE_PING6
         {
diff --git a/networking/pscan.c b/networking/pscan.c
index 2715ef2df..816178bbc 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -18,13 +18,13 @@
 //usage:#define pscan_trivial_usage
 //usage:       "[-cb] [-p MIN_PORT] [-P MAX_PORT] [-t TIMEOUT] [-T MIN_RTT] HOST"
 //usage:#define pscan_full_usage "\n\n"
-//usage:       "Scan a host, print all open ports\n"
+//usage:       "Scan HOST, print all open ports\n"
 //usage:     "\n        -c      Show closed ports too"
 //usage:     "\n        -b      Show blocked ports too"
-//usage:     "\n        -p      Scan from this port (default 1)"
-//usage:     "\n        -P      Scan up to this port (default 1024)"
-//usage:     "\n        -t      Timeout (default 5000 ms)"
-//usage:     "\n        -T      Minimum rtt (default 5 ms, increase for congested hosts)"
+//usage:     "\n        -p PORT Scan from this port (default 1)"
+//usage:     "\n        -P PORT Scan up to this port (default 1024)"
+//usage:     "\n        -t MS   Timeout (default 5000 ms)"
+//usage:     "\n        -T MS   Minimum rtt (default 5 ms)"
 
 #include "libbb.h"
 
@@ -139,7 +139,7 @@ int pscan_main(int argc UNUSED_PARAM, char **argv)
                          * We check rtt BEFORE we usleep, otherwise
                          * on localhost we'll have no writes done (!)
                          * before we exceed (rather small) rtt */
-                        usleep(rtt_4/8);
+                        usleep(rtt_4 / 8);
  open:
                         diff = MONOTONIC_US() - start;
                         DMSG("write to port %u @%u", port, diff - start);
diff --git a/networking/route.c b/networking/route.c
index 4d9aad6cc..ff5daa8a7 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -34,14 +34,6 @@
 
 //kbuild:lib-$(CONFIG_ROUTE) += route.o
 
-//usage:#define route_trivial_usage
-//usage:       "[{add|del|delete}]"
-//usage:#define route_full_usage "\n\n"
-//usage:       "Edit kernel routing tables\n"
-//usage:     "\n        -n      Don't resolve names"
-//usage:     "\n        -e      Display other/more information"
-//usage:     "\n        -A inet" IF_FEATURE_IPV6("{6}") "       Select address family"
-
 #include <net/route.h>
 #include <net/if.h>
 
@@ -83,17 +75,15 @@
 #define RTACTION_ADD 1
 #define RTACTION_DEL 2
 
-/* For the various tbl_*[] arrays, the 1st byte is the offset to
- * the next entry and the 2nd byte is return value. */
+/* For the various tbl_*[] arrays, the 1st byte is return value. */
 
 #define NET_FLAG  1
 #define HOST_FLAG 2
 
 /* We remap '-' to '#' to avoid problems with getopt. */
 static const char tbl_hash_net_host[] ALIGN1 =
-        "\007\001#net\0"
-/*      "\010\002#host\0" */
-        "\007\002#host"                         /* Since last, we can save a byte. */
+        "\001#net\0"
+        "\002#host\0"
 ;
 
 #define KW_TAKES_ARG            020
@@ -116,29 +106,28 @@ static const char tbl_hash_net_host[] ALIGN1 =
 static const char tbl_ipvx[] ALIGN1 =
         /* 020 is the "takes an arg" bit */
 #if HAVE_NEW_ADDRT
-        "\011\020metric\0"
+        "\020metric\0"
 #endif
-        "\012\021netmask\0"
-        "\005\022gw\0"
-        "\012\022gateway\0"
-        "\006\023mss\0"
-        "\011\024window\0"
+        "\021netmask\0"
+        "\022gw\0"
+        "\022gateway\0"
+        "\023mss\0"
+        "\024window\0"
 #ifdef RTF_IRTT
-        "\007\025irtt\0"
+        "\025irtt\0"
 #endif
-        "\006\026dev\0"
-        "\011\026device\0"
+        "\026dev\0"
+        "\026device\0"
         /* 040 is the "sets a flag" bit - MUST match flags_ipvx[] values below. */
 #ifdef RTF_REJECT
-        "\011\040reject\0"
+        "\040reject\0"
 #endif
-        "\006\041mod\0"
-        "\006\042dyn\0"
-/*      "\014\043reinstate\0" */
-        "\013\043reinstate"                     /* Since last, we can save a byte. */
+        "\041mod\0"
+        "\042dyn\0"
+        "\043reinstate\0"
 ;
 
-static const uint16_t flags_ipvx[] = { /* MUST match tbl_ipvx[] values above. */
+static const uint16_t flags_ipvx[] ALIGN2 = { /* MUST match tbl_ipvx[] values above. */
 #ifdef RTF_REJECT
         RTF_REJECT,
 #endif
@@ -151,17 +140,17 @@ static int kw_lookup(const char *kwtbl, char ***pargs)
 {
         if (**pargs) {
                 do {
-                        if (strcmp(kwtbl+2, **pargs) == 0) { /* Found a match. */
+                        if (strcmp(kwtbl + 1, **pargs) == 0) { /* Found a match. */
                                 *pargs += 1;
-                                if (kwtbl[1] & KW_TAKES_ARG) {
+                                if (kwtbl[0] & KW_TAKES_ARG) {
                                         if (!**pargs) { /* No more args! */
                                                 bb_show_usage();
                                         }
                                         *pargs += 1; /* Calling routine will use args[-1]. */
                                 }
-                                return kwtbl[1];
+                                return kwtbl[0];
                         }
-                        kwtbl += *kwtbl;
+                        kwtbl += strlen(kwtbl) + 1;
                 } while (*kwtbl);
         }
         return 0;
@@ -208,7 +197,7 @@ static NOINLINE void INET_setroute(int action, char **args)
                         /* Default netmask. */
                         netmask = "default";
                 }
-                /* Prefer hostname lookup is -host flag (xflag==1) was given. */
+                /* Prefer hostname lookup if -host flag (xflag==1) was given. */
                 isnet = INET_resolve(target, (struct sockaddr_in *) &rt->rt_dst,
                                                          (xflag & HOST_FLAG));
                 if (isnet < 0) {
@@ -460,9 +449,9 @@ static NOINLINE void INET6_setroute(int action, char **args)
 #endif
 
 static const
-IF_NOT_FEATURE_IPV6(uint16_t)
-IF_FEATURE_IPV6(unsigned)
-flagvals[] = { /* Must agree with flagchars[]. */
+IF_NOT_FEATURE_IPV6(uint16_t flagvals[] ALIGN2 = )
+IF_FEATURE_IPV6(uint32_t flagvals[] ALIGN4 = )
+{ /* Must agree with flagchars[]. */
         RTF_UP,
         RTF_GATEWAY,
         RTF_HOST,
@@ -544,7 +533,6 @@ void FAST_FUNC bb_displayroutes(int noresolve, int netstatfmt)
                         flags[0] = '!';
                 }
 #endif
-
                 memset(&s_addr, 0, sizeof(struct sockaddr_in));
                 s_addr.sin_family = AF_INET;
                 s_addr.sin_addr.s_addr = d;
@@ -634,7 +622,6 @@ static void INET6_displayroutes(void)
                         naddr6 = INET6_rresolve((struct sockaddr_in6 *) &snaddr6,
                                                 0x0fff /* Apparently, upstream never resolves. */
                                                 );
-
                         if (!r) {                       /* 1st pass */
                                 snprintf(addr6, sizeof(addr6), "%s/%d", naddr6, prefix_len);
                                 r += 40;
@@ -653,18 +640,27 @@ static void INET6_displayroutes(void)
 
 #endif
 
+//usage:#define route_trivial_usage
+///////:       "[-ne]"IF_FEATURE_IPV6(" [-A inet[6]]")" [{add|del|delete} [-net|-host] TARGET [netmask MASK] [gw GATEWAY] [metric N] [mss BYTES] [window BYTES] [irtt MSEC] [reject] [mod] [dyn] [reinstate] [[dev] IFACE]]"
+///////too wordy
+//usage:       "[-ne]"IF_FEATURE_IPV6(" [-A inet[6]]")" [{add|del} [-net|-host] TARGET [netmask MASK]\n"
+//usage:       "        [gw GATEWAY] [metric N] [mss BYTES] [window BYTES] [reject] [IFACE]]"
+//usage:#define route_full_usage "\n\n"
+//usage:       "Show or edit kernel routing tables\n"
+//usage:     "\n        -n      Don't resolve names"
+//usage:     "\n        -e      Display other/more information"
+//usage:     "\n        -A inet" IF_FEATURE_IPV6("[6]") "       Select address family"
+
 #define ROUTE_OPT_A     0x01
 #define ROUTE_OPT_n     0x02
 #define ROUTE_OPT_e     0x04
 #define ROUTE_OPT_INET6 0x08 /* Not an actual option. See below. */
 
-/* 1st byte is offset to next entry offset.  2nd byte is return value. */
-/* 2nd byte matches RTACTION_* code */
+/* 1st byte is return value, matches RTACTION_* code */
 static const char tbl_verb[] ALIGN1 =
-        "\006\001add\0"
-        "\006\002del\0"
-/*      "\011\002delete\0" */
-        "\010\002delete"  /* Since it's last, we can save a byte. */
+        "\001add\0"
+        "\002del\0"
+        "\002delete\0"
 ;
 
 int route_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/networking/slattach.c b/networking/slattach.c
index 51fbc1f49..6d2a252fc 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -76,7 +76,7 @@ static void restore_state_and_exit(int exitcode)
         cfsetispeed(&state, B0);
         cfsetospeed(&state, B0);
         exitcode |= tcsetattr_serial_or_warn(&state);
-        sleep(1);
+        sleep1();
 
         /* Restore line status */
         if (tcsetattr_serial_or_warn(&G.saved_state))
diff --git a/networking/telnet.c b/networking/telnet.c
index 9fc85050b..7a0253525 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -368,12 +368,16 @@ static void put_iac2_msb_lsb(unsigned x_y)
 }
 #define put_iac2_x_y(x,y) put_iac2_msb_lsb(((x)<<8) + (y))
 
+#if ENABLE_FEATURE_TELNET_WIDTH \
+ || ENABLE_FEATURE_TELNET_TTYPE \
+ || ENABLE_FEATURE_TELNET_AUTOLOGIN
 static void put_iac4_msb_lsb(unsigned x_y_z_t)
 {
         put_iac2_msb_lsb(x_y_z_t >> 16);
         put_iac2_msb_lsb(x_y_z_t);  /* "... & 0xffff" is implicit */
 }
 #define put_iac4_x_y_z_t(x,y,z,t) put_iac4_msb_lsb(((x)<<24) + ((y)<<16) + ((z)<<8) + (t))
+#endif
 
 static void put_iac3_IAC_x_y_merged(unsigned wwdd_and_c)
 {
@@ -673,7 +677,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
                         if (bb_got_signal)
                                 con_escape();
                         else
-                                sleep(1);
+                                sleep1();
                         continue;
                 }
 
diff --git a/networking/tftp.c b/networking/tftp.c
index 60fdff232..4b86ed9de 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -104,7 +104,7 @@
 //usage:     "\n        -p      Put file"
 //usage:        )
 //usage:        IF_FEATURE_TFTP_BLOCKSIZE(
-//usage:     "\n        -b SIZE Transfer blocks of SIZE octets"
+//usage:     "\n        -b SIZE Transfer blocks in bytes"
 //usage:        )
 ///////:     "\n        -m STR  Accepted and ignored ('-m binary' compat with tftp-hpa 5.2)"
 //usage:
@@ -120,7 +120,7 @@
 //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"
-//usage:     "\n        -u      Access files as USER"
+//usage:     "\n        -u USER Access files as USER"
 //usage:     "\n        -l      Log to syslog (inetd mode requires this)"
 
 #include "libbb.h"
diff --git a/networking/tls.c b/networking/tls.c
index c00ef5db0..869456a6a 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -1959,7 +1959,7 @@ static void send_client_key_exchange(tls_state_t *tls)
                 premaster_size = sizeof(rsa_premaster);
         } else {
                 /* ECDHE */
-                static const uint8_t basepoint9[CURVE25519_KEYSIZE] = {9};
+                static const uint8_t basepoint9[CURVE25519_KEYSIZE] ALIGN1 = {9};
                 uint8_t privkey[CURVE25519_KEYSIZE]; //[32]
 
                 if (!(tls->flags & GOT_EC_KEY))
diff --git a/networking/tls_aes.c b/networking/tls_aes.c
index 5400ad9b5..feb618fb7 100644
--- a/networking/tls_aes.c
+++ b/networking/tls_aes.c
@@ -313,15 +313,15 @@ static void InvMixColumns(unsigned astate[16])
                 d = astate[i + 3];
                 x = (a << 1) ^ (a << 2) ^ (a << 3) ^ b ^ (b << 1) ^ (b << 3)
                 /***/ ^ c ^ (c << 2) ^ (c << 3) ^ d ^ (d << 3);
+                astate[i + 0] = Multiply(x);
                 y = a ^ (a << 3) ^ (b << 1) ^ (b << 2) ^ (b << 3)
                 /***/ ^ c ^ (c << 1) ^ (c << 3) ^ d ^ (d << 2) ^ (d << 3);
+                astate[i + 1] = Multiply(y);
                 z = a ^ (a << 2) ^ (a << 3) ^ b ^ (b << 3)
                 /***/ ^ (c << 1) ^ (c << 2) ^ (c << 3) ^ d ^ (d << 1) ^ (d << 3);
+                astate[i + 2] = Multiply(z);
                 t = a ^ (a << 1) ^ (a << 3) ^ b ^ (b << 2) ^ (b << 3)
                 /***/ ^ c ^ (c << 3) ^ (d << 1) ^ (d << 2) ^ (d << 3);
-                astate[i + 0] = Multiply(x);
-                astate[i + 1] = Multiply(y);
-                astate[i + 2] = Multiply(z);
                 astate[i + 3] = Multiply(t);
         }
 }
diff --git a/networking/tls_fe.c b/networking/tls_fe.c
index 10971bbff..f810e112a 100644
--- a/networking/tls_fe.c
+++ b/networking/tls_fe.c
@@ -383,12 +383,10 @@ static void fe_inv__distinct(byte *r, const byte *x)
          * to avoid copying temporaries.
          */
 
-        /* 1 1 */
-        fe_mul__distinct(s, x, x);
-        fe_mul__distinct(r, s, x);
+        lm_copy(r, x);
 
-        /* 1 x 248 */
-        for (i = 0; i < 248; i++) {
+        /* 1, 1 x 249 */
+        for (i = 0; i < 249; i++) {
                 fe_mul__distinct(s, r, r);
                 fe_mul__distinct(r, s, x);
         }
@@ -403,13 +401,11 @@ static void fe_inv__distinct(byte *r, const byte *x)
         /* 0 */
         fe_mul__distinct(r, s, s);
 
-        /* 1 */
-        fe_mul__distinct(s, r, r);
-        fe_mul__distinct(r, s, x);
-
-        /* 1 */
-        fe_mul__distinct(s, r, r);
-        fe_mul__distinct(r, s, x);
+        /* 1, 1 */
+        for (i = 0; i < 2; i++) {
+                fe_mul__distinct(s, r, r);
+                fe_mul__distinct(r, s, x);
+        }
 }
 
 #if 0 //UNUSED
@@ -435,12 +431,10 @@ static void exp2523(byte *r, const byte *x, byte *s)
          *     111111... 01
          */
 
-        /* 1 1 */
-        fe_mul__distinct(r, x, x);
-        fe_mul__distinct(s, r, x);
+        lm_copy(s, x);
 
-        /* 1 x 248 */
-        for (i = 0; i < 248; i++) {
+        /* 1, 1 x 249 */
+        for (i = 0; i < 249; i++) {
                 fe_mul__distinct(r, s, s);
                 fe_mul__distinct(s, r, x);
         }
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 1c4dc3e4a..8f5cd0bf2 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -243,7 +243,7 @@
 //kbuild:lib-$(CONFIG_TRACEROUTE6) += traceroute.o
 
 //usage:#define traceroute_trivial_usage
-//usage:       "[-"IF_TRACEROUTE6("46")"FIlnrv] [-f 1ST_TTL] [-m MAXTTL] [-q PROBES] [-p PORT]\n"
+//usage:       "[-"IF_TRACEROUTE6("46")IF_FEATURE_TRACEROUTE_USE_ICMP("I")"Flnrv] [-f 1ST_TTL] [-m MAXTTL] [-q PROBES] [-p PORT]\n"
 //usage:       "        [-t TOS] [-w WAIT_SEC] [-s SRC_IP] [-i IFACE]\n"
 //usage:       "        [-z PAUSE_MSEC] HOST [BYTES]"
 //usage:#define traceroute_full_usage "\n\n"
@@ -271,15 +271,20 @@
 //usage:     "\n        -s IP   Source address"
 //usage:     "\n        -i IFACE Source interface"
 //usage:     "\n        -t N    Type-of-service in probe packets (default 0)"
-//usage:     "\n        -w SEC  Time to wait for a response (default 3)"
-//usage:     "\n        -g IP   Loose source route gateway (8 max)"
+//usage:     "\n        -w SEC  Wait for a response (default 3)"
+//usage:     "\n        -z MSEC Wait before each send"
 //usage:
 //usage:#define traceroute6_trivial_usage
-//usage:       "[-nrv] [-m MAXTTL] [-q PROBES] [-p PORT]\n"
+//usage:       "[-"IF_FEATURE_TRACEROUTE_USE_ICMP("I")"nrv] [-f 1ST_TTL] [-m MAXTTL] [-q PROBES] [-p PORT]\n"
 //usage:       "        [-t TOS] [-w WAIT_SEC] [-s SRC_IP] [-i IFACE]\n"
-//usage:       "        HOST [BYTES]"
+//usage:       "        [-z PAUSE_MSEC] HOST [BYTES]"
 //usage:#define traceroute6_full_usage "\n\n"
 //usage:       "Trace the route to HOST\n"
+////NOP?     "\n        -F      Set don't fragment bit"
+//usage:        IF_FEATURE_TRACEROUTE_USE_ICMP(
+//usage:     "\n        -I      Use ICMP ECHO instead of UDP datagrams"
+//usage:        )
+////NOP:     "\n        -l      Display TTL value of the returned packet"
 //Currently disabled (TRACEROUTE_SO_DEBUG==0)
 ////usage:     "\n      -d      Set SO_DEBUG options to socket"
 //usage:     "\n        -n      Print numeric addresses"
@@ -287,6 +292,7 @@
 //usage:        IF_FEATURE_TRACEROUTE_VERBOSE(
 //usage:     "\n        -v      Verbose"
 //usage:        )
+//usage:     "\n        -f N    First number of hops (default 1)"
 //usage:     "\n        -m N    Max number of hops"
 //usage:     "\n        -q N    Number of probes per hop (default 3)"
 //usage:     "\n        -p N    Base UDP port number used in probes"
@@ -294,7 +300,8 @@
 //usage:     "\n        -s IP   Source address"
 //usage:     "\n        -i IFACE Source interface"
 //usage:     "\n        -t N    Type-of-service in probe packets (default 0)"
-//usage:     "\n        -w SEC  Time wait for a response (default 3)"
+//usage:     "\n        -w SEC  Wait for a response (default 3)"
+//usage:     "\n        -z MSEC Wait before each send"
 
 #define TRACEROUTE_SO_DEBUG 0
 
@@ -324,7 +331,6 @@
 #ifndef IPPROTO_IP
 # define IPPROTO_IP 0
 #endif
-
 /* Some operating systems, like GNU/Hurd, don't define SOL_RAW, but do have
  * IPPROTO_RAW. Since the IPPROTO definitions are also valid to use for
  * setsockopt (and take the same value as their corresponding SOL definitions,
@@ -335,7 +341,7 @@
 
 
 #define OPT_STRING \
-        "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
+        "FIlnrdvt:i:m:p:q:s:w:z:f:" \
         "4" IF_TRACEROUTE6("6")
 enum {
         OPT_DONT_FRAGMNT = (1 << 0),    /* F */
@@ -345,20 +351,23 @@ enum {
         OPT_BYPASS_ROUTE = (1 << 4),    /* r */
         OPT_DEBUG        = (1 << 5),    /* d */
         OPT_VERBOSE      = (1 << 6) * ENABLE_FEATURE_TRACEROUTE_VERBOSE, /* v */
-        OPT_IP_CHKSUM    = (1 << 7),    /* x */
-        OPT_TOS          = (1 << 8),    /* t */
-        OPT_DEVICE       = (1 << 9),    /* i */
-        OPT_MAX_TTL      = (1 << 10),   /* m */
-        OPT_PORT         = (1 << 11),   /* p */
-        OPT_NPROBES      = (1 << 12),   /* q */
-        OPT_SOURCE       = (1 << 13),   /* s */
-        OPT_WAITTIME     = (1 << 14),   /* w */
-        OPT_PAUSE_MS     = (1 << 15),   /* z */
-        OPT_FIRST_TTL    = (1 << 16),   /* f */
-        OPT_IPV4         = (1 << 17),   /* 4 */
-        OPT_IPV6         = (1 << 18) * ENABLE_TRACEROUTE6, /* 6 */
+        OPT_TOS          = (1 << 7),    /* t */
+        OPT_DEVICE       = (1 << 8),    /* i */
+        OPT_MAX_TTL      = (1 << 9),    /* m */
+        OPT_PORT         = (1 << 10),   /* p */
+        OPT_NPROBES      = (1 << 11),   /* q */
+        OPT_SOURCE       = (1 << 12),   /* s */
+        OPT_WAITTIME     = (1 << 13),   /* w */
+        OPT_PAUSE_MS     = (1 << 14),   /* z */
+        OPT_FIRST_TTL    = (1 << 15),   /* f */
+        OPT_IPV4         = (1 << 16),   /* 4 */
+        OPT_IPV6         = (1 << 17) * ENABLE_TRACEROUTE6, /* 6 */
 };
-#define verbose (option_mask32 & OPT_VERBOSE)
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
+# define verbose (option_mask32 & OPT_VERBOSE)
+#else
+# define verbose 0
+#endif
 
 enum {
         SIZEOF_ICMP_HDR = 8,
@@ -387,13 +396,26 @@ struct globals {
         struct ip *outip;
         /* Pointer to ICMP or UDP payload (not header): */
         struct outdata_t *outdata;
-
         len_and_sockaddr *dest_lsa;
+        len_and_sockaddr *from_lsa;     /* response came from this address */
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
+        struct sockaddr *to;            /* response came to this (local) address */
+#endif
+        uint32_t ident;
+        uint16_t port;                  /* start udp dest port # for probe packets */
+#if ENABLE_TRACEROUTE6
+        smallint ipv6;
+# define G_ipv6 G.ipv6
+#else
+# define G_ipv6 0
+#endif
         int packlen;                    /* total length of packet */
         int pmtu;                       /* Path MTU Discovery (RFC1191) */
-        uint32_t ident;
-        uint16_t port; // 33434;        /* start udp dest port # for probe packets */
-        int waittime; // 5;             /* time to wait for response (in seconds) */
+        int waittime;                   /* time to wait for response (in seconds) */
+        int first_ttl;
+        int nprobes;
+        int max_ttl;
+        unsigned pausemsecs;
         unsigned char recv_pkt[512];    /* last inbound (icmp) packet */
 };
 
@@ -407,19 +429,39 @@ struct globals {
 #define port      (G.port     )
 #define waittime  (G.waittime )
 #define recv_pkt  (G.recv_pkt )
-#define gwlist    (G.gwlist   )
 #define INIT_G() do { \
         SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
-        port = 33434; \
-        waittime = 5; \
 } while (0)
 
-#define outicmp ((struct icmp *)(outip + 1))
-#define outudp  ((struct udphdr *)(outip + 1))
-
+#define outudp   ((struct udphdr *)(outip + 1))
+#define outudp6  ((struct udphdr *)(((struct ip6_hdr*)outip) + 1))
+#define outicmp  ((struct icmp *)(outip + 1))
+#define outicmp6 ((struct icmp *)(((struct ip6_hdr*)outip) + 1))
+/* NB: for icmp echo, IPv4 and IPv6 fields are the same size and offset:
+ * struct icmp:
+ *      uint8_t  icmp_type;
+ *      uint8_t  icmp_code;
+ *      uint16_t icmp_cksum;
+ *      uint16_t icmp_id;
+ *      uint16_t icmp_seq;
+ * struct icmp6_hdr:
+ *      uint8_t  icmp6_type;
+ *      uint8_t  icmp6_code;
+ *      uint16_t icmp6_cksum;
+ *      uint16_t icmp6_id;
+ *      uint16_t icmp6_seq;
+ * therefore both outicmp and outicmp6 are pointers to *IPv4* icmp struct.
+ * SIZEOF_ICMP_HDR == 8 is the same for both, as well.
+ * However, values of these pointers are not the same (since IPv6 IP header is larger),
+ * and icmp_type constants are not the same:
+ * #define ICMP_ECHO               8
+ * #define ICMP_ECHOREPLY          0
+ * #define ICMP6_ECHO_REQUEST    128
+ * #define ICMP6_ECHO_REPLY      129
+ */
 
 static int
-wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to, unsigned *timestamp_us, int *left_ms)
+wait_for_reply(unsigned *timestamp_us, int *left_ms)
 {
         struct pollfd pfd[1];
         int read_len = 0;
@@ -429,10 +471,19 @@ wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to, unsigned *timest
         if (*left_ms >= 0 && safe_poll(pfd, 1, *left_ms) > 0) {
                 unsigned t;
 
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
                 read_len = recv_from_to(rcvsock,
                                 recv_pkt, sizeof(recv_pkt),
                                 /*flags:*/ MSG_DONTWAIT,
-                                &from_lsa->u.sa, to, from_lsa->len);
+                                &G.from_lsa->u.sa, G.to, G.from_lsa->len);
+#else
+                read_len = recvfrom(rcvsock,
+                                recv_pkt, sizeof(recv_pkt),
+                                /*flags:*/ MSG_DONTWAIT,
+                                &G.from_lsa->u.sa, &G.from_lsa->len);
+#endif
+                if (read_len < 0)
+                        bb_simple_perror_msg_and_die("recv");
                 t = monotonic_us();
                 *left_ms -= (t - *timestamp_us) / 1000;
                 *timestamp_us = t;
@@ -446,14 +497,16 @@ send_probe(int seq, int ttl)
 {
         int len, res;
         void *out;
+        struct icmp *icp;
 
         /* Payload */
 #if ENABLE_TRACEROUTE6
-        if (dest_lsa->u.sa.sa_family == AF_INET6) {
-                struct outdata6_t *pkt = (struct outdata6_t *) outdata;
-                pkt->ident6 = htonl(ident);
+        if (G_ipv6) {
+                struct outdata6_t *pkt = (void *) outdata;
+                pkt->ident6 = ident;
                 pkt->seq6   = htonl(seq);
-                /*gettimeofday(&pkt->tv, &tz);*/
+                /*xgettimeofday(&pkt->tv);*/
+                icp = outicmp6;
         } else
 #endif
         {
@@ -461,19 +514,23 @@ send_probe(int seq, int ttl)
                 outdata->ttl = ttl;
 // UNUSED: was storing gettimeofday's result there, but never ever checked it
                 /*memcpy(&outdata->tv, tp, sizeof(outdata->tv));*/
-
-                if (option_mask32 & OPT_USE_ICMP) {
-                        outicmp->icmp_seq = htons(seq);
-
-                        /* Always calculate checksum for icmp packets */
-                        outicmp->icmp_cksum = 0;
-                        outicmp->icmp_cksum = inet_cksum(
-                                        outicmp,
-                                        ((char*)outip + packlen) - (char*)outicmp
-                        );
-                        if (outicmp->icmp_cksum == 0)
-                                outicmp->icmp_cksum = 0xffff;
-                }
+                icp = outicmp;
+        }
+        out = outdata;
+        if (option_mask32 & OPT_USE_ICMP) {
+                out = icp;
+                /*icp->icmp_type = ICMP[6]_ECHO; - already set */
+                /*icp->icmp_code = 0; - already set */
+                /*icp->icmp_id = ident; - already set */
+                icp->icmp_seq = htons(seq);
+                /* Always calculate checksum for icmp packets */
+                icp->icmp_cksum = 0;
+                icp->icmp_cksum = inet_cksum(
+                                icp,
+                                ((char*)outip + packlen) - (char*)icp
+                );
+                if (icp->icmp_cksum == 0)
+                        icp->icmp_cksum = 0xffff;
         }
 
 //BUG! verbose is (x & OPT_VERBOSE), not a counter!
@@ -502,9 +559,8 @@ send_probe(int seq, int ttl)
         }
 #endif
 
-        out = outdata;
 #if ENABLE_TRACEROUTE6
-        if (dest_lsa->u.sa.sa_family == AF_INET6) {
+        if (G_ipv6) {
                 res = setsockopt_int(sndsock, SOL_IPV6, IPV6_UNICAST_HOPS, ttl);
                 if (res != 0)
                         bb_perror_msg_and_die("setsockopt(%s) %d", "UNICAST_HOPS", ttl);
@@ -516,8 +572,6 @@ send_probe(int seq, int ttl)
                 if (res != 0)
                         bb_perror_msg_and_die("setsockopt(%s) %d", "TTL", ttl);
 #endif
-                if (option_mask32 & OPT_USE_ICMP)
-                        out = outicmp;
         }
 
         if (!(option_mask32 & OPT_USE_ICMP)) {
@@ -530,13 +584,11 @@ send_probe(int seq, int ttl)
 }
 
 #if ENABLE_FEATURE_TRACEROUTE_VERBOSE
-/*
- * Convert an ICMP "type" field to a printable string.
- */
+/* Convert an ICMP "type" field to a printable string */
 static const char *
 pr_type(unsigned char t)
 {
-        static const char *const ttab[] = {
+        static const char *const ttab[] ALIGN_PTR = {
         "Echo Reply",   "ICMP 1",       "ICMP 2",       "Dest Unreachable",
         "Source Quench", "Redirect",    "ICMP 6",       "ICMP 7",
         "Echo",         "Router Advert", "Router Solicit", "Time Exceeded",
@@ -544,7 +596,7 @@ pr_type(unsigned char t)
         "Info Reply",   "Mask Request", "Mask Reply"
         };
 # if ENABLE_TRACEROUTE6
-        static const char *const ttab6[] = {
+        static const char *const ttab6[] ALIGN_PTR = {
 [0]     = "Error", "Dest Unreachable", "Packet Too Big", "Time Exceeded",
 [4]     = "Param Problem",
 [8]     = "Echo Request", "Echo Reply", "Membership Query", "Membership Report",
@@ -552,7 +604,7 @@ pr_type(unsigned char t)
 [16]    = "Neighbor Advert", "Redirect",
         };
 
-        if (dest_lsa->u.sa.sa_family == AF_INET6) {
+        if (G_ipv6) {
                 if (t < 5)
                         return ttab6[t];
                 if (t < 128 || t > ND_REDIRECT)
@@ -565,28 +617,54 @@ pr_type(unsigned char t)
 
         return ttab[t];
 }
-#endif
+static int
+hexdump_if_verbose(const struct icmp *icp, int len)
+{
+        const unsigned char *p;
+        int i;
 
-#if !ENABLE_FEATURE_TRACEROUTE_VERBOSE
-#define packet4_ok(read_len, from, seq) \
-        packet4_ok(read_len, seq)
+        if (!verbose)
+                return 0;
+
+        printf("\n%d bytes from %s to %s: icmp type %u (%s) code %u\n",
+                len,
+                auto_string(xmalloc_sockaddr2dotted_noport(&G.from_lsa->u.sa)),
+                auto_string(xmalloc_sockaddr2dotted_noport(G.to)),
+                icp->icmp_type, pr_type(icp->icmp_type),
+                icp->icmp_code
+        );
+        p = (const void *)icp;
+        for (i = 0; i < len; i++) {
+                if (!(i & 0xf))
+                        printf("\n%04x:" + (i==0), i);
+                printf(" %02x", p[i]);
+        }
+        bb_putchar('\n');
+        return 0;
+}
+#else
+# define hexdump_if_verbose(...) 0
 #endif
+
 static int
-packet4_ok(int read_len, const struct sockaddr_in *from, int seq)
+packet4_ok(int read_len, int seq)
 {
         const struct icmp *icp;
         unsigned char type, code;
         int hlen;
         const struct ip *ip;
 
+        /* NB: reads from (AF_INET, SOCK_RAW, IPPROTO_ICMP) socket
+         * return the entire IP packet (IOW: they do not strip IP header).
+         * This differs from (AF_INET6, SOCK_RAW, IPPROTO_ICMPV6) sockets!?
+         */
         ip = (struct ip *) recv_pkt;
+
         hlen = ip->ip_hl << 2;
         if (read_len < hlen + ICMP_MINLEN) {
-#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
                 if (verbose)
                         printf("packet too short (%d bytes) from %s\n", read_len,
-                                inet_ntoa(from->sin_addr));
-#endif
+                                inet_ntoa(G.from_lsa->u.sin.sin_addr));
                 return 0;
         }
         read_len -= hlen;
@@ -598,9 +676,22 @@ packet4_ok(int read_len, const struct sockaddr_in *from, int seq)
         if (code == ICMP_UNREACH_NEEDFRAG)
                 pmtu = ntohs(icp->icmp_nextmtu);
 
+        if ((option_mask32 & OPT_USE_ICMP)
+         && type == ICMP_ECHOREPLY
+         && icp->icmp_seq == htons(seq)
+        ) {
+                if (icp->icmp_id != ident)
+                        /* reply to another ping/traceroute from this box? */
+                        return 0; /* ignore, silently */
+                /* In UDP mode, when we reach the machine, we (usually)
+                 * would get "port unreachable" - in ICMP we got "echo reply".
+                 * Simulate "port unreachable" for caller:
+                 */
+                return ICMP_UNREACH_PORT+1;
+        }
+
         if ((type == ICMP_TIMXCEED && code == ICMP_TIMXCEED_INTRANS)
          || type == ICMP_UNREACH
-         || type == ICMP_ECHOREPLY
         ) {
                 const struct ip *hip;
                 const struct udphdr *up;
@@ -610,18 +701,10 @@ packet4_ok(int read_len, const struct sockaddr_in *from, int seq)
                 if (option_mask32 & OPT_USE_ICMP) {
                         struct icmp *hicmp;
 
-                        /* XXX */
-                        if (type == ICMP_ECHOREPLY
-                         && icp->icmp_id == htons(ident)
-                         && icp->icmp_seq == htons(seq)
-                        ) {
-                                return ICMP_UNREACH_PORT+1;
-                        }
-
                         hicmp = (struct icmp *)((unsigned char *)hip + hlen);
                         if (hlen + SIZEOF_ICMP_HDR <= read_len
                          && hip->ip_p == IPPROTO_ICMP
-                         && hicmp->icmp_id == htons(ident)
+                         && hicmp->icmp_id == ident
                          && hicmp->icmp_seq == htons(seq)
                         ) {
                                 return (type == ICMP_TIMXCEED ? -1 : code + 1);
@@ -633,51 +716,54 @@ packet4_ok(int read_len, const struct sockaddr_in *from, int seq)
 // Off: since we do not form the entire IP packet,
 // but defer it to kernel, we can't set source port,
 // and thus can't check it here in the reply
-                        /* && up->source == htons(ident) */
-                         && up->dest == htons(port + seq)
+                        /* && up->uh_sport == ident */
+                         && up->uh_dport == htons(port + seq)
                         ) {
                                 return (type == ICMP_TIMXCEED ? -1 : code + 1);
                         }
                 }
         }
-#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
-        if (verbose) {
-                int i;
-                uint32_t *lp = (uint32_t *)&icp->icmp_ip;
-
-                printf("\n%d bytes from %s to "
-                       "%s: icmp type %d (%s) code %d\n",
-                        read_len, inet_ntoa(from->sin_addr),
-                        inet_ntoa(ip->ip_dst),
-                        type, pr_type(type), icp->icmp_code);
-                for (i = 4; i < read_len; i += sizeof(*lp))
-                        printf("%2d: x%8.8x\n", i, *lp++);
-        }
-#endif
-        return 0;
+        /* testcase: traceroute -vI 127.0.0.1 (sees its own echo requests) */
+        return hexdump_if_verbose(icp, read_len);
 }
 
 #if ENABLE_TRACEROUTE6
-# if !ENABLE_FEATURE_TRACEROUTE_VERBOSE
-#define packet_ok(read_len, from_lsa, to, seq) \
-        packet_ok(read_len, from_lsa, seq)
-# endif
+
 static int
-packet_ok(int read_len, len_and_sockaddr *from_lsa,
-                        struct sockaddr *to,
-                        int seq)
+packet6_ok(int read_len, int seq)
 {
         const struct icmp6_hdr *icp;
         unsigned char type, code;
 
-        if (from_lsa->u.sa.sa_family == AF_INET)
-                return packet4_ok(read_len, &from_lsa->u.sin, seq);
-
+        /* NB: reads from (AF_INET6, SOCK_RAW, IPPROTO_ICMPV6) socket
+         * return only ICMP packet (IOW: they strip IPv6 header).
+         * This differs from (AF_INET, SOCK_RAW, IPPROTO_ICMP) sockets!?
+         */
+        if (read_len < ICMP_MINLEN) {
+                if (verbose)
+                        printf("packet too short (%d bytes) from %s\n", read_len,
+                                auto_string(xmalloc_sockaddr2dotted_noport(&G.from_lsa->u.sa)));
+                return 0;
+        }
         icp = (struct icmp6_hdr *) recv_pkt;
 
         type = icp->icmp6_type;
         code = icp->icmp6_code;
 
+        if ((option_mask32 & OPT_USE_ICMP)
+         && type == ICMP6_ECHO_REPLY
+         && icp->icmp6_seq == htons(seq)
+        ) {
+                if (icp->icmp6_id != ident)
+                        /* reply to another ping/traceroute from this box? */
+                        return 0; /* ignore, silently */
+                /* In UDP mode, when we reach the machine, we (usually)
+                 * would get "port unreachable" - in ICMP we got "echo reply".
+                 * Simulate "port unreachable" for caller:
+                 */
+                return (ICMP6_DST_UNREACH_NOPORT << 8) + 1;
+        }
+
         if ((type == ICMP6_TIME_EXCEEDED && code == ICMP6_TIME_EXCEED_TRANSIT)
          || type == ICMP6_DST_UNREACH
         ) {
@@ -698,106 +784,75 @@ packet_ok(int read_len, len_and_sockaddr *from_lsa,
 
                         pkt = (struct outdata6_t *) (up + 1);
 
-                        if (ntohl(pkt->ident6) == ident
+                        if (pkt->ident6 == ident
                          && ntohl(pkt->seq6) == seq
                         ) {
                                 return (type == ICMP6_TIME_EXCEEDED ? -1 : (code<<8)+1);
                         }
                 }
         }
-
-# if ENABLE_FEATURE_TRACEROUTE_VERBOSE
-        if (verbose) {
-#  ifndef MAXHOSTNAMELEN
-#   define MAXHOSTNAMELEN 80
-#  endif
-                unsigned char *p;
-                char pa1[MAXHOSTNAMELEN];
-                char pa2[MAXHOSTNAMELEN];
-                int i;
-
-                p = (unsigned char *) (icp + 1);
-
-                printf("\n%d bytes from %s to "
-                       "%s: icmp type %d (%s) code %d\n",
-                        read_len,
-                        inet_ntop(AF_INET6, &from_lsa->u.sin6.sin6_addr, pa1, sizeof(pa1)),
-                        inet_ntop(AF_INET6, &((struct sockaddr_in6*)to)->sin6_addr, pa2, sizeof(pa2)),
-                        type, pr_type(type), icp->icmp6_code);
-
-                read_len -= sizeof(struct icmp6_hdr);
-                for (i = 0; i < read_len; i++) {
-                        if (i % 16 == 0)
-                                printf("%04x:", i);
-                        if (i % 4 == 0)
-                                bb_putchar(' ');
-                        printf("%02x", p[i]);
-                        if ((i % 16 == 15) && (i + 1 < read_len))
-                                bb_putchar('\n');
-                }
-                bb_putchar('\n');
-        }
-# endif
-
-        return 0;
+        /* cast is safe since the beginning of icmp4 and icmp6 layouts match */
+        return hexdump_if_verbose((const struct icmp *)icp, read_len);
 }
-#else /* !ENABLE_TRACEROUTE6 */
-static ALWAYS_INLINE int
-packet_ok(int read_len,
-                len_and_sockaddr *from_lsa IF_NOT_FEATURE_TRACEROUTE_VERBOSE(UNUSED_PARAM),
-                struct sockaddr *to UNUSED_PARAM,
-                int seq)
+
+static int
+packet_ok(int read_len, int seq)
 {
-        return packet4_ok(read_len, &from_lsa->u.sin, seq);
+        if (!G_ipv6)
+                return packet4_ok(read_len, seq);
+        return packet6_ok(read_len, seq);
 }
+
+#else /* !ENABLE_TRACEROUTE6 */
+
+# define packet_ok(read_len, seq) packet4_ok(read_len, seq)
+
 #endif
 
-/*
- * Construct an Internet address representation.
- * If the -n flag has been supplied, give
- * numeric value, otherwise try for symbolic name.
- */
 static void
-print_inetname(const struct sockaddr *from)
+#if !ENABLE_FEATURE_TRACEROUTE_VERBOSE
+print(void)
+# define print(len) print()
+#else
+print(int read_len)
+#endif
 {
-        char *ina = xmalloc_sockaddr2dotted_noport(from);
+        char *ina = auto_string(xmalloc_sockaddr2dotted_noport(&G.from_lsa->u.sa));
 
         if (option_mask32 & OPT_ADDR_NUM) {
                 printf("  %s", ina);
         } else {
                 char *n = NULL;
-
-                if (from->sa_family != AF_INET
-                 || ((struct sockaddr_in*)from)->sin_addr.s_addr != INADDR_ANY
+                if (G_ipv6
+                 || G.from_lsa->u.sin.sin_addr.s_addr != INADDR_ANY
                 ) {
-                        /* Try to reverse resolve if it is not 0.0.0.0 */
-                        n = xmalloc_sockaddr2host_noport((struct sockaddr*)from);
+                        /* Reverse resolve if IPV6 or not 0.0.0.0 */
+                        n = auto_string(xmalloc_sockaddr2host_noport(&G.from_lsa->u.sa));
                 }
                 printf("  %s (%s)", (n ? n : ina), ina);
-                free(n);
         }
-        free(ina);
-}
-
-static void
-print(int read_len, const struct sockaddr *from, const struct sockaddr *to)
-{
-        print_inetname(from);
 
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
         if (verbose) {
-                char *ina = xmalloc_sockaddr2dotted_noport(to);
-#if ENABLE_TRACEROUTE6
-                if (to->sa_family == AF_INET6) {
-                        read_len -= sizeof(struct ip6_hdr);
+# if ENABLE_TRACEROUTE6
+                /* NB: reads from (AF_INET, SOCK_RAW, IPPROTO_ICMP) socket
+                 * return the entire IP packet (IOW: they do not strip IP header).
+                 * Reads from (AF_INET6, SOCK_RAW, IPPROTO_ICMPV6) do strip IPv6
+                 * header and return only ICMP6 packet. Weird.
+                 */
+                if (G_ipv6) {
+                        /* read_len -= sizeof(struct ip6_hdr); - WRONG! */
                 } else
-#endif
+# endif
                 {
                         struct ip *ip4packet = (struct ip*)recv_pkt;
                         read_len -= ip4packet->ip_hl << 2;
                 }
-                printf(" %d bytes to %s", read_len, ina);
-                free(ina);
+                printf(" %d bytes to %s", read_len,
+                        auto_string(xmalloc_sockaddr2dotted_noport(G.to))
+                );
         }
+#endif
 }
 
 static void
@@ -807,22 +862,12 @@ print_delta_ms(unsigned t1p, unsigned t2p)
         printf("  %u.%03u ms", tt / 1000, tt % 1000);
 }
 
-/*
- * Usage: [-dFIlnrvx] [-g gateway] [-i iface] [-f first_ttl]
- * [-m max_ttl] [ -p port] [-q nqueries] [-s src_addr] [-t tos]
- * [-w waittime] [-z pausemsecs] host [packetlen]"
+/* Keeping init code in a separate (not inlined!) function
+ * for stack use reduction and better register allocation in main loop.
  */
-static int
-common_traceroute_main(int op, char **argv)
+static NOINLINE void
+traceroute_init(int op, char **argv)
 {
-        int minpacket;
-#ifdef IP_TOS
-        int tos = 0;
-#endif
-        int max_ttl = 30;
-        int nprobes = 3;
-        int first_ttl = 1;
-        unsigned pausemsecs = 0;
         char *source;
         char *device;
         char *tos_str;
@@ -838,13 +883,16 @@ common_traceroute_main(int op, char **argv)
 #else
         enum { af = AF_INET };
 #endif
-        int ttl;
-        int seq;
-        len_and_sockaddr *from_lsa;
-        struct sockaddr *lastaddr;
-        struct sockaddr *to;
+
+        /* Ensure the socket fds won't be 0, 1 or 2 */
+        bb_sanitize_stdio();
 
         INIT_G();
+        port = 33434;
+        waittime = 5;
+        G.first_ttl = 1;
+        G.nprobes = 3;
+        G.max_ttl = 30;
 
         op |= getopt32(argv, "^"
                 OPT_STRING
@@ -854,43 +902,29 @@ common_traceroute_main(int op, char **argv)
         );
         argv += optind;
 
-#if 0 /* IGNORED */
-        if (op & OPT_IP_CHKSUM)
-                bb_error_msg("warning: ip checksums disabled");
-#endif
-#ifdef IP_TOS
-        if (op & OPT_TOS)
-                tos = xatou_range(tos_str, 0, 255);
-#endif
         if (op & OPT_MAX_TTL)
-                max_ttl = xatou_range(max_ttl_str, 1, 255);
+                G.max_ttl = xatou_range(max_ttl_str, 1, 255);
         if (op & OPT_PORT)
                 port = xatou16(port_str);
         if (op & OPT_NPROBES)
-                nprobes = xatou_range(nprobes_str, 1, INT_MAX);
-        if (op & OPT_SOURCE) {
-                /*
-                 * set the ip source address of the outbound
-                 * probe (e.g., on a multi-homed host).
-                 */
-                if (getuid() != 0)
-                        bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
-        }
+                G.nprobes = xatou_range(nprobes_str, 1, INT_MAX);
         if (op & OPT_WAITTIME)
                 waittime = xatou_range(waittime_str, 1, 24 * 60 * 60);
         if (op & OPT_PAUSE_MS)
-                pausemsecs = xatou_range(pausemsecs_str, 0, 60 * 60 * 1000);
+                G.pausemsecs = xatou_range(pausemsecs_str, 0, 60 * 60 * 1000);
         if (op & OPT_FIRST_TTL)
-                first_ttl = xatou_range(first_ttl_str, 1, max_ttl);
+                G.first_ttl = xatou_range(first_ttl_str, 1, G.max_ttl);
 
         /* Process destination and optional packet size */
-        minpacket = sizeof(struct ip)
-                        + SIZEOF_ICMP_HDR
-                        + sizeof(struct outdata_t);
-        if (!(op & OPT_USE_ICMP))
-                minpacket = sizeof(struct ip)
+        packlen = sizeof(struct ip)
                         + sizeof(struct udphdr)
                         + sizeof(struct outdata_t);
+        if (op & OPT_USE_ICMP) {
+                packlen = sizeof(struct ip)
+                        + SIZEOF_ICMP_HDR
+                        + sizeof(struct outdata_t);
+                port = 0; /* on ICMP6 sockets, sendto(ipv6.nonzero_port) throws EINVAL! */
+        }
 #if ENABLE_TRACEROUTE6
         af = AF_UNSPEC;
         if (op & OPT_IPV4)
@@ -899,49 +933,73 @@ common_traceroute_main(int op, char **argv)
                 af = AF_INET6;
         dest_lsa = xhost_and_af2sockaddr(argv[0], port, af);
         af = dest_lsa->u.sa.sa_family;
-        if (af == AF_INET6)
-                minpacket = sizeof(struct ip6_hdr)
-                        + sizeof(struct udphdr)
-                        + sizeof(struct outdata6_t);
+//TODO: make sure af == AF_INET[6]? (FEATURE_UNIX_LOCAL=y allows "local:/PATH" to be translated to AF_UNIX)
+        if (af == AF_INET6) {
+                G_ipv6 = 1;
+                packlen = sizeof(struct ip6_hdr)
+                                + sizeof(struct udphdr)
+                                + sizeof(struct outdata6_t);
+                if (op & OPT_USE_ICMP)
+                        packlen = sizeof(struct ip6_hdr)
+                                + SIZEOF_ICMP_HDR
+                                + sizeof(struct outdata6_t);
+        }
 #else
-        dest_lsa = xhost2sockaddr(argv[0], port);
+        /* accept only IPv4 addresses */
+        dest_lsa = xhost_and_af2sockaddr(argv[0], port, AF_INET);
+#endif
+        G.from_lsa = xmemdup(dest_lsa, LSA_LEN_SIZE + dest_lsa->len);
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
+        G.to = xzalloc(dest_lsa->len);
 #endif
-        packlen = minpacket;
         if (argv[1])
-                packlen = xatoul_range(argv[1], minpacket, 32 * 1024);
-
-        /* Ensure the socket fds won't be 0, 1 or 2 */
-        bb_sanitize_stdio();
+                packlen = xatoul_range(argv[1], packlen, 32 * 1024);
 
+        if (af == AF_INET) {
+                xmove_fd(xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP), rcvsock);
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
+                /* want recvmsg to report target local address (for -v) */
+                setsockopt_1(rcvsock, IPPROTO_IP, IP_PKTINFO);
+#endif
+        }
 #if ENABLE_TRACEROUTE6
-        if (af == AF_INET6) {
+        else {
                 xmove_fd(xsocket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6), rcvsock);
+# if ENABLE_FEATURE_TRACEROUTE_VERBOSE
+                /* want recvmsg to report target local address (for -v) */
                 setsockopt_1(rcvsock, SOL_IPV6, IPV6_RECVPKTINFO);
-        } else
-#endif
-        {
-                xmove_fd(xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP), rcvsock);
+# endif
         }
-
+#endif
 #if TRACEROUTE_SO_DEBUG
         if (op & OPT_DEBUG)
                 setsockopt_SOL_SOCKET_1(rcvsock, SO_DEBUG);
 #endif
-        if (op & OPT_BYPASS_ROUTE)
-                setsockopt_SOL_SOCKET_1(rcvsock, SO_DONTROUTE);
 
+        {
+                int snd;
+                if (af == AF_INET) {
+                        if (op & OPT_USE_ICMP)
+                                snd = xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+                        else
+                                snd = xsocket(AF_INET, SOCK_DGRAM, 0);
+                }
 #if ENABLE_TRACEROUTE6
-        if (af == AF_INET6) {
-                if (setsockopt_int(rcvsock, SOL_RAW, IPV6_CHECKSUM, 2) != 0)
-                        bb_perror_msg_and_die("setsockopt(%s)", "IPV6_CHECKSUM");
-                xmove_fd(xsocket(af, SOCK_DGRAM, 0), sndsock);
-        } else
+# if defined(__FreeBSD__)
+#  define SOL_V6_OPTION SOL_IPV6
+# else
+#  define SOL_V6_OPTION SOL_RAW
+# endif
+                else {
+                        if (setsockopt_int(rcvsock, SOL_V6_OPTION, IPV6_CHECKSUM, 2) != 0)
+                                bb_perror_msg_and_die("setsockopt(%s)", "IPV6_CHECKSUM");
+                        if (op & OPT_USE_ICMP)
+                                snd = xsocket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+                        else
+                                snd = xsocket(AF_INET6, SOCK_DGRAM, 0);
+                }
 #endif
-        {
-                if (op & OPT_USE_ICMP)
-                        xmove_fd(xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP), sndsock);
-                else
-                        xmove_fd(xsocket(AF_INET, SOCK_DGRAM, 0), sndsock);
+                xmove_fd(snd, sndsock);
         }
 
 #ifdef SO_SNDBUF
@@ -950,8 +1008,10 @@ common_traceroute_main(int op, char **argv)
         }
 #endif
 #ifdef IP_TOS
-        if ((op & OPT_TOS) && setsockopt_int(sndsock, IPPROTO_IP, IP_TOS, tos) != 0) {
-                bb_perror_msg_and_die("setsockopt(%s) %d", "TOS", tos);
+        if (op & OPT_TOS) {
+                int tos = xatou_range(tos_str, 0, 255);
+                if (setsockopt_int(sndsock, IPPROTO_IP, IP_TOS, tos) != 0)
+                        bb_perror_msg_and_die("setsockopt(%s,%d)", "TOS", tos);
         }
 #endif
 #ifdef IP_DONTFRAG
@@ -968,23 +1028,30 @@ common_traceroute_main(int op, char **argv)
         outip = xzalloc(packlen);
 
         ident = getpid();
-
-        if (!ENABLE_TRACEROUTE6 || af == AF_INET) {
+        /* we can use native-endian ident, but other Unix ping/traceroute
+         * utils use *big-endian pid*, and e.g. ping on our machine may be
+         * *not* from busybox, idents may collide. Follow the convention:
+         */
+        ident = htons(ident);
+
+        outdata = (void*)(outudp + 1);
+        if (af == AF_INET) {
                 if (op & OPT_USE_ICMP) {
-                        ident |= 0x8000;
                         outicmp->icmp_type = ICMP_ECHO;
-                        outicmp->icmp_id = htons(ident);
-                        outdata = (struct outdata_t *)((char *)outicmp + SIZEOF_ICMP_HDR);
-                } else {
-                        outdata = (struct outdata_t *)(outudp + 1);
+                        /*outicmp->icmp_code = 0; - set by xzalloc */
+                        outicmp->icmp_id = ident;
+                        outdata = (void*)((char *)outicmp + SIZEOF_ICMP_HDR);
                 }
         }
 #if ENABLE_TRACEROUTE6
-        if (af == AF_INET6) {
-                outdata = (void*)((char*)outip
-                                + sizeof(struct ip6_hdr)
-                                + sizeof(struct udphdr)
-                                );
+        else {
+                outdata = (void*)(outudp6 + 1);
+                if (op & OPT_USE_ICMP) {
+                        outicmp6->icmp_type = ICMP6_ECHO_REQUEST;
+                        /*outicmp->icmp_code = 0; - set by xzalloc */
+                        outicmp6->icmp_id = ident;
+                        outdata = (void*)((char *)outicmp6 + SIZEOF_ICMP_HDR);
+                }
         }
 #endif
 
@@ -998,6 +1065,8 @@ common_traceroute_main(int op, char **argv)
 #else
                 len_and_sockaddr *source_lsa = xdotted2sockaddr(source, 0);
 #endif
+                if (getuid() != 0)
+                        bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
                 /* Ping4 does this (why?) */
                 if (af == AF_INET)
                         if (setsockopt(sndsock, IPPROTO_IP, IP_MULTICAST_IF,
@@ -1006,36 +1075,24 @@ common_traceroute_main(int op, char **argv)
 //TODO: we can query source port we bound to,
 // and check it in replies... if we care enough
                 xbind(sndsock, &source_lsa->u.sa, source_lsa->len);
-                free(source_lsa);
-        }
-#if ENABLE_TRACEROUTE6
-        else if (af == AF_INET6) {
-//TODO: why we don't do it for IPv4?
+                if (ENABLE_FEATURE_CLEAN_UP)
+                        free(source_lsa);
+        } else {
                 len_and_sockaddr *source_lsa;
 
-                int probe_fd = xsocket(af, SOCK_DGRAM, 0);
-                if (op & OPT_DEVICE)
-                        setsockopt_bindtodevice(probe_fd, device);
-                set_nport(&dest_lsa->u.sa, htons(1025));
-                /* dummy connect. makes kernel pick source IP (and port) */
-                xconnect(probe_fd, &dest_lsa->u.sa, dest_lsa->len);
                 set_nport(&dest_lsa->u.sa, htons(port));
-
-                /* read IP and port */
-                source_lsa = get_sock_lsa(probe_fd);
+                /* Connect makes kernel pick source IP (and port if UDP) */
+                xconnect(sndsock, &dest_lsa->u.sa, dest_lsa->len);
+                /* Read IP and port */
+                source_lsa = get_sock_lsa(sndsock);
                 if (source_lsa == NULL)
-                        bb_simple_error_msg_and_die("can't get probe addr");
-
-                close(probe_fd);
-
-                /* bind our sockets to this IP (but not port) */
-                set_nport(&source_lsa->u.sa, 0);
-                xbind(sndsock, &source_lsa->u.sa, source_lsa->len);
+                        bb_simple_perror_msg_and_die("getsockname");
+                /* bind our recv ICMP socket to this IP (but not port, ICMP has no ports) */
+                //set_nport(&source_lsa->u.sa, 0); - paranoia, seems to work without this for both ipv4 and ipv6
                 xbind(rcvsock, &source_lsa->u.sa, source_lsa->len);
-
-                free(source_lsa);
+                if (ENABLE_FEATURE_CLEAN_UP)
+                        free(source_lsa);
         }
-#endif
 
         /* Revert to non-privileged user after opening sockets */
         xsetgid(getgid());
@@ -1043,169 +1100,177 @@ common_traceroute_main(int op, char **argv)
 
         dest_str = xmalloc_sockaddr2dotted_noport(&dest_lsa->u.sa);
         printf("traceroute to %s (%s)", argv[0], dest_str);
-        if (ENABLE_FEATURE_CLEAN_UP) {
+        if (ENABLE_FEATURE_CLEAN_UP)
                 free(dest_str);
-        }
 
         if (op & OPT_SOURCE)
                 printf(" from %s", source);
-        printf(", %d hops max, %d byte packets\n", max_ttl, packlen);
+        printf(", %d hops max, %d byte packets\n", G.max_ttl, packlen);
+}
+
+static int
+common_traceroute_main(int op, char **argv)
+{
+        int ttl;
+        int seq;
+        struct sockaddr *lastaddr;
+
+        traceroute_init(op, argv);
 
-        from_lsa = xmemdup(dest_lsa, LSA_LEN_SIZE + dest_lsa->len);
         lastaddr = xzalloc(dest_lsa->len);
-        to = xzalloc(dest_lsa->len);
         seq = 0;
-        for (ttl = first_ttl; ttl <= max_ttl; ++ttl) {
+        for (ttl = G.first_ttl; ttl <= G.max_ttl; ++ttl) {
                 int probe;
                 int unreachable = 0; /* counter */
-                int gotlastaddr = 0; /* flags */
                 int got_there = 0;
 
                 printf("%2d", ttl);
-                for (probe = 0; probe < nprobes; ++probe) {
-                        int read_len;
+                for (probe = 0; probe < G.nprobes; ++probe) {
                         unsigned t1;
                         unsigned t2;
                         int left_ms;
-                        struct ip *ip;
+                        int read_len;
+                        int icmp_code;
 
                         fflush_all();
-                        if (probe != 0 && pausemsecs > 0)
-                                usleep(pausemsecs * 1000);
+                        if (probe != 0)
+                                msleep(G.pausemsecs);
 
                         send_probe(++seq, ttl);
-                        t2 = t1 = monotonic_us();
 
+                        t2 = t1 = monotonic_us();
                         left_ms = waittime * 1000;
-                        while ((read_len = wait_for_reply(from_lsa, to, &t2, &left_ms)) != 0) {
-                                int icmp_code;
-
-                                /* Recv'ed a packet, or read error */
-                                /* t2 = monotonic_us() - set by wait_for_reply */
-
-                                if (read_len < 0)
-                                        continue;
-                                icmp_code = packet_ok(read_len, from_lsa, to, seq);
-                                /* Skip short packet */
-                                if (icmp_code == 0)
-                                        continue;
-
-                                if (!gotlastaddr
-                                 || (memcmp(lastaddr, &from_lsa->u.sa, from_lsa->len) != 0)
-                                ) {
-                                        print(read_len, &from_lsa->u.sa, to);
-                                        memcpy(lastaddr, &from_lsa->u.sa, from_lsa->len);
-                                        gotlastaddr = 1;
+                        for (;;) {
+                                /* NB: wait_for_reply() fills "G.from_lsa" and "G.to" with
+                                 * "where it came from" and "what local address it arrived to"
+                                 * addresses. Sets t2 = monotonic_us(), updates left_ms.
+                                 */
+                                read_len = wait_for_reply(&t2, &left_ms);
+
+                                if (read_len == 0) { /* there was no packet at all? */
+                                        printf("  *");
+                                        goto next_probe;
                                 }
+                                icmp_code = packet_ok(read_len, seq);
+                                if (icmp_code != 0)
+                                        break; /* got a good response */
+                                /* unrecognized type/code or too short, back to recv */
+                        }
 
-                                print_delta_ms(t1, t2);
-                                ip = (struct ip *)recv_pkt;
+                        if (probe == 0
+                         || (memcmp(lastaddr, &G.from_lsa->u.sa, G.from_lsa->len) != 0)
+                        ) {
+                                print(read_len);
+                                memcpy(lastaddr, &G.from_lsa->u.sa, G.from_lsa->len);
+                        }
+                        print_delta_ms(t1, t2);
+                        if (!G_ipv6) {
+                                if (op & OPT_TTL_FLAG) {
+                                        struct ip *ip = (struct ip *)recv_pkt;
+                                        printf(" (%d)", ip->ip_ttl);
+                                }
+                        }
 
-                                if (from_lsa->u.sa.sa_family == AF_INET)
-                                        if (op & OPT_TTL_FLAG)
-                                                printf(" (%d)", ip->ip_ttl);
+                        /* Got a "time exceeded in transit" icmp message? */
+                        if (icmp_code == -1)
+                                continue;
 
-                                /* time exceeded in transit */
-                                if (icmp_code == -1)
-                                        break;
-                                icmp_code--;
-                                switch (icmp_code) {
+                        icmp_code--;
+                        switch (icmp_code) {
 #if ENABLE_TRACEROUTE6
-                                case ICMP6_DST_UNREACH_NOPORT << 8:
-                                        got_there = 1;
-                                        break;
+                        case ICMP6_DST_UNREACH_NOPORT << 8:
+                                got_there = 1;
+                                break;
 #endif
-                                case ICMP_UNREACH_PORT:
-                                        if (ip->ip_ttl <= 1)
-                                                printf(" !");
-                                        got_there = 1;
-                                        break;
-
-                                case ICMP_UNREACH_NET:
+                        case ICMP_UNREACH_PORT: {
+                                struct ip *ip = (struct ip *)recv_pkt;
+                                if (ip->ip_ttl <= 1)
+                                        printf(" !");
+                                got_there = 1;
+                                break;
+                        }
+                        case ICMP_UNREACH_NET:
 #if ENABLE_TRACEROUTE6 && (ICMP6_DST_UNREACH_NOROUTE != ICMP_UNREACH_NET)
-                                case ICMP6_DST_UNREACH_NOROUTE << 8:
+                        case ICMP6_DST_UNREACH_NOROUTE << 8:
 #endif
-                                        printf(" !N");
-                                        ++unreachable;
-                                        break;
-                                case ICMP_UNREACH_HOST:
+                                printf(" !N");
+                                ++unreachable;
+                                break;
+                        case ICMP_UNREACH_HOST:
 #if ENABLE_TRACEROUTE6
-                                case ICMP6_DST_UNREACH_ADDR << 8:
+                        case ICMP6_DST_UNREACH_ADDR << 8:
 #endif
-                                        printf(" !H");
-                                        ++unreachable;
-                                        break;
-                                case ICMP_UNREACH_PROTOCOL:
-                                        printf(" !P");
-                                        got_there = 1;
-                                        break;
-                                case ICMP_UNREACH_NEEDFRAG:
-                                        printf(" !F-%d", pmtu);
-                                        ++unreachable;
-                                        break;
-                                case ICMP_UNREACH_SRCFAIL:
+                                printf(" !H");
+                                ++unreachable;
+                                break;
+                        case ICMP_UNREACH_PROTOCOL:
+                                printf(" !P");
+                                got_there = 1;
+                                break;
+                        case ICMP_UNREACH_NEEDFRAG:
+                                printf(" !F-%d", pmtu);
+                                ++unreachable;
+                                break;
+                        case ICMP_UNREACH_SRCFAIL:
 #if ENABLE_TRACEROUTE6
-                                case ICMP6_DST_UNREACH_ADMIN << 8:
+                        case ICMP6_DST_UNREACH_ADMIN << 8:
 #endif
-                                        printf(" !S");
-                                        ++unreachable;
-                                        break;
-                                case ICMP_UNREACH_FILTER_PROHIB:
-                                case ICMP_UNREACH_NET_PROHIB:   /* misuse */
-                                        printf(" !A");
-                                        ++unreachable;
-                                        break;
-                                case ICMP_UNREACH_HOST_PROHIB:
-                                        printf(" !C");
-                                        ++unreachable;
-                                        break;
-                                case ICMP_UNREACH_HOST_PRECEDENCE:
-                                        printf(" !V");
-                                        ++unreachable;
-                                        break;
-                                case ICMP_UNREACH_PRECEDENCE_CUTOFF:
-                                        printf(" !C");
-                                        ++unreachable;
-                                        break;
-                                case ICMP_UNREACH_NET_UNKNOWN:
-                                case ICMP_UNREACH_HOST_UNKNOWN:
-                                        printf(" !U");
-                                        ++unreachable;
-                                        break;
-                                case ICMP_UNREACH_ISOLATED:
-                                        printf(" !I");
-                                        ++unreachable;
-                                        break;
-                                case ICMP_UNREACH_TOSNET:
-                                case ICMP_UNREACH_TOSHOST:
-                                        printf(" !T");
-                                        ++unreachable;
-                                        break;
-                                default:
-                                        printf(" !<%d>", icmp_code);
-                                        ++unreachable;
-                                        break;
-                                }
+                                printf(" !S");
+                                ++unreachable;
                                 break;
-                        } /* while (wait and read a packet) */
-
-                        /* there was no packet at all? */
-                        if (read_len == 0)
-                                printf("  *");
+                        case ICMP_UNREACH_FILTER_PROHIB:
+                        case ICMP_UNREACH_NET_PROHIB:   /* misuse */
+                                printf(" !A");
+                                ++unreachable;
+                                break;
+                        case ICMP_UNREACH_HOST_PROHIB:
+                                printf(" !C");
+                                ++unreachable;
+                                break;
+                        case ICMP_UNREACH_HOST_PRECEDENCE:
+                                printf(" !V");
+                                ++unreachable;
+                                break;
+                        case ICMP_UNREACH_PRECEDENCE_CUTOFF:
+                                printf(" !C");
+                                ++unreachable;
+                                break;
+                        case ICMP_UNREACH_NET_UNKNOWN:
+                        case ICMP_UNREACH_HOST_UNKNOWN:
+                                printf(" !U");
+                                ++unreachable;
+                                break;
+                        case ICMP_UNREACH_ISOLATED:
+                                printf(" !I");
+                                ++unreachable;
+                                break;
+                        case ICMP_UNREACH_TOSNET:
+                        case ICMP_UNREACH_TOSHOST:
+                                printf(" !T");
+                                ++unreachable;
+                                break;
+                        default:
+                                printf(" !<%d>", icmp_code);
+                                ++unreachable;
+                                break;
+                        }
+ next_probe: ;
                 } /* for (nprobes) */
 
                 bb_putchar('\n');
                 if (got_there
-                 || (unreachable > 0 && unreachable >= nprobes - 1)
+                 || (unreachable > 0 && unreachable >= G.nprobes - 1)
                 ) {
                         break;
                 }
         }
 
         if (ENABLE_FEATURE_CLEAN_UP) {
-                free(to);
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
+                free(G.to);
+#endif
                 free(lastaddr);
-                free(from_lsa);
+                free(G.from_lsa);
         }
 
         return 0;
diff --git a/networking/tunctl.c b/networking/tunctl.c
index 0f010e196..97e6917aa 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -28,16 +28,16 @@
 //kbuild:lib-$(CONFIG_TUNCTL) += tunctl.o
 
 //usage:#define tunctl_trivial_usage
-//usage:       "[-f device] ([-t name] | -d name)" IF_FEATURE_TUNCTL_UG(" [-u owner] [-g group] [-b]")
+//usage:       "[-f DEVICE] [-t NAME | -d NAME]" IF_FEATURE_TUNCTL_UG(" [-u USER] [-g GRP] [-b]")
 //usage:#define tunctl_full_usage "\n\n"
-//usage:       "Create or delete tun interfaces\n"
-//usage:     "\n        -f name         tun device (/dev/net/tun)"
-//usage:     "\n        -t name         Create iface 'name'"
-//usage:     "\n        -d name         Delete iface 'name'"
+//usage:       "Create or delete TUN/TAP interfaces\n"
+//usage:     "\n        -f DEV  TUN device (default /dev/net/tun)"
+//usage:     "\n        -t NAME Create iface (default: tapN)"
+//usage:     "\n        -d NAME Delete iface"
 //usage:        IF_FEATURE_TUNCTL_UG(
-//usage:     "\n        -u owner        Set iface owner"
-//usage:     "\n        -g group        Set iface group"
-//usage:     "\n        -b              Brief output"
+//usage:     "\n        -u USER Set iface owner"
+//usage:     "\n        -g GRP  Set iface group"
+//usage:     "\n        -b      Brief output"
 //usage:        )
 //usage:
 //usage:#define tunctl_example_usage
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 7d04bb246..8c8c11c26 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -104,6 +104,14 @@ INSERT
 comment "Common options for DHCP applets"
         depends on UDHCPD || UDHCPC || UDHCPC6 || DHCPRELAY
 
+config UDHCPC_DEFAULT_INTERFACE
+        string "Default interface name"
+        default "eth0"
+        depends on UDHCPC || UDHCPC6
+        help
+        The interface that will be used if no other interface is
+        specified on the commandline.
+
 config FEATURE_UDHCP_PORT
         bool "Enable '-P port' option for udhcpd and udhcpc"
         default n
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 3cbd2d3c8..cc0abd269 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -343,7 +343,8 @@ int udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
 
 int udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
                 uint32_t source_nip, int source_port,
-                uint32_t dest_nip, int dest_port) FAST_FUNC;
+                uint32_t dest_nip, int dest_port,
+                const char *ifname) FAST_FUNC;
 
 void udhcp_sp_setup(void) FAST_FUNC;
 void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC;
diff --git a/networking/udhcp/d6_common.h b/networking/udhcp/d6_common.h
index 688f5d6c7..9dfde7709 100644
--- a/networking/udhcp/d6_common.h
+++ b/networking/udhcp/d6_common.h
@@ -159,18 +159,16 @@ int FAST_FUNC d6_recv_kernel_packet(
                 struct d6_packet *packet, int fd
 );
 
-int FAST_FUNC d6_send_raw_packet(
+int FAST_FUNC d6_send_raw_packet_from_client_data_ifindex(
                 struct d6_packet *d6_pkt, unsigned d6_pkt_size,
                 struct in6_addr *src_ipv6, int source_port,
-                struct in6_addr *dst_ipv6, int dest_port, const uint8_t *dest_arp,
-                int ifindex
+                struct in6_addr *dst_ipv6, int dest_port, const uint8_t *dest_arp
 );
 
-int FAST_FUNC d6_send_kernel_packet(
+int FAST_FUNC d6_send_kernel_packet_from_client_data_ifindex(
                 struct d6_packet *d6_pkt, unsigned d6_pkt_size,
                 struct in6_addr *src_ipv6, int source_port,
-                struct in6_addr *dst_ipv6, int dest_port,
-                int ifindex
+                struct in6_addr *dst_ipv6, int dest_port
 );
 
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index ac8af91d3..fbdaa99bd 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -558,11 +558,10 @@ static int d6_mcast_from_client_data_ifindex(struct d6_packet *packet, uint8_t *
                 0x33, 0x33, 0x00, 0x01, 0x00, 0x02,
         };
 
-        return d6_send_raw_packet(
+        return d6_send_raw_packet_from_client_data_ifindex(
                 packet, (end - (uint8_t*) packet),
                 /*src*/ &client6_data.ll_ip6, CLIENT_PORT6,
-                /*dst*/ (struct in6_addr*)FF02__1_2, SERVER_PORT6, MAC_DHCP6MCAST_ADDR,
-                client_data.ifindex
+                /*dst*/ (struct in6_addr*)FF02__1_2, SERVER_PORT6, MAC_DHCP6MCAST_ADDR
         );
 }
 
@@ -864,11 +863,10 @@ static NOINLINE int send_d6_renew(uint32_t xid, struct in6_addr *server_ipv6, st
 
         bb_info_msg("sending %s", "renew");
         if (server_ipv6)
-                return d6_send_kernel_packet(
+                return d6_send_kernel_packet_from_client_data_ifindex(
                         &packet, (opt_ptr - (uint8_t*) &packet),
                         our_cur_ipv6, CLIENT_PORT6,
-                        server_ipv6, SERVER_PORT6,
-                        client_data.ifindex
+                        server_ipv6, SERVER_PORT6
                 );
         return d6_mcast_from_client_data_ifindex(&packet, opt_ptr);
 }
@@ -893,11 +891,10 @@ int send_d6_release(struct in6_addr *server_ipv6, struct in6_addr *our_cur_ipv6)
                 opt_ptr = mempcpy(opt_ptr, client6_data.ia_pd, client6_data.ia_pd->len + 2+2);
 
         bb_info_msg("sending %s", "release");
-        return d6_send_kernel_packet(
+        return d6_send_kernel_packet_from_client_data_ifindex(
                 &packet, (opt_ptr - (uint8_t*) &packet),
                 our_cur_ipv6, CLIENT_PORT6,
-                server_ipv6, SERVER_PORT6,
-                client_data.ifindex
+                server_ipv6, SERVER_PORT6
         );
 }
 
@@ -1164,9 +1161,9 @@ static void client_background(void)
 //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 N]")
+//usage:       "        [-x OPT:VAL]... [-O OPT]..." IF_FEATURE_UDHCP_PORT(" [-P PORT]")
 //usage:#define udhcpc6_full_usage "\n"
-//usage:     "\n        -i IFACE        Interface to use (default eth0)"
+//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"
@@ -1182,7 +1179,7 @@ static void client_background(void)
 //usage:     "\n        -R              Release IP on exit"
 //usage:     "\n        -S              Log to syslog too"
 //usage:        IF_FEATURE_UDHCP_PORT(
-//usage:     "\n        -P N            Use port N (default 546)"
+//usage:     "\n        -P PORT         Use PORT (default 546)"
 //usage:        )
 ////usage:      IF_FEATURE_UDHCPC_ARPING(
 ////usage:     "\n      -a              Use arping to validate offered address"
@@ -1234,7 +1231,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         /* Default options */
         IF_FEATURE_UDHCP_PORT(SERVER_PORT6 = 547;)
         IF_FEATURE_UDHCP_PORT(CLIENT_PORT6 = 546;)
-        client_data.interface = "eth0";
+        client_data.interface = CONFIG_UDHCPC_DEFAULT_INTERFACE;
         client_data.script = CONFIG_UDHCPC_DEFAULT_SCRIPT;
         client_data.sockfd = -1;
 
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c
index 167a813e3..172f8e1ab 100644
--- a/networking/udhcp/d6_packet.c
+++ b/networking/udhcp/d6_packet.c
@@ -6,6 +6,7 @@
  */
 #include "common.h"
 #include "d6_common.h"
+#include "dhcpc.h"
 #include "dhcpd.h"
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
@@ -50,11 +51,10 @@ int FAST_FUNC d6_recv_kernel_packet(struct in6_addr *peer_ipv6
 }
 
 /* Construct a ipv6+udp header for a packet, send packet */
-int FAST_FUNC d6_send_raw_packet(
+int FAST_FUNC d6_send_raw_packet_from_client_data_ifindex(
                 struct d6_packet *d6_pkt, unsigned d6_pkt_size,
                 struct in6_addr *src_ipv6, int source_port,
-                struct in6_addr *dst_ipv6, int dest_port, const uint8_t *dest_arp,
-                int ifindex)
+                struct in6_addr *dst_ipv6, int dest_port, const uint8_t *dest_arp)
 {
         struct sockaddr_ll dest_sll;
         struct ip6_udp_d6_packet packet;
@@ -74,7 +74,7 @@ int FAST_FUNC d6_send_raw_packet(
 
         dest_sll.sll_family = AF_PACKET;
         dest_sll.sll_protocol = htons(ETH_P_IPV6);
-        dest_sll.sll_ifindex = ifindex;
+        dest_sll.sll_ifindex = client_data.ifindex;
         /*dest_sll.sll_hatype = ARPHRD_???;*/
         /*dest_sll.sll_pkttype = PACKET_???;*/
         dest_sll.sll_halen = 6;
@@ -103,8 +103,8 @@ int FAST_FUNC d6_send_raw_packet(
          */
         packet.ip6.ip6_hlim = IPPROTO_UDP;
         packet.udp.check = inet_cksum(
-                                (uint8_t *)&packet + 4,
-                                offsetof(struct ip6_udp_d6_packet, data) - 4 + d6_pkt_size
+                        (uint8_t *)&packet + 4,
+                        offsetof(struct ip6_udp_d6_packet, data) - 4 + d6_pkt_size
         );
         /* fix 'hop limit' and 'next header' after UDP checksumming */
         packet.ip6.ip6_hlim = 1; /* observed Windows machines to use hlim=1 */
@@ -126,11 +126,10 @@ int FAST_FUNC d6_send_raw_packet(
 }
 
 /* Let the kernel do all the work for packet generation */
-int FAST_FUNC d6_send_kernel_packet(
+int FAST_FUNC d6_send_kernel_packet_from_client_data_ifindex(
                 struct d6_packet *d6_pkt, unsigned d6_pkt_size,
                 struct in6_addr *src_ipv6, int source_port,
-                struct in6_addr *dst_ipv6, int dest_port,
-                int ifindex)
+                struct in6_addr *dst_ipv6, int dest_port)
 {
         struct sockaddr_in6 sa;
         int fd;
@@ -157,7 +156,7 @@ int FAST_FUNC d6_send_kernel_packet(
         sa.sin6_family = AF_INET6;
         sa.sin6_port = htons(dest_port);
         sa.sin6_addr = *dst_ipv6; /* struct copy */
-        sa.sin6_scope_id = ifindex;
+        sa.sin6_scope_id = client_data.ifindex;
         if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
                 msg = "connect";
                 goto ret_close;
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 66aa38c20..922c71ebd 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -702,7 +702,8 @@ static int bcast_or_ucast(struct dhcp_packet *packet, uint32_t ciaddr, uint32_t
         if (server)
                 return udhcp_send_kernel_packet(packet,
                         ciaddr, CLIENT_PORT,
-                        server, SERVER_PORT);
+                        server, SERVER_PORT,
+                        client_data.interface);
         return raw_bcast_from_client_data_ifindex(packet, ciaddr);
 }
 
@@ -1195,7 +1196,7 @@ static void client_background(void)
 //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"
-//usage:     "\n        -i IFACE        Interface to use (default eth0)"
+//usage:     "\n        -i IFACE        Interface to use (default "CONFIG_UDHCPC_DEFAULT_INTERFACE")"
 //usage:        IF_FEATURE_UDHCP_PORT(
 //usage:     "\n        -P PORT         Use PORT (default 68)"
 //usage:        )
@@ -1264,7 +1265,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
         /* Default options */
         IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
         IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
-        client_data.interface = "eth0";
+        client_data.interface = CONFIG_UDHCPC_DEFAULT_INTERFACE;
         client_data.script = CONFIG_UDHCPC_DEFAULT_SCRIPT;
         client_data.sockfd = -1;
         str_V = "udhcp "BB_VER;
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index acfdaa8c3..cd32cb437 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -27,7 +27,7 @@
 //kbuild:lib-$(CONFIG_FEATURE_UDHCP_RFC3397) += domain_codec.o
 
 //usage:#define udhcpd_trivial_usage
-//usage:       "[-fS] [-I ADDR]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]"
+//usage:       "[-fS] [-I ADDR]" IF_FEATURE_UDHCP_PORT(" [-P PORT]") " [CONFFILE]"
 //usage:#define udhcpd_full_usage "\n\n"
 //usage:       "DHCP server\n"
 //usage:     "\n        -f      Run in foreground"
@@ -35,7 +35,7 @@
 //usage:     "\n        -I ADDR Local address"
 //usage:     "\n        -a MSEC Timeout for ARP ping (default 2000)"
 //usage:        IF_FEATURE_UDHCP_PORT(
-//usage:     "\n        -P N    Use port N (default 67)"
+//usage:     "\n        -P PORT Use PORT (default 67)"
 //usage:        )
 //usage:     "\nSignals:"
 //usage:     "\n        USR1    Update lease file"
@@ -398,7 +398,7 @@ struct config_keyword {
 
 #define OFS(field) offsetof(struct server_data_t, field)
 
-static const struct config_keyword keywords[] = {
+static const struct config_keyword keywords[] ALIGN_PTR = {
         /* keyword        handler           variable address    default */
         {"start"        , udhcp_str2nip   , OFS(start_ip     ), "192.168.0.20"},
         {"end"          , udhcp_str2nip   , OFS(end_ip       ), "192.168.0.254"},
@@ -612,7 +612,8 @@ static void send_packet_to_relay(struct dhcp_packet *dhcp_pkt)
 
         udhcp_send_kernel_packet(dhcp_pkt,
                         server_data.server_nip, SERVER_PORT,
-                        dhcp_pkt->gateway_nip, SERVER_PORT);
+                        dhcp_pkt->gateway_nip, SERVER_PORT,
+                        server_data.interface);
 }
 
 static void send_packet(struct dhcp_packet *dhcp_pkt, int force_broadcast)
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 70d2d1434..1e9405205 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -10,18 +10,10 @@
 //usage:       "[-r|-a] [-d] [-f LEASEFILE]"
 //usage:#define dumpleases_full_usage "\n\n"
 //usage:       "Display DHCP leases granted by udhcpd\n"
-//usage:        IF_LONG_OPTS(
-//usage:     "\n        -f,--file FILE  Lease file"
-//usage:     "\n        -r,--remaining  Show remaining time"
-//usage:     "\n        -a,--absolute   Show expiration time"
-//usage:     "\n        -d,--decimal    Show time in seconds"
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -f FILE Lease file"
 //usage:     "\n        -r      Show remaining time"
 //usage:     "\n        -a      Show expiration time"
 //usage:     "\n        -d      Show time in seconds"
-//usage:        )
 
 #include "common.h"
 #include "dhcpd.h"
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 51374646d..4d8e005d4 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -189,7 +189,8 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
 /* Let the kernel do all the work for packet generation */
 int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
                 uint32_t source_nip, int source_port,
-                uint32_t dest_nip, int dest_port)
+                uint32_t dest_nip, int dest_port,
+                const char *ifname)
 {
         struct sockaddr_in sa;
         unsigned padding;
@@ -204,6 +205,21 @@ int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
         }
         setsockopt_reuseaddr(fd);
 
+        /* If interface carrier goes down, unless we
+         * bind socket to a particular netdev, the packet
+         * can go out through another interface, eg. via
+         * default route despite being bound to a specific
+         * source IP. As such, bind to device hard and fail
+         * otherwise. Sending renewal packets on foreign
+         * interfaces makes no sense.
+         */
+        if (ifname) {
+                if (setsockopt_bindtodevice(fd, ifname) < 0) {
+                        msg = "bindtodevice";
+                        goto ret_close;
+                }
+        }
+
         memset(&sa, 0, sizeof(sa));
         sa.sin_family = AF_INET;
         sa.sin_port = htons(source_port);
diff --git a/networking/wget.c b/networking/wget.c
index 8a967fe20..270eab141 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -128,19 +128,14 @@
 
 //usage:#define wget_trivial_usage
 //usage:        IF_FEATURE_WGET_LONG_OPTIONS(
-//usage:       "[-c|--continue] [--spider] [-q|--quiet] [-O|--output-document FILE]\n"
-//usage:       "        [-o|--output-file FILE] [--header 'header: value'] [-Y|--proxy on/off]\n"
-//usage:        IF_FEATURE_WGET_OPENSSL(
-//usage:       "        [--no-check-certificate]\n"
-//usage:        )
+//usage:       "[-cqS] [--spider] [-O FILE] [-o LOGFILE] [--header 'HEADER: VALUE'] [-Y on/off]\n"
 /* Since we ignore these opts, we don't show them in --help */
 /* //usage:    "        [--no-cache] [--passive-ftp] [-t TRIES]" */
 /* //usage:    "        [-nv] [-nc] [-nH] [-np]" */
-//usage:       "        [-P DIR] [-S|--server-response] [-U|--user-agent AGENT]" IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:       "        "IF_FEATURE_WGET_OPENSSL("[--no-check-certificate] ")"[-P DIR] [-U AGENT]"IF_FEATURE_WGET_TIMEOUT(" [-T SEC]")" URL..."
 //usage:        )
 //usage:        IF_NOT_FEATURE_WGET_LONG_OPTIONS(
-//usage:       "[-cq] [-O FILE] [-o FILE] [-Y on/off] [-P DIR] [-S] [-U AGENT]"
-//usage:                        IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:       "[-cqS] [-O FILE] [-o LOGFILE] [-Y on/off] [-P DIR] [-U AGENT]"IF_FEATURE_WGET_TIMEOUT(" [-T SEC]")" URL..."
 //usage:        )
 //usage:#define wget_full_usage "\n\n"
 //usage:       "Retrieve files via HTTP or FTP\n"
@@ -158,7 +153,7 @@
 //usage:     "\n        -T SEC          Network read timeout is SEC seconds"
 //usage:        )
 //usage:     "\n        -O FILE         Save to FILE ('-' for stdout)"
-//usage:     "\n        -o FILE         Log messages to FILE"
+//usage:     "\n        -o LOGFILE      Log messages to FILE"
 //usage:     "\n        -U STR          Use STR for User-Agent header"
 //usage:     "\n        -Y on/off       Use proxy"
 
@@ -287,6 +282,8 @@ enum {
         WGET_OPT_POST_DATA  = (1 << 12) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
         WGET_OPT_SPIDER     = (1 << 13) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
         WGET_OPT_NO_CHECK_CERT = (1 << 14) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
+        /* hijack this bit for other than opts purposes: */
+        WGET_NO_FTRUNCATE   = (1 << 31)
 };
 
 enum {
@@ -1085,8 +1082,13 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
          */
         {
                 off_t pos = lseek(G.output_fd, 0, SEEK_CUR);
-                if (pos != (off_t)-1)
-                        ftruncate(G.output_fd, pos);
+                if (pos != (off_t)-1) {
+                        /* do not truncate if -O- is in use, a user complained about
+                         * "wget -qO- 'http://example.com/empty' >>FILE" truncating FILE.
+                         */
+                        if (!(option_mask32 & WGET_NO_FTRUNCATE))
+                                ftruncate(G.output_fd, pos);
+                }
         }
 
         if (!(option_mask32 & WGET_OPT_QUIET)) {
@@ -1599,7 +1601,7 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
         if (G.fname_out) { /* -O FILE ? */
                 if (LONE_DASH(G.fname_out)) { /* -O - ? */
                         G.output_fd = 1;
-                        option_mask32 &= ~WGET_OPT_CONTINUE;
+                        option_mask32 = (option_mask32 & (~WGET_OPT_CONTINUE)) | WGET_NO_FTRUNCATE;
                 }
                 /* compat with wget: -O FILE can overwrite */
                 G.o_flags = O_WRONLY | O_CREAT | O_TRUNC;
diff --git a/procps/free.c b/procps/free.c
index b33506b9e..0adef501f 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -97,10 +97,10 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
                 case 'k': /* 2^10 */
                         /* G.unit_steps = 10; - already is */
                         break;
-                case 'm': /* 2^(2*10) */
+                case 'm': /* 2^20 */
                         G.unit_steps = 20;
                         break;
-                case 'g': /* 2^(3*10) */
+                case 'g': /* 2^30 */
                         G.unit_steps = 30;
                         break;
                 default:
@@ -117,16 +117,24 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
         );
 
         sysinfo(&info);
-        /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
-        G.mem_unit = (info.mem_unit ? info.mem_unit : 1);
         /* Extract cached and memavailable from /proc/meminfo and convert to mem_units */
         seen_available = parse_meminfo(&G);
+        G.mem_unit = (info.mem_unit ? info.mem_unit : 1); /* kernels < 2.4.x return mem_unit==0, so cope */
         available = ((unsigned long long) G.available_kb * 1024) / G.mem_unit;
         cached = ((unsigned long long) G.cached_kb * 1024) / G.mem_unit;
         cached += info.bufferram;
         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
+
 #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)
diff --git a/procps/fuser.c b/procps/fuser.c
index 418f57b57..191746751 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -19,7 +19,7 @@
 //kbuild:lib-$(CONFIG_FUSER) += fuser.o
 
 //usage:#define fuser_trivial_usage
-//usage:       "[OPTIONS] FILE or PORT/PROTO"
+//usage:       "[-msk46] [-SIGNAL] FILE or PORT/PROTO"
 //usage:#define fuser_full_usage "\n\n"
 //usage:       "Find processes which use FILEs or PORTs\n"
 //usage:     "\n        -m      Find processes which use same fs as FILEs"
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 856ce0202..f08938654 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -838,7 +838,7 @@ static void FAST_FUNC collect_info(s_stat *s)
 typedef s_stat* init_func(const char *param);
 
 static const char options[] ALIGN1 = "ncmsfixptTbr";
-static init_func *const init_functions[] = {
+static init_func *const init_functions[] ALIGN_PTR = {
         init_if,
         init_cpu,
         init_mem,
@@ -952,11 +952,11 @@ int nmeter_main(int argc UNUSED_PARAM, char **argv)
         reset_outbuf();
 
         if (G.delta >= 0) {
-                gettimeofday(&G.tv, NULL);
+                xgettimeofday(&G.tv);
                 usleep(G.delta > 1000000 ? 1000000 : G.delta - G.tv.tv_usec % G.deltanz);
         }
 
-        gettimeofday(&G.start, NULL);
+        xgettimeofday(&G.start);
         G.tv = G.start;
         while (1) {
                 collect_info(first);
@@ -971,7 +971,7 @@ int nmeter_main(int argc UNUSED_PARAM, char **argv)
                 if (G.delta >= 0) {
                         int rem;
                         // can be commented out, will sacrifice sleep time precision a bit
-                        gettimeofday(&G.tv, NULL);
+                        xgettimeofday(&G.tv);
                         if (need_seconds)
                                 rem = G.delta - ((ullong)G.tv.tv_sec*1000000 + G.tv.tv_usec) % G.deltanz;
                         else
@@ -983,7 +983,7 @@ int nmeter_main(int argc UNUSED_PARAM, char **argv)
                         }
                         usleep(rem);
                 }
-                gettimeofday(&G.tv, NULL);
+                xgettimeofday(&G.tv);
         }
 
         /*return 0;*/
diff --git a/procps/pidof.c b/procps/pidof.c
index 5595e3421..b81709a81 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -39,7 +39,7 @@
 
 //usage:#if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
 //usage:#define pidof_trivial_usage
-//usage:       "[OPTIONS] [NAME]..."
+//usage:       IF_FEATURE_PIDOF_SINGLE("[-s] ")IF_FEATURE_PIDOF_OMIT("[-o PID] ")"[NAME]..."
 //usage:#define USAGE_PIDOF "\n"
 //usage:#else
 //usage:#define pidof_trivial_usage
diff --git a/procps/pmap.c b/procps/pmap.c
index 9e541c707..408cbfce7 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -27,20 +27,14 @@
 
 #include "libbb.h"
 
-#if ULONG_MAX == 0xffffffff
+#if ULLONG_MAX == 0xffffffff
 # define TABS "\t"
-# define AFMT "8"
+# define AFMTLL "8"
 # define DASHES ""
 #else
 # define TABS "\t\t"
-# define AFMT "16"
-# define DASHES "--------"
-#endif
-
-#if ULLONG_MAX == 0xffffffff
-# define AFMTLL "8"
-#else
 # define AFMTLL "16"
+# define DASHES "--------"
 #endif
 
 enum {
diff --git a/procps/ps.c b/procps/ps.c
index a4de11379..f84060447 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -381,7 +381,7 @@ static void func_pcpu(char *buf, int size, const procps_status_t *ps)
 }
 */
 
-static const ps_out_t out_spec[] = {
+static const ps_out_t out_spec[] ALIGN_PTR = {
 /* Mandated by http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html: */
         { 8                  , "user"  ,"USER"   ,func_user  ,PSSCAN_UIDGID  },
         { 8                  , "group" ,"GROUP"  ,func_group ,PSSCAN_UIDGID  },
diff --git a/runit/runsv.c b/runit/runsv.c
index 36d85101e..ecab8cdf5 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -58,11 +58,19 @@ static void gettimeofday_ns(struct timespec *ts)
 #else
 static void gettimeofday_ns(struct timespec *ts)
 {
-        BUILD_BUG_ON(sizeof(struct timeval) != sizeof(struct timespec));
-        BUILD_BUG_ON(sizeof(((struct timeval*)ts)->tv_usec) != sizeof(ts->tv_nsec));
-        /* Cheat */
-        gettimeofday((void*)ts, NULL);
-        ts->tv_nsec *= 1000;
+        if (sizeof(struct timeval) == sizeof(struct timespec)
+         && sizeof(((struct timeval*)ts)->tv_usec) == sizeof(ts->tv_nsec)
+        ) {
+                /* Cheat */
+                xgettimeofday((void*)ts);
+                ts->tv_nsec *= 1000;
+        } else {
+                /* For example, musl has "incompatible" layouts */
+                struct timeval tv;
+                xgettimeofday(&tv);
+                ts->tv_sec = tv.tv_sec;
+                ts->tv_nsec = tv.tv_usec * 1000;
+        }
 }
 #endif
 
@@ -651,7 +659,7 @@ int runsv_main(int argc UNUSED_PARAM, char **argv)
                                 gettimeofday_ns(&svd[0].start);
                                 update_status(&svd[0]);
                                 if (LESS(svd[0].start.tv_sec, deadline))
-                                        sleep(1);
+                                        sleep1();
                         }
                         if (haslog) {
                                 if (child == svd[1].pid) {
@@ -664,7 +672,7 @@ int runsv_main(int argc UNUSED_PARAM, char **argv)
                                         gettimeofday_ns(&svd[1].start);
                                         update_status(&svd[1]);
                                         if (LESS(svd[1].start.tv_sec, deadline))
-                                                sleep(1);
+                                                sleep1();
                                 }
                         }
                 } /* for (;;) */
diff --git a/runit/svlogd.c b/runit/svlogd.c
index a250058a1..294e31aca 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -351,7 +351,7 @@ static void fmt_time_human_30nul(char *s, char dt_delim)
         struct tm *ptm;
         struct timeval tv;
 
-        gettimeofday(&tv, NULL);
+        xgettimeofday(&tv);
         ptm = gmtime_r(&tv.tv_sec, &tm);
         /* ^^^ using gmtime_r() instead of gmtime() to not use static data */
         sprintf(s, "%04u-%02u-%02u%c%02u:%02u:%02u.%06u000",
@@ -376,7 +376,7 @@ static void fmt_time_bernstein_25(char *s)
         struct timeval tv;
         unsigned sec_hi;
 
-        gettimeofday(&tv, NULL);
+        xgettimeofday(&tv);
         sec_hi = (0x400000000000000aULL + tv.tv_sec) >> 32;
         tv.tv_sec = (time_t)(0x400000000000000aULL) + tv.tv_sec;
         tv.tv_usec *= 1000;
@@ -775,7 +775,7 @@ static NOINLINE unsigned logdir_open(struct logdir *ld, const char *fn)
                                 ld->nmin = xatoi_positive(&s[1]);
                                 break;
                         case 't': {
-                                static const struct suffix_mult mh_suffixes[] = {
+                                static const struct suffix_mult mh_suffixes[] ALIGN_SUFFIX = {
                                         { "m", 60 },
                                         { "h", 60*60 },
                                         /*{ "d", 24*60*60 },*/
diff --git a/scripts/bb_release b/scripts/bb_release
index 2e146bf84..545440d3a 100755
--- a/scripts/bb_release
+++ b/scripts/bb_release
@@ -8,6 +8,7 @@
 
 #svn co svn://busybox.net/trunk/busybox
 cd busybox || { echo "cd busybox failed"; exit 1; }
+chmod -Rc u+w,a+rX,go-w .
 make release || { echo "make release failed"; exit 1; }
 cd ..
 
diff --git a/selinux/chcon.c b/selinux/chcon.c
index 9b13679b8..2e4f94c0f 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -19,10 +19,10 @@
 //kbuild:lib-$(CONFIG_CHCON) += chcon.o
 
 //usage:#define chcon_trivial_usage
-//usage:       "[OPTIONS] CONTEXT FILE..."
-//usage:       "\n      chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..."
+//usage:       "[-chfRv] CONTEXT FILE..."
+//usage:       "\n      chcon [-chfRv] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..."
 //usage:        IF_LONG_OPTS(
-//usage:       "\n      chcon [OPTIONS] --reference=RFILE FILE..."
+//usage:       "\n      chcon [-chfRv] --reference=RFILE FILE..."
 //usage:        )
 //usage:
 //usage:#define chcon_full_usage "\n\n"
@@ -37,7 +37,7 @@
 //usage:     "\n        -u USER Set user/role/type/range in the target security context"
 //usage:     "\n        -r ROLE"
 //usage:     "\n        -t TYPE"
-//usage:     "\n        -l RNG"
+//usage:     "\n        -l RANGE"
 //usage:     "\n        -R      Recurse"
 
 #include <selinux/context.h>
diff --git a/shell/ash.c b/shell/ash.c
index 897548f3c..780900b40 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -418,9 +418,12 @@ static void forkshell_print(FILE *fp0, struct forkshell *fs, const char **notes)
 
 /* ============ Shell options */
 
+/* If you add/change options hare, update --help text too */
 static const char *const optletters_optnames[] = {
         "e"   "errexit",
         "f"   "noglob",
+/* bash has '-o ignoreeof', but no short synonym -I for it */
+/* (in bash, set -I disables invisible variables (what's that?)) */
         "I"   "ignoreeof",
 /* The below allowed this invocation:
  * ash -c 'set -i; echo $-; sleep 5; echo $-'
@@ -429,9 +432,10 @@ static const char *const optletters_optnames[] = {
  * In our code, this is denoted by empty long name:
  */
         "i"   "",
+/* (removing "i" altogether would remove it from "$-", not good) */
         "m"   "monitor",
         "n"   "noexec",
-/* Ditto: bash has no "set -s" */
+/* Ditto: bash has no "set -s", "set -c" */
 #if !ENABLE_PLATFORM_MINGW32
         "s"   "",
 #else
@@ -707,6 +711,63 @@ var_end(const char *var)
 }
 
 
+/* ============ Parser data */
+
+/*
+ * ash_vmsg() needs parsefile->fd, hence parsefile definition is moved up.
+ */
+struct strlist {
+        struct strlist *next;
+        char *text;
+};
+
+struct alias;
+
+struct strpush {
+        struct strpush *prev;   /* preceding string on stack */
+        char *prev_string;
+        int prev_left_in_line;
+#if ENABLE_ASH_ALIAS
+        struct alias *ap;       /* if push was associated with an alias */
+#endif
+        char *string;           /* remember the string since it may change */
+
+        /* Remember last two characters for pungetc. */
+        int lastc[2];
+
+        /* Number of outstanding calls to pungetc. */
+        int unget;
+};
+
+/*
+ * The parsefile structure pointed to by the global variable parsefile
+ * contains information about the current file being read.
+ */
+struct parsefile {
+        struct parsefile *prev; /* preceding file on stack */
+        int linno;              /* current line */
+        int pf_fd;              /* file descriptor (or -1 if string) */
+        int left_in_line;       /* number of chars left in this line */
+        int left_in_buffer;     /* number of chars left in this buffer past the line */
+        char *next_to_pgetc;    /* next char in buffer */
+        char *buf;              /* input buffer */
+        struct strpush *strpush; /* for pushing strings at this level */
+        struct strpush basestrpush; /* so pushing one is fast */
+
+        /* Remember last two characters for pungetc. */
+        int lastc[2];
+
+        /* Number of outstanding calls to pungetc. */
+        int unget;
+};
+
+static struct parsefile basepf;        /* top level input file */
+static struct parsefile *g_parsefile = &basepf;  /* current input file */
+#if ENABLE_PLATFORM_POSIX
+static char *commandname;              /* currently executing command */
+#endif
+
+
 /* ============ Interrupts / exceptions */
 
 static void exitshell(void) NORETURN;
@@ -1466,63 +1527,6 @@ showtree(union node *n)
 #endif /* DEBUG */
 
 
-/* ============ Parser data */
-
-/*
- * ash_vmsg() needs parsefile->fd, hence parsefile definition is moved up.
- */
-struct strlist {
-        struct strlist *next;
-        char *text;
-};
-
-struct alias;
-
-struct strpush {
-        struct strpush *prev;   /* preceding string on stack */
-        char *prev_string;
-        int prev_left_in_line;
-#if ENABLE_ASH_ALIAS
-        struct alias *ap;       /* if push was associated with an alias */
-#endif
-        char *string;           /* remember the string since it may change */
-
-        /* Remember last two characters for pungetc. */
-        int lastc[2];
-
-        /* Number of outstanding calls to pungetc. */
-        int unget;
-};
-
-/*
- * The parsefile structure pointed to by the global variable parsefile
- * contains information about the current file being read.
- */
-struct parsefile {
-        struct parsefile *prev; /* preceding file on stack */
-        int linno;              /* current line */
-        int pf_fd;              /* file descriptor (or -1 if string) */
-        int left_in_line;       /* number of chars left in this line */
-        int left_in_buffer;     /* number of chars left in this buffer past the line */
-        char *next_to_pgetc;    /* next char in buffer */
-        char *buf;              /* input buffer */
-        struct strpush *strpush; /* for pushing strings at this level */
-        struct strpush basestrpush; /* so pushing one is fast */
-
-        /* Remember last two characters for pungetc. */
-        int lastc[2];
-
-        /* Number of outstanding calls to pungetc. */
-        int unget;
-};
-
-static struct parsefile basepf;        /* top level input file */
-static struct parsefile *g_parsefile = &basepf;  /* current input file */
-#if ENABLE_PLATFORM_POSIX
-static char *commandname;              /* currently executing command */
-#endif
-
-
 /* ============ Message printing */
 
 static void
@@ -2284,7 +2288,7 @@ static const struct {
         int flags;
         const char *var_text;
         void (*var_func)(const char *) FAST_FUNC;
-} varinit_data[] = {
+} varinit_data[] ALIGN_PTR = {
         /*
          * Note: VEXPORT would not work correctly here for NOFORK applets:
          * some environment strings may be constant.
@@ -5137,7 +5141,7 @@ getstatus(struct job *job)
                                 job->sigint = 1;
 #endif
                 }
-                retval += 128;
+                retval |= 128;
         }
         TRACE(("getstatus: job %d, nproc %d, status 0x%x, retval 0x%x\n",
                 jobno(job), job->nprocs, status, retval));
@@ -5203,7 +5207,7 @@ waitcmd(int argc UNUSED_PARAM, char **argv)
                                 if (status != -1 && !WIFSTOPPED(status)) {
                                         retval = WEXITSTATUS(status);
                                         if (WIFSIGNALED(status))
-                                                retval = WTERMSIG(status) + 128;
+                                                retval = 128 | WTERMSIG(status);
                                         goto ret;
                                 }
                         }
@@ -5238,7 +5242,7 @@ waitcmd(int argc UNUSED_PARAM, char **argv)
  ret:
         return retval;
  sigout:
-        retval = 128 + pending_sig;
+        retval = 128 | pending_sig;
         return retval;
 }
 
@@ -5340,7 +5344,7 @@ static char *cmdnextc;
 static void
 cmdputs(const char *s)
 {
-        static const char vstype[VSTYPE + 1][3] = {
+        static const char vstype[VSTYPE + 1][3] ALIGN1 = {
                 "", "}", "-", "+", "?", "=",
                 "%", "%%", "#", "##"
                 IF_BASH_SUBSTR(, ":")
@@ -7578,7 +7582,8 @@ subevalvar(char *start, char *str, int strloc,
         slash_pos = -1;
         if (repl) {
                 slash_pos = expdest - ((char *)stackblock() + strloc);
-                STPUTC('/', expdest);
+                if (!(flag & EXP_DISCARD))
+                        STPUTC('/', expdest);
                 //bb_error_msg("repl+1:'%s'", repl + 1);
                 p = argstr(repl + 1, (flag & EXP_DISCARD) | EXP_TILDE); /* EXP_TILDE: echo "${v/x/~}" expands ~ ! */
                 *repl = '/';
@@ -7740,7 +7745,7 @@ subevalvar(char *start, char *str, int strloc,
                 len = 0;
                 idx = startp;
                 end = str - 1;
-                while (idx < end) {
+                while (idx <= end) {
  try_to_match:
                         loc = scanright(idx, rmesc, rmescend, str, quotes, 1);
                         //bb_error_msg("scanright('%s'):'%s'", str, loc);
@@ -7748,6 +7753,8 @@ subevalvar(char *start, char *str, int strloc,
                                 /* No match, advance */
                                 char *restart_detect = stackblock();
  skip_matching:
+                                if (idx >= end)
+                                        break;
                                 STPUTC(*idx, expdest);
                                 if (quotes && (unsigned char)*idx == CTLESC) {
                                         idx++;
@@ -7760,8 +7767,6 @@ subevalvar(char *start, char *str, int strloc,
                                 len++;
                                 rmesc++;
                                 /* continue; - prone to quadratic behavior, smarter code: */
-                                if (idx >= end)
-                                        break;
                                 if (str[0] == '*') {
                                         /* Pattern is "*foo". If "*foo" does not match "long_string",
                                          * it would never match "ong_string" etc, no point in trying.
@@ -7844,7 +7849,9 @@ subevalvar(char *start, char *str, int strloc,
  out:
         amount = loc - expdest;
         STADJUST(amount, expdest);
+#if BASH_PATTERN_SUBST
  out1:
+#endif
         /* Remove any recorded regions beyond start of variable */
         removerecordregions(startloc);
 
@@ -9127,7 +9134,7 @@ enum {
         , /* thus far 29 bits used */
 };
 
-static const char *const tokname_array[] = {
+static const char *const tokname_array[] ALIGN_PTR = {
         "end of file",
         "newline",
         "redirection",
@@ -11360,7 +11367,7 @@ preadfd(void)
 
         g_parsefile->next_to_pgetc = buf;
 #if ENABLE_FEATURE_EDITING
- retry:
+ /* retry: */
         if (!iflag || g_parsefile->pf_fd != STDIN_FILENO)
                 nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1);
         else {
@@ -11382,17 +11389,16 @@ preadfd(void)
                 if (nr == 0) {
                         /* ^C pressed, "convert" to SIGINT */
                         write(STDOUT_FILENO, "^C", 2);
+# if !ENABLE_PLATFORM_MINGW32
+                        raise(SIGINT);
+# endif
                         if (trap[SIGINT]) {
                                 buf[0] = '\n';
                                 buf[1] = '\0';
-# if !ENABLE_PLATFORM_MINGW32
-                                raise(SIGINT);
-# endif
                                 return 1;
                         }
                         exitstatus = 128 + SIGINT;
-                        bb_putchar('\n');
-                        goto retry;
+                        return -1;
                 }
                 if (nr < 0) {
                         if (errno == 0) {
@@ -12164,10 +12170,10 @@ static void FAST_FUNC
 change_epoch(struct var *vepoch, const char *fmt)
 {
         struct timeval tv;
-        char buffer[sizeof("%lu.nnnnnn") + sizeof(long)*3];
+        char buffer[sizeof("%llu.nnnnnn") + sizeof(long long)*3];
 
-        gettimeofday(&tv, NULL);
-        sprintf(buffer, fmt, (unsigned long)tv.tv_sec, (unsigned)tv.tv_usec);
+        xgettimeofday(&tv);
+        sprintf(buffer, fmt, (unsigned long long)tv.tv_sec, (unsigned)tv.tv_usec);
         setvar(vepoch->var_text, buffer, VNOFUNC);
         vepoch->flags &= ~VNOFUNC;
 }
@@ -12175,13 +12181,13 @@ change_epoch(struct var *vepoch, const char *fmt)
 static void FAST_FUNC
 change_seconds(const char *value UNUSED_PARAM)
 {
-        change_epoch(&vepochs, "%lu");
+        change_epoch(&vepochs, "%llu");
 }
 
 static void FAST_FUNC
 change_realtime(const char *value UNUSED_PARAM)
 {
-        change_epoch(&vepochr, "%lu.%06u");
+        change_epoch(&vepochr, "%llu.%06u");
 }
 #endif
 
@@ -15001,6 +15007,7 @@ reset(void)
         /* from input.c: */
         g_parsefile->left_in_buffer = 0;
         g_parsefile->left_in_line = 0;      /* clear input buffer */
+        g_parsefile->unget = 0;
         popallfiles();
 
         /* from var.c: */
@@ -15017,8 +15024,7 @@ exitshell(void)
         char *p;
 
 #if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
-        if (line_input_state)
-                save_history(line_input_state);
+        save_history(line_input_state); /* may be NULL */
 #endif
         savestatus = exitstatus;
         TRACE(("pid %d, exitshell(%d)\n", getpid(), savestatus));
@@ -15197,7 +15203,8 @@ init(void)
 
 
 //usage:#define ash_trivial_usage
-//usage:        "[-/+OPTIONS] [-/+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"
 
@@ -15246,9 +15253,9 @@ procargs(char **argv)
         }
         if (mflag == 2)
                 mflag = iflag;
+        /* Unset options which weren't explicitly set or unset */
         for (i = 0; i < NOPTS; i++)
-                if (optlist[i] == 2)
-                        optlist[i] = 0;
+                optlist[i] &= 1; /* same effect as "if (optlist[i] == 2) optlist[i] = 0;" */
 #if DEBUG == 2
         debug = 1;
 #endif
@@ -15277,6 +15284,19 @@ procargs(char **argv)
                 shellparam.nparam++;
                 xargv++;
         }
+
+        /* Interactive bash re-enables SIGHUP which is SIG_IGNed on entry.
+         * Try:
+         * trap '' hup; bash; echo RET  # type "kill -hup $$", see SIGHUP having effect
+         * trap '' hup; bash -c 'kill -hup $$; echo ALIVE'  # here SIGHUP is SIG_IGNed
+         * NB: must do it before setting up signals (in optschanged())
+         * and reading .profile etc (after we return from here):
+         */
+#if !ENABLE_PLATFORM_MINGW32
+        if (iflag)
+                signal(SIGHUP, SIG_DFL);
+#endif
+
         optschanged();
 
         return login_sh;
@@ -15493,7 +15513,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
 
         if (sflag || minusc == NULL) {
 #if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY
-                if (iflag) {
+                if (line_input_state) {
                         const char *hp = lookupvar("HISTFILE");
                         if (!hp) {
                                 hp = lookupvar("HOME");
@@ -15507,7 +15527,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                                 }
                         }
                         if (hp)
-                                line_input_state->hist_file = hp;
+                                line_input_state->hist_file = xstrdup(hp);
 # if ENABLE_FEATURE_SH_HISTFILESIZE
                         hp = lookupvar("HISTFILESIZE");
                         line_input_state->max_history = size_from_HISTFILESIZE(hp);
@@ -15515,16 +15535,6 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                 }
 #endif
  state4: /* XXX ??? - why isn't this before the "if" statement */
-
-                /* Interactive bash re-enables SIGHUP which is SIG_IGNed on entry.
-                 * Try:
-                 * trap '' hup; bash; echo RET  # type "kill -hup $$", see SIGHUP having effect
-                 * trap '' hup; bash -c 'kill -hup $$; echo ALIVE'  # here SIGHUP is SIG_IGNed
-                 */
-#if !ENABLE_PLATFORM_MINGW32
-                signal(SIGHUP, SIG_DFL);
-#endif
-
                 cmdloop(1);
         }
 #if PROFILE
diff --git a/shell/ash_test/ash-misc/piped_input.right b/shell/ash_test/ash-misc/piped_input.right
new file mode 100644
index 000000000..7b8bf6758
--- /dev/null
+++ b/shell/ash_test/ash-misc/piped_input.right
@@ -0,0 +1,2 @@
+TEST
+One:1
diff --git a/shell/ash_test/ash-misc/piped_input.tests b/shell/ash_test/ash-misc/piped_input.tests
new file mode 100755
index 000000000..929fec0db
--- /dev/null
+++ b/shell/ash_test/ash-misc/piped_input.tests
@@ -0,0 +1,3 @@
+exec 2>&1
+echo 'echo TEST; false' | $THIS_SH
+echo One:$?
diff --git a/shell/ash_test/ash-vars/var_bash_repl_empty_var.right b/shell/ash_test/ash-vars/var_bash_repl_empty_var.right
index 892916783..a8d1a3bef 100644
--- a/shell/ash_test/ash-vars/var_bash_repl_empty_var.right
+++ b/shell/ash_test/ash-vars/var_bash_repl_empty_var.right
@@ -1,2 +1,3 @@
 
+w
 Ok:0
diff --git a/shell/ash_test/ash-vars/var_bash_repl_empty_var.tests b/shell/ash_test/ash-vars/var_bash_repl_empty_var.tests
index 73a43d38e..22aaba560 100755
--- a/shell/ash_test/ash-vars/var_bash_repl_empty_var.tests
+++ b/shell/ash_test/ash-vars/var_bash_repl_empty_var.tests
@@ -1,3 +1,5 @@
+unset v
+echo ${v/*/w}
 v=''
 echo ${v/*/w}
 echo Ok:$?
diff --git a/shell/hush.c b/shell/hush.c
index ab7263381..77f90f82f 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -596,10 +596,10 @@ typedef struct in_str {
 /* The descrip member of this structure is only used to make
  * debugging output pretty */
 static const struct {
-        int mode;
+        int32_t mode;
         signed char default_fd;
         char descrip[3];
-} redir_table[] = {
+} redir_table[] ALIGN4 = {
         { O_RDONLY,                  0, "<"  },
         { O_CREAT|O_TRUNC|O_WRONLY,  1, ">"  },
         { O_CREAT|O_APPEND|O_WRONLY, 1, ">>" },
@@ -653,7 +653,7 @@ struct command {
 /* used for "[[ EXPR ]]" */
 # define CMD_TEST2_SINGLEWORD_NOGLOB 2
 #endif
-#if ENABLE_HUSH_LOCAL || ENABLE_HUSH_EXPORT || ENABLE_HUSH_READONLY
+#if BASH_TEST2 || ENABLE_HUSH_LOCAL || ENABLE_HUSH_EXPORT || ENABLE_HUSH_READONLY
 /* used to prevent word splitting and globbing in "export v=t*" */
 # define CMD_SINGLEWORD_NOGLOB 3
 #endif
@@ -1027,7 +1027,7 @@ struct globals {
         struct sigaction sa;
         char optstring_buf[sizeof("eixcs")];
 #if BASH_EPOCH_VARS
-        char epoch_buf[sizeof("%lu.nnnnnn") + sizeof(long)*3];
+        char epoch_buf[sizeof("%llu.nnnnnn") + sizeof(long long)*3];
 #endif
 #if ENABLE_FEATURE_EDITING
         char user_input_buf[CONFIG_FEATURE_EDITING_MAX_LEN];
@@ -1140,7 +1140,7 @@ struct built_in_command {
 #endif
 };
 
-static const struct built_in_command bltins1[] = {
+static const struct built_in_command bltins1[] ALIGN_PTR = {
         BLTIN("."        , builtin_source  , "Run commands in file"),
         BLTIN(":"        , builtin_true    , NULL),
 #if ENABLE_HUSH_JOB
@@ -1225,7 +1225,7 @@ static const struct built_in_command bltins1[] = {
 /* These builtins won't be used if we are on NOMMU and need to re-exec
  * (it's cheaper to run an external program in this case):
  */
-static const struct built_in_command bltins2[] = {
+static const struct built_in_command bltins2[] ALIGN_PTR = {
 #if ENABLE_HUSH_TEST
         BLTIN("["        , builtin_test    , NULL),
 #endif
@@ -1649,13 +1649,33 @@ static int refill_HFILE_and_getc(HFILE *fp)
                 /* Already saw EOF */
                 return EOF;
         }
+#if ENABLE_HUSH_INTERACTIVE && !ENABLE_FEATURE_EDITING
+        /* If user presses ^C, read() restarts after SIGINT (we use SA_RESTART).
+         * IOW: ^C will not immediately stop line input.
+         * But poll() is different: it does NOT restart after signals.
+         */
+        if (fp == G.HFILE_stdin) {
+                struct pollfd pfd[1];
+                pfd[0].fd = fp->fd;
+                pfd[0].events = POLLIN;
+                n = poll(pfd, 1, -1);
+                if (n < 0
+                 /*&& errno == EINTR - assumed true */
+                 && sigismember(&G.pending_set, SIGINT)
+                ) {
+                        return '\0';
+                }
+        }
+#else
+/* if FEATURE_EDITING=y, we do not use this routine for interactive input */
+#endif
         /* Try to buffer more input */
-        fp->cur = fp->buf;
         n = safe_read(fp->fd, fp->buf, sizeof(fp->buf));
         if (n < 0) {
                 bb_simple_perror_msg("read error");
                 n = 0;
         }
+        fp->cur = fp->buf;
         fp->end = fp->buf + n;
         if (n == 0) {
                 /* EOF/error */
@@ -2050,8 +2070,7 @@ static sighandler_t pick_sighandler(unsigned sig)
 static void hush_exit(int exitcode)
 {
 #if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
-        if (G.line_input_state)
-                save_history(G.line_input_state);
+        save_history(G.line_input_state); /* may be NULL */
 #endif
 
         fflush_all();
@@ -2091,7 +2110,6 @@ static void hush_exit(int exitcode)
 #endif
 }
 
-
 //TODO: return a mask of ALL handled sigs?
 static int check_and_run_traps(void)
 {
@@ -2259,13 +2277,13 @@ static const char* FAST_FUNC get_local_var_value(const char *name)
         {
                 const char *fmt = NULL;
                 if (strcmp(name, "EPOCHSECONDS") == 0)
-                        fmt = "%lu";
+                        fmt = "%llu";
                 else if (strcmp(name, "EPOCHREALTIME") == 0)
-                        fmt = "%lu.%06u";
+                        fmt = "%llu.%06u";
                 if (fmt) {
                         struct timeval tv;
-                        gettimeofday(&tv, NULL);
-                        sprintf(G.epoch_buf, fmt, (unsigned long)tv.tv_sec,
+                        xgettimeofday(&tv);
+                        sprintf(G.epoch_buf, fmt, (unsigned long long)tv.tv_sec,
                                         (unsigned)tv.tv_usec);
                         return G.epoch_buf;
                 }
@@ -2614,7 +2632,7 @@ static const char *setup_prompt_string(void)
                 /* bash uses $PWD value, even if it is set by user.
                  * It uses current dir only if PWD is unset.
                  * We always use current dir. */
-                G.PS1 = xasprintf("%s %c ", get_cwd(0), (geteuid() != 0) ? '$' : '#');
+                prompt_str = G.PS1 = xasprintf("%s %c ", get_cwd(0), (geteuid() != 0) ? '$' : '#');
         }
 # endif
         debug_printf("prompt_str '%s'\n", prompt_str);
@@ -2622,33 +2640,33 @@ static const char *setup_prompt_string(void)
 }
 static int get_user_input(struct in_str *i)
 {
+# if ENABLE_FEATURE_EDITING
+        /* In EDITING case, this function reads next input line,
+         * saves it in i->p, then returns 1st char of it.
+         */
         int r;
         const char *prompt_str;
 
         prompt_str = setup_prompt_string();
-# if ENABLE_FEATURE_EDITING
         for (;;) {
                 reinit_unicode_for_hush();
-                if (G.flag_SIGINT) {
-                        /* There was ^C'ed, make it look prettier: */
-                        bb_putchar('\n');
-                        G.flag_SIGINT = 0;
-                }
+                G.flag_SIGINT = 0;
                 /* buglet: SIGINT will not make new prompt to appear _at once_,
                  * only after <Enter>. (^C works immediately) */
                 r = read_line_input(G.line_input_state, prompt_str,
                                 G.user_input_buf, CONFIG_FEATURE_EDITING_MAX_LEN-1
                 );
                 /* read_line_input intercepts ^C, "convert" it to SIGINT */
-                if (r == 0)
+                if (r == 0) {
                         raise(SIGINT);
+                }
                 check_and_run_traps();
                 if (r != 0 && !G.flag_SIGINT)
                         break;
                 /* ^C or SIGINT: repeat */
                 /* bash prints ^C even on real SIGINT (non-kbd generated) */
-                write(STDOUT_FILENO, "^C", 2);
-                G.last_exitcode = 128 + SIGINT;
+                write(STDOUT_FILENO, "^C\n", 3);
+                G.last_exitcode = 128 | SIGINT;
         }
         if (r < 0) {
                 /* EOF/error detected */
@@ -2659,9 +2677,15 @@ static int get_user_input(struct in_str *i)
         i->p = G.user_input_buf;
         return (unsigned char)*i->p++;
 # else
+        /* In !EDITING case, this function gets called for every char.
+         * Buffering happens deeper in the call chain, in hfgetc(i->file).
+         */
+        int r;
+
         for (;;) {
                 G.flag_SIGINT = 0;
                 if (i->last_char == '\0' || i->last_char == '\n') {
+                        const char *prompt_str = setup_prompt_string();
                         /* Why check_and_run_traps here? Try this interactively:
                          * $ trap 'echo INT' INT; (sleep 2; kill -INT $$) &
                          * $ <[enter], repeatedly...>
@@ -2669,19 +2693,23 @@ static int get_user_input(struct in_str *i)
                          */
                         check_and_run_traps();
                         fputs(prompt_str, stdout);
+                        fflush_all();
                 }
-                fflush_all();
-//FIXME: here ^C or SIGINT will have effect only after <Enter>
                 r = hfgetc(i->file);
                 /* In !ENABLE_FEATURE_EDITING we don't use read_line_input,
                  * no ^C masking happens during fgetc, no special code for ^C:
                  * it generates SIGINT as usual.
                  */
                 check_and_run_traps();
-                if (G.flag_SIGINT)
-                        G.last_exitcode = 128 + SIGINT;
-                if (r != '\0')
+                if (r != '\0' && !G.flag_SIGINT)
                         break;
+                if (G.flag_SIGINT) {
+                        /* ^C or SIGINT: repeat */
+                        /* bash prints ^C even on real SIGINT (non-kbd generated) */
+                        /* kernel prints "^C" itself, just print newline: */
+                        write(STDOUT_FILENO, "\n", 1);
+                        G.last_exitcode = 128 | SIGINT;
+                }
         }
         return r;
 # endif
@@ -2703,14 +2731,14 @@ static int fgetc_interactive(struct in_str *i)
         }
         return ch;
 }
-#else
+#else  /* !INTERACTIVE */
 static ALWAYS_INLINE int fgetc_interactive(struct in_str *i)
 {
         int ch;
         do ch = hfgetc(i->file); while (ch == '\0');
         return ch;
 }
-#endif  /* INTERACTIVE */
+#endif  /* !INTERACTIVE */
 
 static int i_getch(struct in_str *i)
 {
@@ -3888,7 +3916,7 @@ struct reserved_combo {
         char literal[6];
         unsigned char res;
         unsigned char assignment_flag;
-        int flag;
+        uint32_t flag;
 };
 enum {
         FLAG_END   = (1 << RES_NONE ),
@@ -3921,7 +3949,7 @@ static const struct reserved_combo* match_reserved_word(o_string *word)
          * to turn the compound list into a command.
          * FLAG_START means the word must start a new compound list.
          */
-        static const struct reserved_combo reserved_list[] = {
+        static const struct reserved_combo reserved_list[] ALIGN4 = {
 # if ENABLE_HUSH_IF
                 { "!",     RES_NONE,  NOT_ASSIGNMENT  , 0 },
                 { "if",    RES_IF,    MAYBE_ASSIGNMENT, FLAG_THEN | FLAG_START },
@@ -5263,19 +5291,19 @@ static struct pipe *parse_stream(char **pstring,
 
                         if (heredoc_cnt) {
                                 syntax_error_unterm_str("here document");
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         if (end_trigger == ')') {
                                 syntax_error_unterm_ch('(');
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         if (end_trigger == '}') {
                                 syntax_error_unterm_ch('{');
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
 
                         if (done_word(&ctx)) {
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         o_free_and_set_NULL(&ctx.word);
                         done_pipe(&ctx, PIPE_SEQ);
@@ -5345,7 +5373,7 @@ static struct pipe *parse_stream(char **pstring,
                         while (1) {
                                 if (ch == EOF) {
                                         syntax_error_unterm_ch('\'');
-                                        goto parse_error;
+                                        goto parse_error_exitcode1;
                                 }
                                 nommu_addchr(&ctx.as_string, ch);
                                 if (ch == '\'')
@@ -5424,7 +5452,7 @@ static struct pipe *parse_stream(char **pstring,
                         /* ch == last eaten whitespace char */
 #endif
                         if (done_word(&ctx)) {
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         if (ch == '\n') {
                                 /* Is this a case when newline is simply ignored?
@@ -5467,7 +5495,7 @@ static struct pipe *parse_stream(char **pstring,
                                 if (heredoc_cnt) {
                                         heredoc_cnt = fetch_heredocs(&ctx.as_string, ctx.list_head, heredoc_cnt, input);
                                         if (heredoc_cnt != 0)
-                                                goto parse_error;
+                                                goto parse_error_exitcode1;
                                 }
                                 ctx.is_assignment = MAYBE_ASSIGNMENT;
                                 debug_printf_parse("ctx.is_assignment='%s'\n", assignment_flag[ctx.is_assignment]);
@@ -5517,7 +5545,7 @@ static struct pipe *parse_stream(char **pstring,
 #endif
                 ) {
                         if (done_word(&ctx)) {
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         done_pipe(&ctx, PIPE_SEQ);
                         ctx.is_assignment = MAYBE_ASSIGNMENT;
@@ -5538,7 +5566,7 @@ static struct pipe *parse_stream(char **pstring,
                                         /* Example: bare "{ }", "()" */
                                         G.last_exitcode = 2; /* bash compat */
                                         syntax_error_unexpected_ch(ch);
-                                        goto parse_error2;
+                                        goto parse_error;
                                 }
                                 if (heredoc_cnt_ptr)
                                         *heredoc_cnt_ptr = heredoc_cnt;
@@ -5560,7 +5588,7 @@ static struct pipe *parse_stream(char **pstring,
                 case '>':
                         redir_fd = redirect_opt_num(&ctx.word);
                         if (done_word(&ctx)) {
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         redir_style = REDIRECT_OVERWRITE;
                         if (next == '>') {
@@ -5571,16 +5599,16 @@ static struct pipe *parse_stream(char **pstring,
 #if 0
                         else if (next == '(') {
                                 syntax_error(">(process) not supported");
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
 #endif
                         if (parse_redirect(&ctx, redir_fd, redir_style, input))
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         continue; /* get next char */
                 case '<':
                         redir_fd = redirect_opt_num(&ctx.word);
                         if (done_word(&ctx)) {
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         redir_style = REDIRECT_INPUT;
                         if (next == '<') {
@@ -5597,11 +5625,11 @@ static struct pipe *parse_stream(char **pstring,
 #if 0
                         else if (next == '(') {
                                 syntax_error("<(process) not supported");
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
 #endif
                         if (parse_redirect(&ctx, redir_fd, redir_style, input))
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         continue; /* get next char */
                 case '#':
                         if (ctx.word.length == 0 && !ctx.word.has_quoted_part) {
@@ -5655,7 +5683,7 @@ static struct pipe *parse_stream(char **pstring,
                         if (!parse_dollar(&ctx.as_string, &ctx.word, input, /*quote_mask:*/ 0)) {
                                 debug_printf_parse("parse_stream parse error: "
                                         "parse_dollar returned 0 (error)\n");
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         continue; /* get next char */
                 case '"':
@@ -5671,7 +5699,7 @@ static struct pipe *parse_stream(char **pstring,
                         if (ctx.is_assignment == NOT_ASSIGNMENT)
                                 ctx.word.o_expflags |= EXP_FLAG_ESC_GLOB_CHARS;
                         if (!encode_string(&ctx.as_string, &ctx.word, input, '"'))
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         ctx.word.o_expflags &= ~EXP_FLAG_ESC_GLOB_CHARS;
                         continue; /* get next char */
 #if ENABLE_HUSH_TICK
@@ -5682,7 +5710,7 @@ static struct pipe *parse_stream(char **pstring,
                         o_addchr(&ctx.word, '`');
                         USE_FOR_NOMMU(pos = ctx.word.length;)
                         if (!add_till_backquote(&ctx.word, input, /*in_dquote:*/ 0))
-                                goto parse_error;
+                                goto parse_error_exitcode1;
 # if !BB_MMU
                         o_addstr(&ctx.as_string, ctx.word.data + pos);
                         o_addchr(&ctx.as_string, '`');
@@ -5697,7 +5725,7 @@ static struct pipe *parse_stream(char **pstring,
  case_semi:
 #endif
                         if (done_word(&ctx)) {
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         done_pipe(&ctx, PIPE_SEQ);
 #if ENABLE_HUSH_CASE
@@ -5724,7 +5752,7 @@ static struct pipe *parse_stream(char **pstring,
                         continue; /* get next char */
                 case '&':
                         if (done_word(&ctx)) {
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         if (next == '&') {
                                 ch = i_getch(input);
@@ -5736,7 +5764,7 @@ static struct pipe *parse_stream(char **pstring,
                         goto new_cmd;
                 case '|':
                         if (done_word(&ctx)) {
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
 #if ENABLE_HUSH_CASE
                         if (ctx.ctx_res_w == RES_MATCH)
@@ -5768,7 +5796,7 @@ static struct pipe *parse_stream(char **pstring,
                 case '{': {
                         int n = parse_group(&ctx, input, ch);
                         if (n < 0) {
-                                goto parse_error;
+                                goto parse_error_exitcode1;
                         }
                         debug_printf_heredoc("parse_group done, needs heredocs:%d\n", n);
                         heredoc_cnt += n;
@@ -5786,16 +5814,16 @@ static struct pipe *parse_stream(char **pstring,
                          * and it will match } earlier (not here). */
                         G.last_exitcode = 2;
                         syntax_error_unexpected_ch(ch);
-                        goto parse_error2;
+                        goto parse_error;
                 default:
                         if (HUSH_DEBUG)
                                 bb_error_msg_and_die("BUG: unexpected %c", ch);
                 }
         } /* while (1) */
 
- parse_error:
+ parse_error_exitcode1:
         G.last_exitcode = 1;
- parse_error2:
+ parse_error:
         {
                 struct parse_context *pctx;
                 IF_HAS_KEYWORDS(struct parse_context *p2;)
@@ -6490,9 +6518,11 @@ static NOINLINE int expand_one_var(o_string *output, int n,
                          * Word is expanded to produce a glob pattern.
                          * Then var's value is matched to it and matching part removed.
                          */
-//FIXME: ${x#...${...}...}
-//should evaluate inner ${...} even if x is "" and no shrinking of it is possible -
-//inner ${...} may have side effects!
+                        /* bash compat: if x is "" and no shrinking of it is possible,
+                         * inner ${...} is not evaluated. Example:
+                         *  unset b; : ${a%${b=B}}; echo $b
+                         * assignment b=B only happens if $a is not "".
+                         */
                         if (val && val[0]) {
                                 char *t;
                                 char *exp_exp_word;
@@ -6531,7 +6561,12 @@ static NOINLINE int expand_one_var(o_string *output, int n,
                          * and if // is used, it is encoded as \:
                          * var\pattern<SPECIAL_VAR_SYMBOL>repl<SPECIAL_VAR_SYMBOL>
                          */
-                        if (val && val[0]) {
+                        /* bash compat: if var is "", both pattern and repl
+                         * are still evaluated, if it is unset, then not:
+                         * unset b; a=; : ${a/z/${b=3}}; echo $b      # b=3
+                         * unset b; unset a; : ${a/z/${b=3}}; echo $b # b not set
+                         */
+                        if (val /*&& val[0]*/) {
                                 /* pattern uses non-standard expansion.
                                  * repl should be unbackslashed and globbed
                                  * by the usual expansion rules:
@@ -6567,8 +6602,9 @@ static NOINLINE int expand_one_var(o_string *output, int n,
                                 free(pattern);
                                 free(repl);
                         } else {
-                                /* Empty variable always gives nothing */
-                                // "v=''; echo ${v/*/w}" prints "", not "w"
+                                /* Unset variable always gives nothing */
+                                //  a=; echo ${a/*/w}      # "w"
+                                //  unset a; echo ${a/*/w} # ""
                                 /* Just skip "replace" part */
                                 *p++ = SPECIAL_VAR_SYMBOL;
                                 p = strchr(p, SPECIAL_VAR_SYMBOL);
@@ -6583,40 +6619,48 @@ static NOINLINE int expand_one_var(o_string *output, int n,
                          * var:N<SPECIAL_VAR_SYMBOL>M<SPECIAL_VAR_SYMBOL>
                          */
                         arith_t beg, len;
+                        unsigned vallen;
                         const char *errmsg;
 
                         beg = expand_and_evaluate_arith(exp_word, &errmsg);
                         if (errmsg)
-                                goto arith_err;
+                                goto empty_result;
                         debug_printf_varexp("beg:'%s'=%lld\n", exp_word, (long long)beg);
                         *p++ = SPECIAL_VAR_SYMBOL;
                         exp_word = p;
                         p = strchr(p, SPECIAL_VAR_SYMBOL);
                         *p = '\0';
-                        len = expand_and_evaluate_arith(exp_word, &errmsg);
-                        if (errmsg)
-                                goto arith_err;
-                        debug_printf_varexp("len:'%s'=%lld\n", exp_word, (long long)len);
+                        vallen = val ? strlen(val) : 0;
                         if (beg < 0) {
                                 /* negative beg counts from the end */
-                                beg = (arith_t)strlen(val) + beg;
-                                if (beg < 0) /* ${v: -999999} is "" */
-                                        beg = len = 0;
+                                beg = (arith_t)vallen + beg;
+                        }
+                        /* If expansion will be empty, do not even evaluate len */
+                        if (!val || beg < 0 || beg > vallen) {
+                                /* Why > vallen, not >=? bash:
+                                 * unset b; a=ab; : ${a:2:${b=3}}; echo $b  # "", b=3 (!!!)
+                                 * unset b; a=a; : ${a:2:${b=3}}; echo $b   # "", b not set
+                                 */
+                                goto empty_result;
                         }
+                        len = expand_and_evaluate_arith(exp_word, &errmsg);
+                        if (errmsg)
+                                goto empty_result;
+                        debug_printf_varexp("len:'%s'=%lld\n", exp_word, (long long)len);
                         debug_printf_varexp("from val:'%s'\n", val);
                         if (len < 0) {
                                 /* in bash, len=-n means strlen()-n */
-                                len = (arith_t)strlen(val) - beg + len;
+                                len = (arith_t)vallen - beg + len;
                                 if (len < 0) /* bash compat */
                                         msg_and_die_if_script("%s: substring expression < 0", var);
                         }
-                        if (len <= 0 || !val || beg >= strlen(val)) {
- arith_err:
+                        if (len <= 0 || !val /*|| beg >= vallen*/) {
+ empty_result:
                                 val = NULL;
                         } else {
                                 /* Paranoia. What if user entered 9999999999999
                                  * which fits in arith_t but not int? */
-                                if (len >= INT_MAX)
+                                if (len > INT_MAX)
                                         len = INT_MAX;
                                 val = to_be_freed = xstrndup(val + beg, len);
                         }
@@ -6650,12 +6694,13 @@ static NOINLINE int expand_one_var(o_string *output, int n,
                          *
                          * Word-splitting and single quote behavior:
                          *
-                         * $ f() { for i; do echo "|$i|"; done; };
+                         * $ f() { for i; do echo "|$i|"; done; }
                          *
-                         * $ x=; f ${x:?'x y' z}
-                         * bash: x: x y z              #BUG: does not abort, ${} results in empty expansion
+                         * $ x=; f ${x:?'x y' z}; echo $?
+                         * bash: x: x y z       # neither f nor "echo $?" executes
+                         * (if interactive, bash does not exit, but merely aborts to prompt. $? is set to 1)
                          * $ x=; f "${x:?'x y' z}"
-                         * bash: x: x y z       # dash prints: dash: x: 'x y' z   #BUG: does not abort, ${} results in ""
+                         * bash: x: x y z       # dash prints: dash: x: 'x y' z
                          *
                          * $ x=; f ${x:='x y' z}
                          * |x|
@@ -7743,7 +7788,11 @@ static void restore_redirects(struct squirrel *sq)
                 free(sq);
         }
         if (G.HFILE_stdin
-         && G.HFILE_stdin->fd != STDIN_FILENO
+         && G.HFILE_stdin->fd > STDIN_FILENO
+        /* we compare > STDIN, not == STDIN, since hfgetc()
+         * closes fd and sets ->fd to -1 if EOF is reached.
+         * Testcase: echo 'pwd' | hush
+         */
         ) {
                 /* Testcase: interactive "read r <FILE; echo $r; read r; echo $r".
                  * Redirect moves ->fd to e.g. 10,
@@ -8136,7 +8185,6 @@ static void exec_function(char ***to_free,
 
         /* On MMU, funcp->body is always non-NULL */
         n = run_list(funcp->body);
-        fflush_all();
         _exit(n);
 # else
 //?     close_saved_fds_and_FILE_fds();
@@ -8211,7 +8259,6 @@ static void exec_builtin(char ***to_free,
 {
 #if BB_MMU
         int rcode;
-        fflush_all();
 //?     close_saved_fds_and_FILE_fds();
         rcode = x->b_function(argv);
         fflush_all();
@@ -8715,6 +8762,7 @@ static int process_wait_result(struct pipe *fg_pipe, pid_t childpid, int status)
                                  */
                                 if (WIFSIGNALED(status)) {
                                         int sig = WTERMSIG(status);
+#if ENABLE_HUSH_JOB
                                         if (G.run_list_level == 1
                                         /* ^^^^^ Do not print in nested contexts, example:
                                          * echo `sleep 1; sh -c 'kill -9 $$'` - prints "137", NOT "Killed 137"
@@ -8724,10 +8772,12 @@ static int process_wait_result(struct pipe *fg_pipe, pid_t childpid, int status)
                                                 /* strsignal() is for bash compat. ~600 bloat versus bbox's get_signame() */
                                                 puts(sig == SIGINT || sig == SIGPIPE ? "" : strsignal(sig));
                                         }
+#endif
                                         /* TODO: if (WCOREDUMP(status)) + " (core dumped)"; */
-                                        /* TODO: MIPS has 128 sigs (1..128), what if sig==128 here?
-                                         * Maybe we need to use sig | 128? */
-                                        ex = sig + 128;
+                                        /* MIPS has 128 sigs (1..128), if sig==128,
+                                         * 128 + sig would result in exitcode 256 -> 0!
+                                         */
+                                        ex = 128 | sig;
                                 }
                                 fg_pipe->cmds[i].cmd_exitcode = ex;
                         } else {
@@ -8774,7 +8824,8 @@ static int process_wait_result(struct pipe *fg_pipe, pid_t childpid, int status)
                 /* child exited */
                 int rcode = WEXITSTATUS(status);
                 if (WIFSIGNALED(status))
-                        rcode = 128 + WTERMSIG(status);
+                        /* NB: not 128 + sig, MIPS has sig 128 */
+                        rcode = 128 | WTERMSIG(status);
                 pi->cmds[i].cmd_exitcode = rcode;
                 if (G.last_bg_pid == pi->cmds[i].pid)
                         G.last_bg_pid_exitcode = rcode;
@@ -8894,10 +8945,10 @@ static int checkjobs(struct pipe *fg_pipe, pid_t waitfor_pid)
                         debug_printf_exec("childpid==waitfor_pid:%d status:0x%08x\n", childpid, status);
                         rcode = WEXITSTATUS(status);
                         if (WIFSIGNALED(status))
-                                rcode = 128 + WTERMSIG(status);
+                                rcode = 128 | WTERMSIG(status);
                         if (WIFSTOPPED(status))
-                                /* bash: "cmd & wait $!" and cmd stops: $? = 128 + stopsig */
-                                rcode = 128 + WSTOPSIG(status);
+                                /* bash: "cmd & wait $!" and cmd stops: $? = 128 | stopsig */
+                                rcode = 128 | WSTOPSIG(status);
                         rcode++;
                         break; /* "wait PID" called us, give it exitcode+1 */
                 }
@@ -9287,7 +9338,7 @@ static NOINLINE int run_pipe(struct pipe *pi)
                          * during builtin/nofork.
                          */
                         if (sigismember(&G.pending_set, SIGINT))
-                                rcode = 128 + SIGINT;
+                                rcode = 128 | SIGINT;
                 }
                 free(argv_expanded);
                 IF_HAS_KEYWORDS(if (pi->pi_inverted) rcode = !rcode;)
@@ -9972,11 +10023,14 @@ static int set_mode(int state, char mode, const char *o_opt)
 int hush_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int hush_main(int argc, char **argv)
 {
+        pid_t cached_getpid;
         enum {
                 OPT_login = (1 << 0),
         };
         unsigned flags;
-        unsigned builtin_argc;
+#if !BB_MMU
+        unsigned builtin_argc = 0;
+#endif
         char **e;
         struct variable *cur_var;
         struct variable *shell_ver;
@@ -9998,6 +10052,10 @@ int hush_main(int argc, char **argv)
         G.argv0_for_re_execing = argv[0];
 #endif
 
+        cached_getpid = getpid();   /* for tcsetpgrp() during init */
+        G.root_pid = cached_getpid; /* for $PID  (NOMMU can override via -$HEXPID:HEXPPID:...) */
+        G.root_ppid = getppid();    /* for $PPID (NOMMU can override)  */
+
         /* Deal with HUSH_VERSION */
         debug_printf_env("unsetenv '%s'\n", "HUSH_VERSION");
         unsetenv("HUSH_VERSION"); /* in case it exists in initial env */
@@ -10080,6 +10138,17 @@ int hush_main(int argc, char **argv)
          * PS4='+ '
          */
 
+#if NUM_SCRIPTS > 0
+        if (argc < 0) {
+                char *script = get_script_content(-argc - 1);
+                G.global_argv = argv;
+                G.global_argc = string_array_len(argv);
+                //install_special_sighandlers(); - needed?
+                parse_and_run_string(script);
+                goto final_return;
+        }
+#endif
+
         /* Initialize some more globals to non-zero values */
         die_func = restore_ttypgrp_and__exit;
 
@@ -10093,17 +10162,9 @@ int hush_main(int argc, char **argv)
         /* Parse options */
         /* http://www.opengroup.org/onlinepubs/9699919799/utilities/sh.html */
         flags = (argv[0] && argv[0][0] == '-') ? OPT_login : 0;
-        builtin_argc = 0;
-#if NUM_SCRIPTS > 0
-        if (argc < 0) {
-                optarg = get_script_content(-argc - 1);
-                optind = 0;
-                argc = string_array_len(argv);
-                goto run_script;
-        }
-#endif
         while (1) {
-                int opt = getopt(argc, argv, "+c:exinsl"
+                int opt = getopt(argc, argv, "+" /* stop at 1st non-option */
+                                "cexinsl"
 #if !BB_MMU
                                 "<:$:R:V:"
 # if ENABLE_HUSH_FUNCTIONS
@@ -10115,50 +10176,11 @@ int hush_main(int argc, char **argv)
                         break;
                 switch (opt) {
                 case 'c':
-                        /* Possibilities:
-                         * sh ... -c 'script'
-                         * sh ... -c 'script' ARG0 [ARG1...]
-                         * On NOMMU, if builtin_argc != 0,
-                         * sh ... -c 'builtin' BARGV... "" ARG0 [ARG1...]
-                         * "" needs to be replaced with NULL
-                         * and BARGV vector fed to builtin function.
-                         * Note: the form without ARG0 never happens:
-                         * sh ... -c 'builtin' BARGV... ""
+                        /* Note: -c is not an option with param!
+                         * "hush -c -l SCRIPT" is valid. "hush -cSCRIPT" is not.
                          */
-#if NUM_SCRIPTS > 0
- run_script:
-#endif
-                        if (!G.root_pid) {
-                                G.root_pid = getpid();
-                                G.root_ppid = getppid();
-                        }
-                        G.global_argv = argv + optind;
-                        G.global_argc = argc - optind;
-                        if (builtin_argc) {
-                                /* -c 'builtin' [BARGV...] "" ARG0 [ARG1...] */
-                                const struct built_in_command *x;
-
-                                install_special_sighandlers();
-                                x = find_builtin(optarg);
-                                if (x) { /* paranoia */
-                                        G.global_argc -= builtin_argc; /* skip [BARGV...] "" */
-                                        G.global_argv += builtin_argc;
-                                        G.global_argv[-1] = NULL; /* replace "" */
-                                        fflush_all();
-                                        G.last_exitcode = x->b_function(argv + optind - 1);
-                                }
-                                goto final_return;
-                        }
                         G.opt_c = 1;
-                        if (!G.global_argv[0]) {
-                                /* -c 'script' (no params): prevent empty $0 */
-                                G.global_argv--; /* points to argv[i] of 'script' */
-                                G.global_argv[0] = argv[0];
-                                G.global_argc++;
-                        } /* else -c 'script' ARG0 [ARG1...]: $0 is ARG0 */
-                        install_special_sighandlers();
-                        parse_and_run_string(optarg);
-                        goto final_return;
+                        break;
                 case 'i':
                         /* Well, we cannot just declare interactiveness,
                          * we have to have some stuff (ctty, etc) */
@@ -10205,6 +10227,11 @@ int hush_main(int argc, char **argv)
                         optarg++;
                         G.depth_of_loop = bb_strtou(optarg, &optarg, 16);
 # endif
+                        /* Suppress "killed by signal" message, -$ hack is used
+                         * for subshells: echo `sh -c 'kill -9 $$'`
+                         * should be silent.
+                         */
+                        IF_HUSH_JOB(G.run_list_level = 1;)
 # if ENABLE_HUSH_FUNCTIONS
                         /* nommu uses re-exec trick for "... | func | ...",
                          * should allow "return".
@@ -10229,19 +10256,14 @@ int hush_main(int argc, char **argv)
                 }
 # endif
 #endif
-                case 'n':
-                case 'x':
-                case 'e':
+                /*case '?': invalid option encountered (set_mode('?') will fail) */
+                /*case 'n':*/
+                /*case 'x':*/
+                /*case 'e':*/
+                default:
                         if (set_mode(1, opt, NULL) == 0) /* no error */
                                 break;
-                default:
-#ifndef BB_VER
-                        fprintf(stderr, "Usage: sh [FILE]...\n"
-                                        "   or: sh -c command [args]...\n\n");
-                        exit(EXIT_FAILURE);
-#else
                         bb_show_usage();
-#endif
                 }
         } /* option parsing loop */
 
@@ -10250,16 +10272,14 @@ int hush_main(int argc, char **argv)
         G.global_argv = argv + (optind - 1);
         G.global_argv[0] = argv[0];
 
-        if (!G.root_pid) {
-                G.root_pid = getpid();
-                G.root_ppid = getppid();
-        }
-
         /* If we are login shell... */
         if (flags & OPT_login) {
+                const char *hp = NULL;
                 HFILE *input;
+
                 debug_printf("sourcing /etc/profile\n");
                 input = hfopen("/etc/profile");
+ run_profile:
                 if (input != NULL) {
                         install_special_sighandlers();
                         parse_and_run_file(input);
@@ -10272,6 +10292,64 @@ int hush_main(int argc, char **argv)
                  * bash also sources ~/.bash_logout on exit.
                  * If called as sh, skips .bash_XXX files.
                  */
+                if (!hp) { /* unless we looped on the "goto" already */
+                        hp = get_local_var_value("HOME");
+                        if (hp && hp[0]) {
+                                debug_printf("sourcing ~/.profile\n");
+                                hp = concat_path_file(hp, ".profile");
+                                input = hfopen(hp);
+                                free((char*)hp);
+                                goto run_profile;
+                        }
+                }
+        }
+
+        /* -c takes effect *after* -l */
+        if (G.opt_c) {
+                /* Possibilities:
+                 * sh ... -c 'script'
+                 * sh ... -c 'script' ARG0 [ARG1...]
+                 * On NOMMU, if builtin_argc != 0,
+                 * sh ... -c 'builtin' BARGV... "" ARG0 [ARG1...]
+                 * "" needs to be replaced with NULL
+                 * and BARGV vector fed to builtin function.
+                 * Note: the form without ARG0 never happens:
+                 * sh ... -c 'builtin' BARGV... ""
+                 */
+                char *script;
+
+                install_special_sighandlers();
+
+                G.global_argc--;
+                G.global_argv++;
+#if !BB_MMU
+                if (builtin_argc) {
+                        /* -c 'builtin' [BARGV...] "" ARG0 [ARG1...] */
+                        const struct built_in_command *x;
+                        x = find_builtin(G.global_argv[0]);
+                        if (x) { /* paranoia */
+                                argv = G.global_argv;
+                                G.global_argc -= builtin_argc + 1; /* skip [BARGV...] "" */
+                                G.global_argv += builtin_argc + 1;
+                                G.global_argv[-1] = NULL; /* replace "" */
+                                G.last_exitcode = x->b_function(argv);
+                        }
+                        goto final_return;
+                }
+#endif
+
+                script = G.global_argv[0];
+                if (!script)
+                        bb_error_msg_and_die(bb_msg_requires_arg, "-c");
+                if (!G.global_argv[1]) {
+                        /* -c 'script' (no params): prevent empty $0 */
+                        G.global_argv[0] = argv[0];
+                } else { /* else -c 'script' ARG0 [ARG1...]: $0 is ARG0 */
+                        G.global_argc--;
+                        G.global_argv++;
+                }
+                parse_and_run_string(script);
+                goto final_return;
         }
 
         /* -s is: hush -s ARGV1 ARGV2 (no SCRIPT) */
@@ -10363,7 +10441,7 @@ int hush_main(int argc, char **argv)
                          * (bash, too, does this only if ctty is available) */
                         bb_setpgrp(); /* is the same as setpgid(our_pid, our_pid); */
                         /* Grab control of the terminal */
-                        tcsetpgrp(G_interactive_fd, getpid());
+                        tcsetpgrp(G_interactive_fd, cached_getpid);
                 }
                 enable_restore_tty_pgrp_on_exit();
 
@@ -10456,7 +10534,7 @@ static int FAST_FUNC builtin_true(char **argv UNUSED_PARAM)
 }
 
 #if ENABLE_HUSH_TEST || ENABLE_HUSH_ECHO || ENABLE_HUSH_PRINTF || ENABLE_HUSH_KILL
-static int run_applet_main(char **argv, int (*applet_main_func)(int argc, char **argv))
+static NOINLINE int run_applet_main(char **argv, int (*applet_main_func)(int argc, char **argv))
 {
         int argc = string_array_len(argv);
         return applet_main_func(argc, argv);
@@ -11662,7 +11740,7 @@ static int wait_for_child_or_signal(struct pipe *waitfor_pipe, pid_t waitfor_pid
                 sig = check_and_run_traps();
                 if (sig /*&& sig != SIGCHLD - always true */) {
                         /* Do this for any (non-ignored) signal, not only for ^C */
-                        ret = 128 + sig;
+                        ret = 128 | sig;
                         break;
                 }
                 /* SIGCHLD, or no signal, or ignored one, such as SIGQUIT. Repeat */
@@ -11762,7 +11840,7 @@ static int FAST_FUNC builtin_wait(char **argv)
                         process_wait_result(NULL, pid, status);
                         ret = WEXITSTATUS(status);
                         if (WIFSIGNALED(status))
-                                ret = 128 + WTERMSIG(status);
+                                ret = 128 | WTERMSIG(status);
                 }
         } while (*++argv);
 
diff --git a/shell/hush_test/hush-misc/piped_input.right b/shell/hush_test/hush-misc/piped_input.right
new file mode 100644
index 000000000..7b8bf6758
--- /dev/null
+++ b/shell/hush_test/hush-misc/piped_input.right
@@ -0,0 +1,2 @@
+TEST
+One:1
diff --git a/shell/hush_test/hush-misc/piped_input.tests b/shell/hush_test/hush-misc/piped_input.tests
new file mode 100755
index 000000000..929fec0db
--- /dev/null
+++ b/shell/hush_test/hush-misc/piped_input.tests
@@ -0,0 +1,3 @@
+exec 2>&1
+echo 'echo TEST; false' | $THIS_SH
+echo One:$?
diff --git a/shell/hush_test/hush-vars/var_bash_repl_empty_var.right b/shell/hush_test/hush-vars/var_bash_repl_empty_var.right
index 892916783..a8d1a3bef 100644
--- a/shell/hush_test/hush-vars/var_bash_repl_empty_var.right
+++ b/shell/hush_test/hush-vars/var_bash_repl_empty_var.right
@@ -1,2 +1,3 @@
 
+w
 Ok:0
diff --git a/shell/hush_test/hush-vars/var_bash_repl_empty_var.tests b/shell/hush_test/hush-vars/var_bash_repl_empty_var.tests
index 73a43d38e..22aaba560 100755
--- a/shell/hush_test/hush-vars/var_bash_repl_empty_var.tests
+++ b/shell/hush_test/hush-vars/var_bash_repl_empty_var.tests
@@ -1,3 +1,5 @@
+unset v
+echo ${v/*/w}
 v=''
 echo ${v/*/w}
 echo Ok:$?
diff --git a/shell/shell_common.c b/shell/shell_common.c
index a6ee60851..1897fee3b 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -393,12 +393,18 @@ struct limits {
         uint8_t factor_shift;   /* shift by to get rlim_{cur,max} values */
 };
 
-static const struct limits limits_tbl[] = {
+/* Order of entries matches order in which bash prints "ulimit -a" */
+static const struct limits limits_tbl[] ALIGN2 = {
         { RLIMIT_CORE,          9,      }, // -c
         { RLIMIT_DATA,          10,     }, // -d
+#ifdef RLIMIT_NICE
         { RLIMIT_NICE,          0,      }, // -e
-        { RLIMIT_FSIZE,         9,      }, // -f
 #define LIMIT_F_IDX     3
+#else
+/* for example, Hurd */
+#define LIMIT_F_IDX     2
+#endif
+        { RLIMIT_FSIZE,         9,      }, // -f
 #ifdef RLIMIT_SIGPENDING
         { RLIMIT_SIGPENDING,    0,      }, // -i
 #endif
@@ -433,13 +439,16 @@ static const struct limits limits_tbl[] = {
         { RLIMIT_LOCKS,         0,      }, // -x
 #endif
 };
-// bash also shows:
+// 1) bash also shows:
 //pipe size            (512 bytes, -p) 8
+// 2) RLIMIT_RTTIME ("timeout for RT tasks in us") is not in the table
 
 static const char limits_help[] ALIGN1 =
         "core file size (blocks)"          // -c
         "\0""data seg size (kb)"           // -d
+#ifdef RLIMIT_NICE
         "\0""scheduling priority"          // -e
+#endif
         "\0""file size (blocks)"           // -f
 #ifdef RLIMIT_SIGPENDING
         "\0""pending signals"              // -i
@@ -479,7 +488,9 @@ static const char limits_help[] ALIGN1 =
 static const char limit_chars[] ALIGN1 =
                         "c"
                         "d"
+#ifdef RLIMIT_NICE
                         "e"
+#endif
                         "f"
 #ifdef RLIMIT_SIGPENDING
                         "i"
@@ -520,7 +531,9 @@ static const char limit_chars[] ALIGN1 =
 static const char ulimit_opt_string[] ALIGN1 = "-HSa"
                         "c::"
                         "d::"
+#ifdef RLIMIT_NICE
                         "e::"
+#endif
                         "f::"
 #ifdef RLIMIT_SIGPENDING
                         "i::"
@@ -737,7 +750,7 @@ shell_builtin_ulimit(char **argv)
 
         if (opt_cnt == 0) {
                 /* "bare ulimit": treat it as if it was -f */
-                getrlimit(limits_tbl[LIMIT_F_IDX].cmd, &limit);
+                getrlimit(RLIMIT_FSIZE, &limit);
                 printlim(opts, &limit, &limits_tbl[LIMIT_F_IDX]);
         }
 
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index c0ec1c0bf..82596bc0b 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -100,7 +100,7 @@ static void klogd_close(void)
 #else
 
 # ifndef _PATH_KLOG
-#  ifdef __GNU__
+#  if defined(__GNU__) || defined (__FreeBSD__)
 #   define _PATH_KLOG "/dev/klog"
 #  else
 #   error "your system's _PATH_KLOG is unknown"
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 4d692d6fc..9422b6ea7 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -21,7 +21,7 @@
 //kbuild:lib-$(CONFIG_LOGGER) += syslogd_and_logger.o
 
 //usage:#define logger_trivial_usage
-//usage:       "[OPTIONS] [MESSAGE]"
+//usage:       "[-s] [-t TAG] [-p PRIO] [MESSAGE]"
 //usage:#define logger_full_usage "\n\n"
 //usage:       "Write MESSAGE (or stdin) to syslog\n"
 //usage:     "\n        -s      Log to stderr as well as the system log"
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index 1e1f1347f..b52dc9cac 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -180,7 +180,7 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
                         if (cur == shbuf_tail) {
                                 sem_up(log_semid);
                                 fflush_all();
-                                sleep(1); /* TODO: replace me with a sleep_on */
+                                sleep1(); /* TODO: replace me with a sleep_on */
                                 continue;
                         }
                 }
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index f61da9de5..6ddfd771a 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -842,7 +842,7 @@ static void timestamp_and_log(int pri, char *msg, int len)
 #if ENABLE_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS
         if (!timestamp) {
                 struct timeval tv;
-                gettimeofday(&tv, NULL);
+                xgettimeofday(&tv);
                 now = tv.tv_sec;
                 timestamp = ctime(&now) + 4; /* skip day of week */
                 /* overwrite year by milliseconds, zero terminate */
@@ -1034,6 +1034,7 @@ static void do_syslogd(void)
                 kmsg_init();
 
         timestamp_and_log_internal("syslogd started: BusyBox v" BB_VER);
+        write_pidfile_std_path_and_ext("syslogd");
 
         while (!bb_got_signal) {
                 ssize_t sz;
@@ -1182,9 +1183,6 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
                 bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
         }
 
-        //umask(0); - why??
-        write_pidfile_std_path_and_ext("syslogd");
-
         do_syslogd();
         /* return EXIT_SUCCESS; */
 }
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index 87f6b5007..92c83d719 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -398,5 +398,19 @@ testing 'awk do not allow "str"++' \
         '' \
         'anything'
 
+# gawk compat: FS regex matches only non-empty separators:
+# with -*, the splitting is NOT f o o b a r, but foo bar:
+testing 'awk FS regex which can match empty string' \
+        "awk -F '-*' '{print \$1 \"-\" \$2 \"=\" \$3 \"*\" \$4}'" \
+        "foo-bar=*\n" \
+        '' \
+        'foo--bar'
+
+# last+1 field should be empty (had a bug where it wasn't)
+testing 'awk $NF is empty' \
+        "awk -F '=+' '{print \$NF}'" \
+        "\n" \
+        '' \
+        'a=====123='
 
 exit $FAILCOUNT
diff --git a/testsuite/dc_add_results.txt b/testsuite/dc_add_results.txt
index 542a62ea3..2d955935f 100644
--- a/testsuite/dc_add_results.txt
+++ b/testsuite/dc_add_results.txt
@@ -9,9 +9,9 @@
 1998
 324869359109479
 2378639108055453348401
-78562139406792834691802347619083467219846713490861872324967138636055\
-45508706362018540498696043776980521464405852627147161556994835657433\
-00967298
+785621394067928346918023476190834672198467134908618723249671386360554\
+550870636201854049869604377698052146440585262714716155699483565743300\
+967298
 1.1
 1.1
 37842935130118.1187478621432354
@@ -20,21 +20,21 @@
 -2
 -19
 -1287904651762470260258
-100000000000000000000000000000000000000000000000000000000000.0000000\
-00000000000000000000000000000000000000000000000000000000000000000000\
-000000000000000000000000000000000000000000000
-100000000000000000000000000000000000000000000000000000000000.0000000\
-00000000000000000000000000000000000000000000000000000000000000000000\
-000000000000000000000000000000000000000000000
-100000000000000000000000000000000000000000000000000000000000.0000000\
-00000000000000000000000000000000000000000000000000000000000000000000\
-000000000000000000000000000000000000000009999
-99999999999999999999999999999999999999999999999999999999999.99999999\
-99999999999999999999999999999999999999999999999999000000000000000000\
-00000000000000000000000000000000000000009999
-99999999999999999999999999999999999990000000000000000000000.00000000\
-00000000000000000000000000000000000000000000000000000000000000000000\
-00000000000000000000000000000000000000009999
+100000000000000000000000000000000000000000000000000000000000.00000000\
+000000000000000000000000000000000000000000000000000000000000000000000\
+0000000000000000000000000000000000000000000
+100000000000000000000000000000000000000000000000000000000000.00000000\
+000000000000000000000000000000000000000000000000000000000000000000000\
+0000000000000000000000000000000000000000000
+100000000000000000000000000000000000000000000000000000000000.00000000\
+000000000000000000000000000000000000000000000000000000000000000000000\
+0000000000000000000000000000000000000009999
+99999999999999999999999999999999999999999999999999999999999.999999999\
+999999999999999999999999999999999999999999999999900000000000000000000\
+000000000000000000000000000000000000009999
+99999999999999999999999999999999999990000000000000000000000.000000000\
+000000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000009999
 122761518
 -14338.391079082
 -2422295.6865057444
diff --git a/testsuite/dc_decimal_results.txt b/testsuite/dc_decimal_results.txt
index 275d431c6..66bb91ac3 100644
--- a/testsuite/dc_decimal_results.txt
+++ b/testsuite/dc_decimal_results.txt
@@ -9,19 +9,17 @@
 123
 7505
 1023468723275435238491972521917846
-43434724324317058673920735170382703980273527090273892739207390379379\
-60379637893607893607893670530278200795207952702873892786172916728961\
-78390789360741897358785738607967926792673752073092537298378279365279\
-3
+434347243243170586739207351703827039802735270902738927392073903793796\
+037963789360789360789367053027820079520795270287389278617291672896178\
+3907893607418973587857386079679267926737520730925372983782793652793
 -1
 -203
 -57
 -18586
 -31378682943772818461924738352952347258
--8239456287456735894950672387239865203756982376208346745096273452730\
-96287563846592384526349872634895763257893467523987578690283762897568\
-45907234875807107108781350187590812735901871502384171023987230138727\
-8
+-82394562874567358949506723872398652037569823762083467450962734527309\
+628756384659238452634987263489576325789346752398757869028376289756845\
+9072348758071071087813501875908127359018715023841710239872301387278
 .123521346523546
 .1245923756273856
 -.1024678456387
@@ -31,21 +29,21 @@
 234237468293576.000000000000000000000000000000
 23987623568943567.00000000000000000005677834650000000000000
 23856934568940675.000000000000000435676782300000000000000456784
-77567648698496.00000000000000000058767475000000000045856380000000000\
-0000
-2348672354968723.237482354600000000000325698739450234689243562387000\
-0000034578
+77567648698496.000000000000000000587674750000000000458563800000000000\
+000
+2348672354968723.2374823546000000000003256987394502346892435623870000\
+000034578
 -2354768.000000000000000000000000000000000000
 -96739874567.000000000347683456
 -3764568345.000000000004573845000000347683460
 -356784356.934568495770004586495678300000000
-74325437345273852773827101738273127312738521733017537073520735207307\
-570358738257390761276072160719802671980267018728630178.7082681027680\
-52176021786784127612768127086782782176817317820783071097801773817867\
-8012767377058785378278207385237085237803278203782037237582795870
--7567527327852738512737285378527382578372836789657385273852729836783\
-72867327835672967385278372637862738627836279863782673862783670.71738\
-17836173871836718637861073861783678160376017836701860376017810773527\
-8372832783728367826738627836278378260736270367362073867097307925
-9812734012837410982345719208345712908357412903587192048571920458712.\
-23957182459817249058172945781
+743254373452738527738271017382731273127385217330175370735207352073075\
+70358738257390761276072160719802671980267018728630178.708268102768052\
+176021786784127612768127086782782176817317820783071097801773817867801\
+2767377058785378278207385237085237803278203782037237582795870
+-75675273278527385127372853785273825783728367896573852738527298367837\
+2867327835672967385278372637862738627836279863782673862783670.7173817\
+836173871836718637861073861783678160376017836701860376017810773527837\
+2832783728367826738627836278378260736270367362073867097307925
+9812734012837410982345719208345712908357412903587192048571920458712.2\
+3957182459817249058172945781
diff --git a/testsuite/dc_divmod_results.txt b/testsuite/dc_divmod_results.txt
index c55e9303d..ee91ee88c 100644
--- a/testsuite/dc_divmod_results.txt
+++ b/testsuite/dc_divmod_results.txt
@@ -58,8 +58,8 @@
 100864416620775.31076855630746548983
 -53336.193401942302558132911110799109649707477
 .00000000052530099381
-.0000000000000000000000000000000000000000000000000000000000000001907\
-266929376630027064745963897
+.00000000000000000000000000000000000000000000000000000000000000019072\
+66929376630027064745963897
 42612515855353136519261264261472677699404182.78776061098893912189
 0
 0
@@ -121,6 +121,6 @@
 100864416620775
 -3878923750692883.7238596702834756902
 0
-.0000000000000000000000000000000000000000000184866017689020776005643\
-3621086
+.00000000000000000000000000000000000000000001848660176890207760056433\
+621086
 42612515855353136519261264261472677699404182
diff --git a/testsuite/dc_multiply_results.txt b/testsuite/dc_multiply_results.txt
index 9666059a5..aaf3a20fc 100644
--- a/testsuite/dc_multiply_results.txt
+++ b/testsuite/dc_multiply_results.txt
@@ -15,8 +15,8 @@
 3543531533584430580556128344529291738
 568600835566479683035874339053.4411638427543228060
 7487566285885.8557453089005171423976251098
-373846412427291014394738378015501363938345620046.7869650248829232267\
-2297002026819
+373846412427291014394738378015501363938345620046.78696502488292322672\
+297002026819
 -1
 -2
 -2751507058396910892
diff --git a/testsuite/dc_power_results.txt b/testsuite/dc_power_results.txt
index 997f44f59..dc5d56766 100644
--- a/testsuite/dc_power_results.txt
+++ b/testsuite/dc_power_results.txt
@@ -10,15 +10,15 @@
 18927361346
 .23523785962738592635777
 328956734869213746.89782398457234
-16473742664221279051571200630760751138799221376964991600670000200609\
-08006052596520320731708604393844468006290371918262741885989163144389\
-39367835091560809036359941703341471396407660150658436796925310445979\
-21333166245765946557344383284626113908419359990042883048537750217279\
-17481980123593363177308481941550382845381799410533956718500484099889\
-610805653325917409549921909941664118421333562129
+164737426642212790515712006307607511387992213769649916006700002006090\
+800605259652032073170860439384446800629037191826274188598916314438939\
+367835091560809036359941703341471396407660150658436796925310445979213\
+331662457659465573443832846261139084193599900428830485377502172791748\
+198012359336317730848194155038284538179941053395671850048409988961080\
+5653325917409549921909941664118421333562129
 0
-43287877285033571298394739716218787350087163435619825150259705419.98\
-016445740928054425
+43287877285033571298394739716218787350087163435619825150259705419.980\
+16445740928054425
 1.00000000000000000000
 .50000000000000000000
 .10000000000000000000
@@ -31,27 +31,27 @@
 1
 -2
 4
-14997322375665265051328725757939209353051902095893907150382724666290\
-49749481660976421019742616298227588464420182758442163654172400528243\
-00885441207762486233574213374503090372518590691583139696652847404883\
-08573912261119588874308960204159666762789603037188471170006223907416\
-60492840269152716750700089148882139254399347568222390231015487895905\
-73727080561379177721440905866857248917982113340543176658480139248897\
-54802503253413282808814063861470711399810899724515727713334909764746\
-27910290211411231279325882505708287941671508154740003122373284699097\
-78346501539634198926772266511968381368929692275950529960923432771985\
-12597189390708050983487158873301681237787429436264801751664042999180\
-3448659818912436089
-11478830555358864333472551120140548480416206583184496764727387456058\
-792742209537931243951391229607936
+149973223756652650513287257579392093530519020958939071503827246662904\
+974948166097642101974261629822758846442018275844216365417240052824300\
+885441207762486233574213374503090372518590691583139696652847404883085\
+739122611195888743089602041596667627896030371884711700062239074166049\
+284026915271675070008914888213925439934756822239023101548789590573727\
+080561379177721440905866857248917982113340543176658480139248897548025\
+032534132828088140638614707113998108997245157277133349097647462791029\
+021141123127932588250570828794167150815474000312237328469909778346501\
+539634198926772266511968381368929692275950529960923432771985125971893\
+907080509834871588733016812377874294362648017516640429991803448659818\
+912436089
+114788305553588643334725511201405484804162065831844967647273874560587\
+92742209537931243951391229607936
 -.00000000000000017759
--2067373624686414405470850679965010694114490999957199847684803894306\
-56243666149296582304582679590231948238805965642713928910384741502707\
-.23224479257866798694
-11606078892843496082360561256965139908586179418605021706789617179085\
-85768049299693425729565480314913006780973928345684673490252494674985\
-0186164225375953066263609289359900615361965737717208159874390.293769\
-70206344604971
+-20673736246864144054708506799650106941144909999571998476848038943065\
+6243666149296582304582679590231948238805965642713928910384741502707.2\
+3224479257866798694
+116060788928434960823605612569651399085861794186050217067896171790858\
+576804929969342572956548031491300678097392834568467349025249467498501\
+86164225375953066263609289359900615361965737717208159874390.293769702\
+06344604971
 -1.00000000000000000000
 1.00000000000000000000
 -.50000000000000000000
@@ -59,14 +59,14 @@
 0
 0
 -.00000000000002874159
--1945134149489344891879057554905782841936258356736314337975569799825\
-94091939572752348215929683891336730843553721422164737465108229034947\
-87333189564755763444242676978610321731298729194092653999616928308494\
-26419468484566422775668903315088810746121307679948574976162519479931\
-18935243698160094347216562490000767121041786977792546155155934655909\
-14123833869470494708767968978717730012864171105540029928688274136791\
-98175053824022144065005509214813689232148489884560100200475909009813\
-340098100705258138.98542904577525702068
+-19451341494893448918790575549057828419362583567363143379755697998259\
+409193957275234821592968389133673084355372142216473746510822903494787\
+333189564755763444242676978610321731298729194092653999616928308494264\
+194684845664227756689033150888107461213076799485749761625194799311893\
+524369816009434721656249000076712104178697779254615515593465590914123\
+833869470494708767968978717730012864171105540029928688274136791981750\
+538240221440650055092148136892321484898845601002004759090098133400981\
+00705258138.98542904577525702068
 0
 0
 0
diff --git a/testsuite/dc_subtract_results.txt b/testsuite/dc_subtract_results.txt
index 9f7726254..0a9762381 100644
--- a/testsuite/dc_subtract_results.txt
+++ b/testsuite/dc_subtract_results.txt
@@ -8,15 +8,15 @@
 2874519803456326214611
 9000000000000000000000000000000000000001
 1
-9000000000000000000000000000000000000000.000000000000000000000000000\
-00000001
+9000000000000000000000000000000000000000.0000000000000000000000000000\
+0000001
 .0000000000000000000000000000000001
-9999999999999999999999999999999999999999.999999999999999999999999999\
+9999999999999999999999999999999999999999.9999999999999999999999999999\
+9999999999999999999999999999999999999999999999999999999999
+10000000000000000000000000000000000000000.999999999999999999999999999\
 99999999999999999999999999999999999999999999999999999999999
-10000000000000000000000000000000000000000.99999999999999999999999999\
-999999999999999999999999999999999999999999999999999999999999
-10000000000000000000000000000000000000000.00000000009999999999999999\
-99999999999999999999999999999999999999999999999999
+10000000000000000000000000000000000000000.000000000099999999999999999\
+9999999999999999999999999999999999999999999999999
 -8
 -182934721309467230894628759280719690
 1245723576605103923392087218483
diff --git a/testsuite/factor.tests b/testsuite/factor.tests
index 2cf4a54ce..e404e29c1 100755
--- a/testsuite/factor.tests
+++ b/testsuite/factor.tests
@@ -45,4 +45,27 @@ testing "factor \$((2*3*5*7*11*13*17*19*23*29*31*37*41*43*47))" \
         "614889782588491410: 2 3 5 7 11 13 17 19 23 29 31 37 41 43 47\n" \
         "" ""
 
+# Test that square-detection code is not buggy
+testing "factor 2 * 3037000493 * 3037000493" \
+        "factor 18446743988964486098" \
+        "18446743988964486098: 2 3037000493 3037000493\n" \
+        "" ""
+testing "factor 3 * 2479700513 * 2479700513" \
+        "factor 18446743902517389507" \
+        "18446743902517389507: 3 2479700513 2479700513\n" \
+        "" ""
+# including square-of-square cases:
+testing "factor 3 * 37831 * 37831 * 37831 * 37831" \
+        "factor 6144867742934288163" \
+        "6144867742934288163: 3 37831 37831 37831 37831\n" \
+        "" ""
+testing "factor 3 * 13^16" \
+        "factor 1996249827549539523" \
+        "1996249827549539523: 3 13 13 13 13 13 13 13 13 13 13 13 13 13 13 13 13\n" \
+        "" ""
+testing "factor 13^16" \
+        "factor 665416609183179841" \
+        "665416609183179841: 13 13 13 13 13 13 13 13 13 13 13 13 13 13 13 13\n" \
+        "" ""
+
 exit $FAILCOUNT
diff --git a/testsuite/mount.tests b/testsuite/mount.tests
index 91c2e8b42..b6d5ebe08 100755
--- a/testsuite/mount.tests
+++ b/testsuite/mount.tests
@@ -34,6 +34,8 @@ umount -d "$testdir" 2>/dev/null
 #   file input will be file called "input"
 #   test can create a file "actual" instead of writing to stdout
 
+# This will always fail on !CONFIG_MANDATORY_FILE_LOCKING kernels
+test "$SKIP_MOUNT_MAND_TESTS" = "1" || \
 testing "mount -o remount,mand" \
 "mount -o loop mount.image1m $testdir "\
 "&& grep -Fc $testdir </proc/mounts "\
diff --git a/testsuite/xargs.tests b/testsuite/xargs.tests
index e7c7c4b3d..c5e7b99e9 100755
--- a/testsuite/xargs.tests
+++ b/testsuite/xargs.tests
@@ -61,7 +61,7 @@ testing "xargs -n2" \
 
 SKIP=
 
-optional FEATURE_XARGS_SUPPORT_QUOTES
+optional FEATURE_XARGS_SUPPORT_QUOTES FEATURE_XARGS_SUPPORT_REPL_STR
 testing "xargs -I skips empty lines and leading whitespace" \
         "xargs -I% echo '[%]'" \
         "[2]\n[4]\n[6 6 ]\n[7]\n" \
diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index d473e24fc..00613f8e3 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -99,7 +99,7 @@ struct acpi_event {
         const char *desc;
 };
 
-static const struct acpi_event f_evt_tab[] = {
+static const struct acpi_event f_evt_tab[] ALIGN_PTR = {
         { "EV_KEY", 0x01, "KEY_POWER", 116, 1, "button/power PWRF 00000080" },
         { "EV_KEY", 0x01, "KEY_POWER", 116, 1, "button/power PWRB 00000080" },
         { "EV_SW", 0x05, "SW_LID", 0x00, 1, "button/lid LID0 00000080" },
@@ -110,7 +110,7 @@ struct acpi_action {
         const char *action;
 };
 
-static const struct acpi_action f_act_tab[] = {
+static const struct acpi_action f_act_tab[] ALIGN_PTR = {
         { "PWRF", "PWRF/00000080" },
         { "LID0", "LID/00000080" },
 };
diff --git a/util-linux/blockdev.c b/util-linux/blockdev.c
index e60bbe609..20a031377 100644
--- a/util-linux/blockdev.c
+++ b/util-linux/blockdev.c
@@ -60,7 +60,7 @@ static const char bdcmd_names[] ALIGN1 =
         "flushbufs" "\0"
         "rereadpt"  "\0"
 ;
-static const uint32_t bdcmd_ioctl[] = {
+static const uint32_t bdcmd_ioctl[] ALIGN4 = {
         BLKROSET,       //setro
         BLKROSET,       //setrw
         BLKROGET,       //getro
diff --git a/util-linux/chrt.c b/util-linux/chrt.c
index 4dd78dabf..a8701b55f 100644
--- a/util-linux/chrt.c
+++ b/util-linux/chrt.c
@@ -17,7 +17,7 @@
 //kbuild:lib-$(CONFIG_CHRT) += chrt.o
 
 //usage:#define chrt_trivial_usage
-//usage:       "-m | -p [PRIO] PID | [-rfobi] PRIO PROG [ARGS]"
+//usage:       "-m | -p [PRIO] PID | [-rfobi] PRIO PROG ARGS"
 //usage:#define chrt_full_usage "\n\n"
 //usage:       "Change scheduling priority and class for a process\n"
 //usage:     "\n        -m      Show min/max priorities"
@@ -39,6 +39,17 @@
 # define SCHED_IDLE 5
 #endif
 
+//musl has no __MUSL__ or similar define to check for,
+//but its <sys/types.h> has these lines:
+// #define __NEED_fsblkcnt_t
+// #define __NEED_fsfilcnt_t
+#if defined(__linux__) && defined(__NEED_fsblkcnt_t) && defined(__NEED_fsfilcnt_t)
+# define LIBC_IS_MUSL 1
+# include <sys/syscall.h>
+#else
+# define LIBC_IS_MUSL 0
+#endif
+
 static const char *policy_name(int pol)
 {
         if (pol > 6)
@@ -85,6 +96,7 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
         char *priority = priority; /* for compiler */
         const char *current_new;
         int policy = SCHED_RR;
+        int ret;
 
         opt = getopt32(argv, "^"
                         "+" "mprfobi"
@@ -132,7 +144,15 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
         if (opt & OPT_p) {
                 int pol;
  print_rt_info:
+#if LIBC_IS_MUSL
+                /* musl libc returns ENOSYS for its sched_getscheduler library
+                 * function, because the sched_getscheduler Linux kernel system call
+                 * does not conform to Posix; so we use the system call directly
+                 */
+                pol = syscall(SYS_sched_getscheduler, pid);
+#else
                 pol = sched_getscheduler(pid);
+#endif
                 if (pol < 0)
                         bb_perror_msg_and_die("can't %cet pid %u's policy", 'g', (int)pid);
 #ifdef SCHED_RESET_ON_FORK
@@ -149,7 +169,12 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
                 printf("pid %u's %s scheduling policy: SCHED_%s\n",
                         pid, current_new, policy_name(pol)
                 );
-                if (sched_getparam(pid, &sp))
+#if LIBC_IS_MUSL
+                ret = syscall(SYS_sched_getparam, pid, &sp);
+#else
+                ret = sched_getparam(pid, &sp);
+#endif
+                if (ret)
                         bb_perror_msg_and_die("can't get pid %u's attributes", (int)pid);
                 printf("pid %u's %s scheduling priority: %d\n",
                         (int)pid, current_new, sp.sched_priority
@@ -168,7 +193,12 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
                 sched_get_priority_min(policy), sched_get_priority_max(policy)
         );
 
-        if (sched_setscheduler(pid, policy, &sp) < 0)
+#if LIBC_IS_MUSL
+        ret = syscall(SYS_sched_setscheduler, pid, policy, &sp);
+#else
+        ret = sched_setscheduler(pid, policy, &sp);
+#endif
+        if (ret)
                 bb_perror_msg_and_die("can't %cet pid %u's policy", 's', (int)pid);
 
         if (!argv[0]) /* "-p PRIO PID [...]" */
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 0b9a9a6bc..cc5413b40 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -193,7 +193,7 @@ static const struct cmdoptions_t {
         const char name[9];
         const unsigned char param_count;
         const unsigned char code;
-} g_cmdoptions[] = {
+} g_cmdoptions[] ALIGN1 = {
         /*"12345678" + NUL */
 //TODO: convert to index_in_strings()
         { "fb"      , 1, CMD_FB       },
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 0fb2e3e17..c50ceead1 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -185,8 +185,11 @@ struct hd_geometry {
 
 #define HDIO_GETGEO     0x0301  /* get device geometry */
 
-/* TODO: #if ENABLE_FEATURE_FDISK_WRITABLE */
+/* TODO: just #if ENABLE_FEATURE_FDISK_WRITABLE */
 /* (currently fdisk_sun/sgi.c do not have proper WRITABLE #ifs) */
+#if ENABLE_FEATURE_FDISK_WRITABLE \
+ || ENABLE_FEATURE_SGI_LABEL \
+ || ENABLE_FEATURE_SUN_LABEL
 static const char msg_building_new_label[] ALIGN1 =
 "Building a new %s. Changes will remain in memory only,\n"
 "until you decide to write them. After that the previous content\n"
@@ -194,7 +197,7 @@ static const char msg_building_new_label[] ALIGN1 =
 
 static const char msg_part_already_defined[] ALIGN1 =
 "Partition %u is already defined, delete it before re-adding\n";
-/* #endif */
+#endif
 
 
 struct partition {
@@ -303,7 +306,7 @@ static sector_t get_nr_sects(const struct partition *p);
 
 /* DOS partition types */
 
-static const char *const i386_sys_types[] = {
+static const char *const i386_sys_types[] ALIGN_PTR = {
         "\x00" "Empty",
         "\x01" "FAT12",
         "\x04" "FAT16 <32M",
@@ -2667,7 +2670,7 @@ reread_partition_table(int leave)
         /* Users with slow external USB disks on a 320MHz ARM system (year 2011)
          * report that sleep is needed, otherwise BLKRRPART may fail with -EIO:
          */
-        sleep(1);
+        sleep1();
         i = ioctl_or_perror(dev_fd, BLKRRPART, NULL,
                         "WARNING: rereading partition table "
                         "failed, kernel still uses old table");
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index 92180b2bc..765740ff1 100644
--- a/util-linux/fdisk_osf.c
+++ b/util-linux/fdisk_osf.c
@@ -144,7 +144,7 @@ struct xbsd_disklabel {
 #define BSD_DSTYPE_DOSPART(s)   ((s) & 3)       /* dos partition number */
 #define BSD_DSTYPE_GEOMETRY     0x10            /* drive params in label */
 
-static const char *const xbsd_dktypenames[] = {
+static const char *const xbsd_dktypenames[] ALIGN_PTR = {
         "unknown",
         "SMD",
         "MSCP",
@@ -190,7 +190,7 @@ static const char *const xbsd_dktypenames[] = {
 #define BSD_FS_MSDOS    8               /* MS-DOS file system */
 #endif
 
-static const char *const xbsd_fstypes[] = {
+static const char *const xbsd_fstypes[] ALIGN_PTR = {
         "\x00" "unused",            /* BSD_FS_UNUSED  */
         "\x01" "swap",              /* BSD_FS_SWAP    */
         "\x02" "Version 6",         /* BSD_FS_V6      */
diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c
index c90c801e2..acb438ac0 100644
--- a/util-linux/fdisk_sgi.c
+++ b/util-linux/fdisk_sgi.c
@@ -174,7 +174,7 @@ isinfreelist(unsigned int b)
  * end of free blocks section
  */
 
-static const char *const sgi_sys_types[] = {
+static const char *const sgi_sys_types[] ALIGN_PTR = {
 /* SGI_VOLHDR   */      "\x00" "SGI volhdr"  ,
 /* 0x01         */      "\x01" "SGI trkrepl" ,
 /* 0x02         */      "\x02" "SGI secrepl" ,
diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c
index 29d7c283a..427b9487b 100644
--- a/util-linux/fdisk_sun.c
+++ b/util-linux/fdisk_sun.c
@@ -61,7 +61,7 @@ guess_device_type(void)
         }
 }
 
-static const char *const sun_sys_types[] = {
+static const char *const sun_sys_types[] ALIGN_PTR = {
         "\x00" "Empty"       , /* 0            */
         "\x01" "Boot"        , /* 1            */
         "\x02" "SunOS root"  , /* 2            */
@@ -133,7 +133,7 @@ static const struct sun_predefined_drives {
         unsigned short ntrks;
         unsigned short nsect;
         unsigned short rspeed;
-} sun_drives[] = {
+} sun_drives[] ALIGN_PTR = {
         { "Quantum","ProDrive 80S",1,832,2,834,6,34,3662},
         { "Quantum","ProDrive 105S",1,974,2,1019,6,35,3662},
         { "CDC","Wren IV 94171-344",3,1545,2,1549,9,46,3600},
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index 8d29a6d54..6d673002f 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -20,18 +20,10 @@
 //usage:#define fstrim_trivial_usage
 //usage:       "[OPTIONS] MOUNTPOINT"
 //usage:#define fstrim_full_usage "\n\n"
-//usage:        IF_LONG_OPTS(
-//usage:       "        -o,--offset OFFSET      Offset in bytes to discard from"
-//usage:     "\n        -l,--length LEN         Bytes to discard"
-//usage:     "\n        -m,--minimum MIN        Minimum extent length"
-//usage:     "\n        -v,--verbose            Print number of discarded bytes"
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
 //usage:       "        -o OFFSET       Offset in bytes to discard from"
 //usage:     "\n        -l LEN          Bytes to discard"
 //usage:     "\n        -m MIN          Minimum extent length"
 //usage:     "\n        -v              Print number of discarded bytes"
-//usage:        )
 
 #include "libbb.h"
 #include <linux/fs.h>
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 2174c3008..57e7e8db7 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -28,7 +28,7 @@
 //kbuild:lib-$(CONFIG_HD) += hexdump.o
 
 //usage:#define hexdump_trivial_usage
-//usage:       "[-bcCdefnosvx] [FILE]..."
+//usage:       "[-bcdoxCv] [-e FMT] [-f FMT_FILE] [-n LEN] [-s OFS] [FILE]..."
 //usage:#define hexdump_full_usage "\n\n"
 //usage:       "Display FILEs (or stdin) in a user specified format\n"
 //usage:     "\n        -b              1-byte octal display"
diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c
index d2f4b6ed8..29bbc6633 100644
--- a/util-linux/hexdump_xxd.c
+++ b/util-linux/hexdump_xxd.c
@@ -41,7 +41,7 @@
 //    -u          use upper case hex letters.
 
 //usage:#define xxd_trivial_usage
-//usage:       "[OPTIONS] [FILE]"
+//usage:       "[-pr] [-g N] [-c N] [-n LEN] [-s OFS] [FILE]"
 //usage:#define xxd_full_usage "\n\n"
 //usage:       "Hex dump FILE (or stdin)\n"
 //usage:     "\n        -g N            Bytes per group"
@@ -51,7 +51,6 @@
 //usage:     "\n        -l LENGTH       Show only first LENGTH bytes"
 //usage:     "\n        -s OFFSET       Skip OFFSET bytes"
 //usage:     "\n        -r              Reverse (with -p, assumes no offsets in input)"
-// TODO: implement -r (see hexdump -R)
 
 #include "libbb.h"
 #include "dump.h"
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index e85bca2b2..723b09589 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -36,6 +36,19 @@
 #include <sys/utsname.h>
 #include "rtc_.h"
 
+
+//musl has no __MUSL__ or similar define to check for,
+//but its <sys/types.h> has these lines:
+// #define __NEED_fsblkcnt_t
+// #define __NEED_fsfilcnt_t
+#if defined(__linux__) && defined(__NEED_fsblkcnt_t) && defined(__NEED_fsfilcnt_t)
+# define LIBC_IS_MUSL 1
+# include <sys/syscall.h>
+#else
+# define LIBC_IS_MUSL 0
+#endif
+
+
 /* diff code is disabled: it's not sys/hw clock diff, it's some useless
  * "time between hwclock was started and we saw CMOS tick" quantity.
  * It's useless since hwclock is started at a random moment,
@@ -66,7 +79,7 @@ static time_t read_rtc(const char **pp_rtcname, struct timeval *sys_tv, int utc)
                 int before = tm_time.tm_sec;
                 while (1) {
                         rtc_read_tm(&tm_time, fd);
-                        gettimeofday(sys_tv, NULL);
+                        xgettimeofday(sys_tv);
                         if (before != (int)tm_time.tm_sec)
                                 break;
                 }
@@ -116,26 +129,72 @@ static void show_clock(const char **pp_rtcname, int utc)
 #endif
 }
 
-static void to_sys_clock(const char **pp_rtcname, int utc)
+static void set_kernel_tz(const struct timezone *tz)
 {
-        struct timeval tv;
-        struct timezone tz;
-
-        tz.tz_minuteswest = timezone / 60;
-        /* ^^^ used to also subtract 60*daylight, but it's wrong:
-         * daylight!=0 means "this timezone has some DST
-         * during the year", not "DST is in effect now".
+#if LIBC_IS_MUSL
+        /* musl libc does not pass tz argument to syscall
+         * because "it's deprecated by POSIX, therefore it's fine
+         * if we gratuitously break stuff" :(
          */
-        tz.tz_dsttime = 0;
-
-        /* glibc v2.31+ returns an error if both args are non-NULL */
-        if (settimeofday(NULL, &tz))
+#if !defined(SYS_settimeofday) && defined(SYS_settimeofday_time32)
+# define SYS_settimeofday SYS_settimeofday_time32
+#endif
+        int ret = syscall(SYS_settimeofday, NULL, tz);
+#else
+        int ret = settimeofday(NULL, tz);
+#endif
+        if (ret)
                 bb_simple_perror_msg_and_die("settimeofday");
+}
+
+/*
+ * At system boot, kernel may set system time from RTC,
+ * but it knows nothing about timezones. If RTC is in local time,
+ * then system time is wrong - it is offset by timezone.
+ * --systz option corrects system time if RTC is in local time,
+ * and (always) sets in-kernel timezone.
+ * (Unlike --hctosys, it does not read the RTC).
+ *
+ * util-linux's code has this comment:
+ *  RTC   | settimeofday calls
+ *  ------|-------------------------------------------------
+ *  Local | 1st) warps system time*, sets PCIL* and kernel tz
+ *  UTC   | 1st) locks warp_clock 2nd) sets kernel tz
+ *               * only on first call after boot
+ * (PCIL is "persistent_clock_is_local" kernel internal flag,
+ * it makes kernel save RTC in local time, not UTC.)
+ */
+static void set_kernel_timezone_and_clock(int utc, const struct timeval *hctosys)
+{
+        time_t cur;
+        struct tm *broken;
+        struct timezone tz = { 0 };
+
+        /* if --utc, prevent kernel's warp_clock() with a dummy call */
+        if (utc)
+                set_kernel_tz(&tz);
+
+        /* Set kernel's timezone offset based on userspace one */
+//It's tempting to call tzset() and use libc global "timezone" variable
+//...but it does NOT include DST shift (IOW: it's WRONG, usually by one hour,
+//if DST is in effect!) Thus this ridiculous dance:
+        cur = time(NULL);
+        broken = localtime(&cur);
+        tz.tz_minuteswest = -broken->tm_gmtoff / 60;
+        /*tz.tz_dsttime = 0; already is */
+        set_kernel_tz(&tz); /* MIGHT warp_clock() if 1st call since boot */
+
+        if (hctosys) /* it's --hctosys: set time too */
+                xsettimeofday(hctosys);
+}
+
+static void to_sys_clock(const char **pp_rtcname, int utc)
+{
+        struct timeval tv;
 
         tv.tv_sec = read_rtc(pp_rtcname, NULL, utc);
         tv.tv_usec = 0;
-        if (settimeofday(&tv, NULL))
-                bb_simple_perror_msg_and_die("settimeofday");
+        return set_kernel_timezone_and_clock(utc, &tv);
 }
 
 static void from_sys_clock(const char **pp_rtcname, int utc)
@@ -146,7 +205,7 @@ static void from_sys_clock(const char **pp_rtcname, int utc)
         int rtc;
 
         rtc = rtc_xopen(pp_rtcname, O_WRONLY);
-        gettimeofday(&tv, NULL);
+        xgettimeofday(&tv);
         /* Prepare tm_time */
         if (sizeof(time_t) == sizeof(tv.tv_sec)) {
                 if (utc)
@@ -194,7 +253,7 @@ static void from_sys_clock(const char **pp_rtcname, int utc)
                 unsigned rem_usec;
                 time_t t;
 
-                gettimeofday(&tv, NULL);
+                xgettimeofday(&tv);
 
                 t = tv.tv_sec;
                 rem_usec = 1000000 - tv.tv_usec;
@@ -215,7 +274,7 @@ static void from_sys_clock(const char **pp_rtcname, int utc)
                 }
 
                 /* gmtime/localtime took some time, re-get cur time */
-                gettimeofday(&tv, NULL);
+                xgettimeofday(&tv);
 
                 if (tv.tv_sec < t /* we are still in old second */
                  || (tv.tv_sec == t && tv.tv_usec < adj) /* not too far into next second */
@@ -261,64 +320,53 @@ static void from_sys_clock(const char **pp_rtcname, int utc)
                 close(rtc);
 }
 
-/*
- * At system boot, kernel may set system time from RTC,
- * but it knows nothing about timezones. If RTC is in local time,
- * then system time is wrong - it is offset by timezone.
- * This option corrects system time if RTC is in local time,
- * and (always) sets in-kernel timezone.
- *
- * This is an alternate option to --hctosys that does not read the
- * hardware clock.
- */
-static void set_system_clock_timezone(int utc)
-{
-        struct timeval tv;
-        struct tm *broken;
-        struct timezone tz;
-
-        gettimeofday(&tv, NULL);
-        broken = localtime(&tv.tv_sec);
-        tz.tz_minuteswest = timezone / 60;
-        if (broken->tm_isdst > 0)
-                tz.tz_minuteswest -= 60;
-        tz.tz_dsttime = 0;
-        gettimeofday(&tv, NULL);
-        if (!utc)
-                tv.tv_sec += tz.tz_minuteswest * 60;
-
-        /* glibc v2.31+ returns an error if both args are non-NULL */
-        if (settimeofday(NULL, &tz))
-                bb_simple_perror_msg_and_die("settimeofday");
-        if (settimeofday(&tv, NULL))
-                bb_simple_perror_msg_and_die("settimeofday");
-}
+// hwclock from util-linux 2.36.1
+// hwclock [function] [option...]
+//Functions:
+// -r, --show           display the RTC time
+//     --get            display drift corrected RTC time
+//     --set            set the RTC according to --date
+// -s, --hctosys        set the system time from the RTC
+// -w, --systohc        set the RTC from the system time
+//     --systz          send timescale configurations to the kernel
+// -a, --adjust         adjust the RTC to account for systematic drift
+//     --predict        predict the drifted RTC time according to --date
+//Options:
+// -u, --utc            the RTC timescale is UTC
+// -l, --localtime      the RTC timescale is Local
+// -f, --rtc <file>     use an alternate file to /dev/rtc0
+//     --directisa      use the ISA bus instead of /dev/rtc0 access
+//     --date <time>    date/time input for --set and --predict
+//     --delay <sec>    delay used when set new RTC time
+//     --update-drift   update the RTC drift factor
+//     --noadjfile      do not use /etc/adjtime
+//     --adjfile <file> use an alternate file to /etc/adjtime
+//     --test           dry run; implies --verbose
+// -v, --verbose        display more details
 
 //usage:#define hwclock_trivial_usage
 //usage:        IF_LONG_OPTS(
-//usage:       "[-r|--show] [-s|--hctosys] [-w|--systohc] [--systz]"
-//usage:       " [--localtime] [-u|--utc]"
-//usage:       " [-f|--rtc FILE]"
+//usage:       "[-swul] [--systz] [-f DEV]"
 //usage:        )
 //usage:        IF_NOT_LONG_OPTS(
-//usage:       "[-r] [-s] [-w] [-t] [-l] [-u] [-f FILE]"
+//usage:       "[-swult] [-f DEV]"
 //usage:        )
 //usage:#define hwclock_full_usage "\n\n"
-//usage:       "Query and set hardware clock (RTC)\n"
-//usage:     "\n        -r      Show hardware clock time"
-//usage:     "\n        -s      Set system time from hardware clock"
-//usage:     "\n        -w      Set hardware clock from system time"
+//usage:       "Show or set hardware clock (RTC)\n"
+///////:     "\n        -r      Show RTC time"
+///////-r is default, don't bother showing it in help
+//usage:     "\n        -s      Set system time from RTC"
+//usage:     "\n        -w      Set RTC from system time"
 //usage:        IF_LONG_OPTS(
 //usage:     "\n        --systz Set in-kernel timezone, correct system time"
+//usage:     "\n                if RTC is kept in local time"
 //usage:        )
-//usage:     "\n                if hardware clock is in local time"
-//usage:     "\n        -u      Assume hardware clock is kept in UTC"
-//usage:        IF_LONG_OPTS(
-//usage:     "\n        --localtime     Assume hardware clock is kept in local time"
-//usage:        )
-//usage:     "\n        -f FILE Use specified device (e.g. /dev/rtc2)"
+//usage:     "\n        -f DEV  Use specified device (e.g. /dev/rtc2)"
+//usage:     "\n        -u      Assume RTC is kept in UTC"
+//usage:     "\n        -l      Assume RTC is kept in local time"
+//usage:     "\n                (if neither is given, read from "ADJTIME_PATH")"
 
-//TODO: get rid of incompatible -t and -l aliases to --systz and --localtime
+//TODO: get rid of incompatible -t alias to --systz?
 
 #define HWCLOCK_OPT_LOCALTIME   0x01
 #define HWCLOCK_OPT_UTC         0x02
@@ -334,10 +382,9 @@ int hwclock_main(int argc UNUSED_PARAM, char **argv)
         const char *rtcname = NULL;
         unsigned opt;
         int utc;
-
 #if ENABLE_LONG_OPTS
         static const char hwclock_longopts[] ALIGN1 =
-                "localtime\0" No_argument "l" /* short opt is non-standard */
+                "localtime\0" No_argument "l"
                 "utc\0"       No_argument "u"
                 "show\0"      No_argument "r"
                 "hctosys\0"   No_argument "s"
@@ -346,17 +393,15 @@ int hwclock_main(int argc UNUSED_PARAM, char **argv)
                 "rtc\0"       Required_argument "f"
                 ;
 #endif
-
-        /* Initialize "timezone" (libc global variable) */
-        tzset();
-
         opt = getopt32long(argv,
-                "^lurswtf:" "\0" "r--wst:w--rst:s--wrt:t--rsw:l--u:u--l",
+                "^""lurswtf:v" /* -v is accepted and ignored */
+                "\0"
+                "r--wst:w--rst:s--wrt:t--rsw:l--u:u--l",
                 hwclock_longopts,
                 &rtcname
         );
 
-        /* If -u or -l wasn't given check if we are using utc */
+        /* If -u or -l wasn't given, check if we are using utc */
         if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME))
                 utc = (opt & HWCLOCK_OPT_UTC);
         else
@@ -367,7 +412,7 @@ int hwclock_main(int argc UNUSED_PARAM, char **argv)
         else if (opt & HWCLOCK_OPT_SYSTOHC)
                 from_sys_clock(&rtcname, utc);
         else if (opt & HWCLOCK_OPT_SYSTZ)
-                set_system_clock_timezone(utc);
+                set_kernel_timezone_and_clock(utc, NULL);
         else
                 /* default HWCLOCK_OPT_SHOW */
                 show_clock(&rtcname, utc);
diff --git a/util-linux/ionice.c b/util-linux/ionice.c
index 40c04d5e0..c8fb1a777 100644
--- a/util-linux/ionice.c
+++ b/util-linux/ionice.c
@@ -18,11 +18,11 @@
 //kbuild:lib-$(CONFIG_IONICE) += ionice.o
 
 //usage:#define ionice_trivial_usage
-//usage:        "[-c 1-3] [-n 0-7] [-p PID] [PROG]"
+//usage:        "[-c 1-3] [-n 0-7] [-p PID] [PROG ARGS]"
 //usage:#define ionice_full_usage "\n\n"
 //usage:       "Change I/O priority and class\n"
-//usage:     "\n        -c      Class. 1:realtime 2:best-effort 3:idle"
-//usage:     "\n        -n      Priority"
+//usage:     "\n        -c N    Class. 1:realtime 2:best-effort 3:idle"
+//usage:     "\n        -n N    Priority"
 
 #include <sys/syscall.h>
 #include <asm/unistd.h>
@@ -61,7 +61,7 @@ int ionice_main(int argc UNUSED_PARAM, char **argv)
         /* Defaults */
         int ioclass = 0;
         int pri = 0;
-        int pid = 0; /* affect own porcess */
+        int pid = 0; /* affect own process */
         int opt;
         enum {
                 OPT_n = 1,
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 59dbcf0cd..dbbcbc655 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -80,12 +80,14 @@
 //kbuild:lib-$(CONFIG_MDEV) += mdev.o
 
 //usage:#define mdev_trivial_usage
-//usage:       "[-s]" IF_FEATURE_MDEV_DAEMON(" | [-df]")
+//usage:       "[-vS] " IF_FEATURE_MDEV_DAEMON("{ ") "[-s]" IF_FEATURE_MDEV_DAEMON(" | [-df] }")
 //usage:#define mdev_full_usage "\n\n"
-//usage:       "mdev -s is to be run during boot to scan /sys and populate /dev.\n"
+//usage:       "        -v      verbose\n"
+//usage:       "        -S      log to syslog too\n"
+//usage:       "        -s      scan /sys and populate /dev\n"
 //usage:        IF_FEATURE_MDEV_DAEMON(
-//usage:       "mdev -d[f]: daemon, listen on netlink.\n"
-//usage:       "        -f: stay in foreground.\n"
+//usage:       "        -d      daemon, listen on netlink\n"
+//usage:       "        -f      stay in foreground\n"
 //usage:        )
 //usage:       "\n"
 //usage:       "Bare mdev is a kernel hotplug helper. To activate it:\n"
@@ -113,6 +115,7 @@
 #include "common_bufsiz.h"
 #include "xregex.h"
 #include <linux/netlink.h>
+#include <syslog.h>
 
 /* "mdev -s" scans /sys/class/xxx, looking for directories which have dev
  * file (it is of the form "M:m\n"). Example: /sys/class/tty/tty0/dev
@@ -269,10 +272,6 @@
 # define dbg3s(msg) ((void)0)
 #endif
 
-
-#ifndef SO_RCVBUFFORCE
-#define SO_RCVBUFFORCE 33
-#endif
 static const char keywords[] ALIGN1 = "add\0remove\0"; // "change\0"
 enum { OP_add, OP_remove };
 
@@ -297,7 +296,7 @@ struct rule {
 
 struct globals {
         int root_major, root_minor;
-        smallint verbose;
+        int verbose;
         char *subsystem;
         char *subsys_env; /* for putenv("SUBSYSTEM=subsystem") */
 #if ENABLE_FEATURE_MDEV_CONF
@@ -921,7 +920,7 @@ static void load_firmware(const char *firmware, const char *sysfs_path)
                 loading_fd = open("loading", O_WRONLY);
                 if (loading_fd >= 0)
                         goto loading;
-                sleep(1);
+                sleep1();
         }
         goto out;
 
@@ -964,7 +963,7 @@ static void load_firmware(const char *firmware, const char *sysfs_path)
 static char *curtime(void)
 {
         struct timeval tv;
-        gettimeofday(&tv, NULL);
+        xgettimeofday(&tv);
         sprintf(
                 strftime_HHMMSS(G.timestr, sizeof(G.timestr), &tv.tv_sec),
                 ".%06u",
@@ -1152,15 +1151,50 @@ static void initial_scan(char *temp)
 
 #if ENABLE_FEATURE_MDEV_DAEMON
 
-/* uevent applet uses 16k buffer, and mmaps it before every read */
-# define BUFFER_SIZE (2 * 1024)
-# define RCVBUF (2 * 1024 * 1024)
+/*
+ * The kernel (as of v5.4) will pass up to 32 environment variables with a
+ * total of 2kiB on each event. On top of that the action string and device
+ * path are added. Using a 3kiB buffer for the event should suffice in any
+ * case.
+ *
+ * As far as the socket receive buffer size is concerned 2MiB proved to be too
+ * small (see [1]). Udevd seems to use a whooping 128MiB. The socket receive
+ * buffer size is just a resource limit. The buffers are allocated lazily so
+ * the memory is not wasted.
+ *
+ * [1] http://lists.busybox.net/pipermail/busybox/2019-December/087665.html
+ */
+# define USER_RCVBUF (3 * 1024)
+# define KERN_RCVBUF (128 * 1024 * 1024)
 # define MAX_ENV 32
 
+static int daemon_init(char *temp)
+{
+        int fd;
+
+        /* Subscribe for UEVENT kernel messages */
+        /* Without a sufficiently big RCVBUF, a ton of simultaneous events
+         * can trigger ENOBUFS on read, which is unrecoverable.
+         * Reproducer:
+         *      mdev -d
+         *      find /sys -name uevent -exec sh -c 'echo add >"{}"' ';'
+         */
+        fd = create_and_bind_to_netlink(NETLINK_KOBJECT_UEVENT, 1 << 0, KERN_RCVBUF);
+
+        /*
+         * Make inital scan after the uevent socket is alive and
+         * _before_ we fork away. Already open mdev.log because we work
+         * in daemon mode.
+         */
+        initial_scan(temp);
+
+        return fd;
+}
+
 static void daemon_loop(char *temp, int fd)
 {
         for (;;) {
-                char netbuf[BUFFER_SIZE];
+                char netbuf[USER_RCVBUF];
                 char *env[MAX_ENV];
                 char *s, *end;
                 ssize_t len;
@@ -1168,6 +1202,16 @@ static void daemon_loop(char *temp, int fd)
 
                 len = safe_read(fd, netbuf, sizeof(netbuf) - 1);
                 if (len < 0) {
+                        if (errno == ENOBUFS) {
+                                /*
+                                 * We ran out of socket receive buffer space.
+                                 * Start from scratch.
+                                 */
+                                dbg1s("uevent overrun, rescanning");
+                                close(fd);
+                                fd = daemon_init(temp);
+                                continue;
+                        }
                         bb_simple_perror_msg_and_die("read");
                 }
                 end = netbuf + len;
@@ -1196,8 +1240,9 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
 {
         enum {
                 MDEV_OPT_SCAN       = 1 << 0,
-                MDEV_OPT_DAEMON     = 1 << 1,
-                MDEV_OPT_FOREGROUND = 1 << 2,
+                MDEV_OPT_SYSLOG     = 1 << 1,
+                MDEV_OPT_DAEMON     = 1 << 2,
+                MDEV_OPT_FOREGROUND = 1 << 3,
         };
         int opt;
         RESERVE_CONFIG_BUFFER(temp, PATH_MAX + SCRATCH_SIZE);
@@ -1213,7 +1258,11 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
 
         xchdir("/dev");
 
-        opt = getopt32(argv, "s" IF_FEATURE_MDEV_DAEMON("df"));
+        opt = getopt32(argv, "^"
+                "sS" IF_FEATURE_MDEV_DAEMON("df") "v"
+                "\0"
+                "vv",
+                &G.verbose);
 
 #if ENABLE_FEATURE_MDEV_CONF
         G.filename = "/etc/mdev.conf";
@@ -1223,32 +1272,24 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
         }
 #endif
 
+        if (opt & MDEV_OPT_SYSLOG) {
+                openlog(applet_name, LOG_PID, LOG_DAEMON);
+                logmode |= LOGMODE_SYSLOG;
+        }
+
 #if ENABLE_FEATURE_MDEV_DAEMON
         if (opt & MDEV_OPT_DAEMON) {
-                /*
-                 * Daemon mode listening on uevent netlink socket.
-                 */
-                int fd;
-
-                /* Subscribe for UEVENT kernel messages */
-                /* Without a sufficiently big RCVBUF, a ton of simultaneous events
-                 * can trigger ENOBUFS on read, which is unrecoverable.
-                 * Reproducer:
-                 *      mdev -d
-                 *      find /sys -name uevent -exec sh -c 'echo add >"{}"' ';'
+                /* Daemon mode listening on uevent netlink socket. Fork away
+                 * after initial scan so that caller can be sure everything
+                 * is up-to-date when mdev process returns.
                  */
-                fd = create_and_bind_to_netlink(NETLINK_KOBJECT_UEVENT, 1 << 0, RCVBUF);
+                int fd = daemon_init(temp);
 
-                /*
-                 * Make inital scan after the uevent socket is alive and
-                 * _before_ we fork away.
-                 */
-                initial_scan(temp);
-
-                if (!(opt & MDEV_OPT_FOREGROUND))
+                if (!(opt & MDEV_OPT_FOREGROUND)) {
+                        /* there is no point in logging to /dev/null */
+                        logmode &= ~LOGMODE_STDIO;
                         bb_daemonize_or_rexec(0, argv);
-
-                open_mdev_log(NULL, getpid());
+                }
 
                 daemon_loop(temp, fd);
         }
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 1f525d75b..fcf374b2d 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -131,7 +131,7 @@ static void allocate(uint8_t *bitmap, uint32_t blocksize, uint32_t start, uint32
 static uint32_t has_super(uint32_t x)
 {
         // 0, 1 and powers of 3, 5, 7 up to 2^32 limit
-        static const uint32_t supers[] = {
+        static const uint32_t supers[] ALIGN4 = {
                 0, 1, 3, 5, 7, 9, 25, 27, 49, 81, 125, 243, 343, 625, 729,
                 2187, 2401, 3125, 6561, 15625, 16807, 19683, 59049, 78125,
                 117649, 177147, 390625, 531441, 823543, 1594323, 1953125,
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 9e51a1dcc..8fe5d0293 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -128,7 +128,7 @@ int mkswap_main(int argc UNUSED_PARAM, char **argv)
 
         /* Figure out how big the device is */
         len = get_volume_size_in_bytes(fd, argv[1], 1024, /*extend:*/ 1);
-        pagesize = getpagesize();
+        pagesize = bb_getpagesize();
         len -= pagesize;
 
         /* Announce our intentions */
diff --git a/util-linux/mount.c b/util-linux/mount.c
index fc5161d7f..831dab9e2 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -182,14 +182,16 @@
 //usage:       "Returns 0 for success, number of failed mounts for -a, or errno for one mount."
 
 #include <mntent.h>
+#if ENABLE_FEATURE_SYSLOG
 #include <syslog.h>
+#endif
 #include <sys/mount.h>
 // Grab more as needed from util-linux's mount/mount_constants.h
 #ifndef MS_DIRSYNC
 # define MS_DIRSYNC     (1 << 7) // Directory modifications are synchronous
 #endif
-#ifndef MS_UNION
-# define MS_UNION       (1 << 8)
+#ifndef MS_NOSYMFOLLOW
+# define MS_NOSYMFOLLOW (1 << 8)
 #endif
 #ifndef MS_BIND
 # define MS_BIND        (1 << 12)
@@ -216,12 +218,16 @@
 #ifndef MS_SHARED
 # define MS_SHARED      (1 << 20)
 #endif
+
 #ifndef MS_RELATIME
 # define MS_RELATIME    (1 << 21)
 #endif
 #ifndef MS_STRICTATIME
 # define MS_STRICTATIME (1 << 24)
 #endif
+#ifndef MS_LAZYTIME
+# define MS_LAZYTIME    (1 << 25)
+#endif
 
 /* Any ~MS_FOO value has this bit set: */
 #define BB_MS_INVERTED_VALUE (1u << 31)
@@ -323,7 +329,7 @@ enum {
 
 // Standard mount options (from -o options or --options),
 // with corresponding flags
-static const int32_t mount_options[] = {
+static const int32_t mount_options[] ALIGN4 = {
         // MS_FLAGS set a bit.  ~MS_FLAGS disable that bit.  0 flags are NOPs.
 
         IF_FEATURE_MOUNT_LOOP(
@@ -358,16 +364,19 @@ static const int32_t mount_options[] = {
                 /* "noatime"     */ MS_NOATIME,
                 /* "diratime"    */ ~MS_NODIRATIME,
                 /* "nodiratime"  */ MS_NODIRATIME,
-                /* "mand"        */ MS_MANDLOCK,
-                /* "nomand"      */ ~MS_MANDLOCK,
                 /* "relatime"    */ MS_RELATIME,
                 /* "norelatime"  */ ~MS_RELATIME,
                 /* "strictatime" */ MS_STRICTATIME,
-                /* "loud"        */ ~MS_SILENT,
-                /* "rbind"       */ MS_BIND|MS_RECURSIVE,
+                /* "nostrictatime"*/ ~MS_STRICTATIME,
+                /* "lazytime"    */ MS_LAZYTIME,
+                /* "nolazytime"  */ ~MS_LAZYTIME,
+                /* "nosymfollow" */ MS_NOSYMFOLLOW,
+                /* "mand"        */ MS_MANDLOCK,
+                /* "nomand"      */ ~MS_MANDLOCK,
+                /* "loud"        */ ~MS_SILENT,
 
                 // action flags
-                /* "union"       */ MS_UNION,
+                /* "rbind"       */ MS_BIND|MS_RECURSIVE,
                 /* "bind"        */ MS_BIND,
                 /* "move"        */ MS_MOVE,
                 /* "shared"      */ MS_SHARED,
@@ -404,29 +413,32 @@ static const char mount_option_str[] ALIGN1 =
         )
         IF_FEATURE_MOUNT_FLAGS(
                 // vfs flags
-                "nosuid\0"
-                "suid\0"
-                "dev\0"
-                "nodev\0"
-                "exec\0"
-                "noexec\0"
-                "sync\0"
-                "dirsync\0"
-                "async\0"
-                "atime\0"
-                "noatime\0"
-                "diratime\0"
-                "nodiratime\0"
-                "mand\0"
-                "nomand\0"
-                "relatime\0"
-                "norelatime\0"
-                "strictatime\0"
-                "loud\0"
-                "rbind\0"
+                "nosuid"       "\0"
+                "suid"         "\0"
+                "dev"          "\0"
+                "nodev"        "\0"
+                "exec"         "\0"
+                "noexec"       "\0"
+                "sync"         "\0"
+                "dirsync"      "\0"
+                "async"        "\0"
+                "atime"        "\0"
+                "noatime"      "\0"
+                "diratime"     "\0"
+                "nodiratime"   "\0"
+                "relatime"     "\0"
+                "norelatime"   "\0"
+                "strictatime"  "\0"
+                "nostrictatime""\0"
+                "lazytime"     "\0"
+                "nolazytime"   "\0"
+                "nosymfollow"  "\0"
+                "mand"         "\0"
+                "nomand"       "\0"
+                "loud"         "\0"
 
                 // action flags
-                "union\0"
+                "rbind\0"
                 "bind\0"
                 "move\0"
                 "make-shared\0"
@@ -641,7 +653,7 @@ static unsigned long parse_mount_options(char *options, char **unrecognized)
 // Return a list of all block device backed filesystems
 static llist_t *get_block_backed_filesystems(void)
 {
-        static const char filesystems[2][sizeof("/proc/filesystems")] = {
+        static const char filesystems[2][sizeof("/proc/filesystems")] ALIGN1 = {
                 "/etc/filesystems",
                 "/proc/filesystems",
         };
@@ -2064,13 +2076,18 @@ static int singlemount(struct mntent *mp, int ignore_busy)
         }
 
         // Might this be an NFS filesystem?
-        if ((!mp->mnt_type || is_prefixed_with(mp->mnt_type, "nfs"))
-         && strchr(mp->mnt_fsname, ':') != NULL
+        if (!(vfsflags & (MS_BIND | MS_MOVE))
+         && (!mp->mnt_type || is_prefixed_with(mp->mnt_type, "nfs"))
         ) {
-                if (!mp->mnt_type)
-                        mp->mnt_type = (char*)"nfs";
-                rc = nfsmount(mp, vfsflags, filteropts);
-                goto report_error;
+                char *colon = strchr(mp->mnt_fsname, ':');
+                if (colon // looks like "hostname:..."
+                 && strchrnul(mp->mnt_fsname, '/') > colon // "hostname:" has no slashes
+                ) {
+                        if (!mp->mnt_type)
+                                mp->mnt_type = (char*)"nfs";
+                        rc = nfsmount(mp, vfsflags, filteropts);
+                        goto report_error;
+                }
         }
 
         // Look at the file.  (Not found isn't a failure for remount, or for
@@ -2110,7 +2127,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
                                         bb_simple_error_msg(bb_msg_perm_denied_are_you_root);
                                 else
                                         bb_simple_perror_msg("can't setup loop device");
-                                return errno;
+                                return loopfd; // was "return errno", but it can be 0 here
                         }
 
                 // Autodetect bind mounts
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index c48dcf885..e6339da2f 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -17,7 +17,7 @@
 //kbuild:lib-$(CONFIG_NSENTER) += nsenter.o
 
 //usage:#define nsenter_trivial_usage
-//usage:       "[OPTIONS] [PROG [ARGS]]"
+//usage:       "[OPTIONS] [PROG ARGS]"
 //usage:#define nsenter_full_usage "\n"
 //usage:     "\n        -t PID          Target process to get namespaces from"
 //usage:     "\n        -m[FILE]        Enter mount namespace"
@@ -103,8 +103,9 @@ static const struct namespace_descr ns_list[] = {
 };
 /*
  * Upstream nsenter doesn't support the short option for --preserve-credentials
+ * "+": stop on first non-option
  */
-static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t:+S:+G:+r::w::F";
+static const char opt_str[] ALIGN1 = "+""U::i::u::n::p::m::""t:+S:+G:+r::w::F";
 
 #if ENABLE_LONG_OPTS
 static const char nsenter_longopts[] ALIGN1 =
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index bb1dc519a..9b80141c9 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -96,11 +96,10 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
                 if (time(NULL) == remote_time)
                         bb_simple_error_msg("current time matches remote time");
                 else {
-                        struct timespec ts;
+                        struct timeval ts;
                         ts.tv_sec = remote_time;
-                        ts.tv_nsec = 0;
-                        if (clock_settime(CLOCK_REALTIME, &ts) < 0)
-                                bb_simple_perror_msg_and_die("can't set time of day");
+                        ts.tv_usec = 0;
+                        xsettimeofday(&ts);
                 }
         }
 
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index 823e55662..eac16077d 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -36,24 +36,13 @@
 //usage:       "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]"
 //usage:#define rtcwake_full_usage "\n\n"
 //usage:       "Enter a system sleep state until specified wakeup time\n"
-//usage:        IF_LONG_OPTS(
-//usage:     "\n        -a,--auto       Read clock mode from adjtime"
-//usage:     "\n        -l,--local      Clock is set to local time"
-//usage:     "\n        -u,--utc        Clock is set to UTC time"
-//usage:     "\n        -d,--device DEV Specify the RTC device"
-//usage:     "\n        -m,--mode MODE  Set sleep state (default: standby)"
-//usage:     "\n        -s,--seconds SEC Set timeout in SEC seconds from now"
-//usage:     "\n        -t,--time TIME  Set timeout to TIME seconds from epoch"
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
-//usage:     "\n        -a      Read clock mode from adjtime"
+//usage:     "\n        -a      Read clock mode from "ADJTIME_PATH" (default)"
 //usage:     "\n        -l      Clock is set to local time"
 //usage:     "\n        -u      Clock is set to UTC time"
 //usage:     "\n        -d DEV  Specify the RTC device"
 //usage:     "\n        -m MODE Set sleep state (default: standby)"
 //usage:     "\n        -s SEC  Set timeout in SEC seconds from now"
 //usage:     "\n        -t TIME Set timeout to TIME seconds from epoch"
-//usage:        )
 
 #include "libbb.h"
 #include "rtc_.h"
diff --git a/util-linux/script.c b/util-linux/script.c
index 4eac5e94f..963435335 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -172,7 +172,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                                                 struct timeval tv;
                                                 double newtime;
 
-                                                gettimeofday(&tv, NULL);
+                                                xgettimeofday(&tv);
                                                 newtime = tv.tv_sec + (double) tv.tv_usec / 1000000;
                                                 fprintf(timing_fp, "%f %u\n", newtime - oldtime, count);
                                                 oldtime = newtime;
diff --git a/util-linux/setpriv.c b/util-linux/setpriv.c
index 1e4b201ed..6904cf019 100644
--- a/util-linux/setpriv.c
+++ b/util-linux/setpriv.c
@@ -47,7 +47,7 @@
 //kbuild:lib-$(CONFIG_SETPRIV) += setpriv.o
 
 //usage:#define setpriv_trivial_usage
-//usage:        "[OPTIONS] PROG [ARGS]"
+//usage:        "[OPTIONS] PROG ARGS"
 //usage:#define setpriv_full_usage "\n\n"
 //usage:       "Run PROG with different privilege settings\n"
 //usage:        IF_FEATURE_SETPRIV_DUMP(
diff --git a/util-linux/uevent.c b/util-linux/uevent.c
index 57d9328ef..db11746d0 100644
--- a/util-linux/uevent.c
+++ b/util-linux/uevent.c
@@ -15,7 +15,7 @@
 //kbuild:lib-$(CONFIG_UEVENT) += uevent.o
 
 //usage:#define uevent_trivial_usage
-//usage:       "[PROG [ARGS]]"
+//usage:       "[PROG ARGS]"
 //usage:#define uevent_full_usage "\n\n"
 //usage:       "uevent runs PROG for every netlink notification."
 //usage:   "\n""PROG's environment contains data passed from the kernel."
@@ -26,22 +26,26 @@
 #include "common_bufsiz.h"
 #include <linux/netlink.h>
 
-#define BUFFER_SIZE 16*1024
-
 #define env ((char **)bb_common_bufsiz1)
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
 enum {
         MAX_ENV = COMMON_BUFSIZE / sizeof(char*) - 1,
-        /* sizeof(env[0]) instead of sizeof(char*)
-         * makes gcc-6.3.0 emit "strict-aliasing" warning.
-         */
+        // ^^^sizeof(env[0]) instead of sizeof(char*)
+        // makes gcc-6.3.0 emit "strict-aliasing" warning.
+
+        // socket receive buffer of 2MiB proved to be too small:
+        //  http://lists.busybox.net/pipermail/busybox/2019-December/087665.html
+        // udevd seems to use a whooping 128MiB.
+        // The socket receive buffer size is just a resource limit.
+        // The buffers are allocated lazily so the memory is not wasted.
+        KERN_RCVBUF = 128 * 1024 * 1024,
+
+        // Might be made smaller: the kernel v5.4 passes up to 32 environment
+        // variables with a total of 2kb on each event.
+        // On top of that the action string and device path are added.
+        USER_RCVBUF = 16 * 1024,
 };
 
-#ifndef SO_RCVBUFFORCE
-#define SO_RCVBUFFORCE 33
-#endif
-enum { RCVBUF = 2 * 1024 * 1024 };
-
 int uevent_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int uevent_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -57,7 +61,8 @@ int uevent_main(int argc UNUSED_PARAM, char **argv)
         // Reproducer:
         //      uevent mdev &
         //      find /sys -name uevent -exec sh -c 'echo add >"{}"' ';'
-        fd = create_and_bind_to_netlink(NETLINK_KOBJECT_UEVENT, /*groups:*/ 1 << 0, RCVBUF);
+ reopen:
+        fd = create_and_bind_to_netlink(NETLINK_KOBJECT_UEVENT, /*groups:*/ 1 << 0, KERN_RCVBUF);
 
         for (;;) {
                 char *netbuf;
@@ -69,17 +74,20 @@ int uevent_main(int argc UNUSED_PARAM, char **argv)
                 // for a new uevent notification to come in.
                 // We use a fresh mmap so that buffer is not allocated
                 // until kernel actually starts filling it.
-                netbuf = mmap(NULL, BUFFER_SIZE,
-                                        PROT_READ | PROT_WRITE,
-                                        MAP_PRIVATE | MAP_ANON,
-                                        /* ignored: */ -1, 0);
-                if (netbuf == MAP_FAILED)
-                        bb_simple_perror_msg_and_die("mmap");
+                netbuf = xmmap_anon(USER_RCVBUF);
 
                 // Here we block, possibly for a very long time
-                len = safe_read(fd, netbuf, BUFFER_SIZE - 1);
-                if (len < 0)
+                len = safe_read(fd, netbuf, USER_RCVBUF - 1);
+                if (len < 0) {
+                        if (errno == ENOBUFS) {
+                                // Ran out of socket receive buffer
+                                bb_simple_error_msg("uevent overrun");
+                                close(fd);
+                                munmap(netbuf, USER_RCVBUF);
+                                goto reopen;
+                        }
                         bb_simple_perror_msg_and_die("read");
+                }
                 end = netbuf + len;
                 *end = '\0';
 
@@ -108,7 +116,7 @@ int uevent_main(int argc UNUSED_PARAM, char **argv)
                         while (env[idx])
                                 bb_unsetenv(env[idx++]);
                 }
-                munmap(netbuf, BUFFER_SIZE);
+                munmap(netbuf, USER_RCVBUF);
         }
 
         return 0; // not reached
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 63a3bf504..23da32868 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -41,16 +41,16 @@
 //kbuild:lib-$(CONFIG_UMOUNT) += umount.o
 
 //usage:#define umount_trivial_usage
-//usage:       "[OPTIONS] FILESYSTEM|DIRECTORY"
+//usage:       "[-rlf"IF_FEATURE_MTAB_SUPPORT("m")IF_FEATURE_MOUNT_LOOP("d")IF_FEATURE_UMOUNT_ALL("a")"] [-t FSTYPE] FILESYSTEM|DIRECTORY"
 //usage:#define umount_full_usage "\n\n"
-//usage:       "Unmount file systems\n"
+//usage:       "Unmount filesystems\n"
 //usage:        IF_FEATURE_UMOUNT_ALL(
-//usage:     "\n        -a      Unmount all file systems" IF_FEATURE_MTAB_SUPPORT(" in /etc/mtab")
+//usage:     "\n        -a      Unmount all filesystems" IF_FEATURE_MTAB_SUPPORT(" in /etc/mtab")
 //usage:        )
 //usage:        IF_FEATURE_MTAB_SUPPORT(
 //usage:     "\n        -n      Don't erase /etc/mtab entries"
 //usage:        )
-//usage:     "\n        -r      Try to remount devices as read-only if mount is busy"
+//usage:     "\n        -r      Remount devices read-only if mount is busy"
 //usage:     "\n        -l      Lazy umount (detach filesystem)"
 //usage:     "\n        -f      Force umount (i.e., unreachable NFS server)"
 //usage:        IF_FEATURE_MOUNT_LOOP(
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index 2087413e8..68ccdd874 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -23,7 +23,7 @@
 //kbuild:lib-$(CONFIG_UNSHARE) += unshare.o
 
 //usage:#define unshare_trivial_usage
-//usage:       "[OPTIONS] [PROG [ARGS]]"
+//usage:       "[OPTIONS] [PROG ARGS]"
 //usage:#define unshare_full_usage "\n"
 //usage:     "\n        -m,--mount[=FILE]       Unshare mount namespace"
 //usage:     "\n        -u,--uts[=FILE]         Unshare UTS namespace (hostname etc.)"
@@ -31,8 +31,8 @@
 //usage:     "\n        -n,--net[=FILE]         Unshare network namespace"
 //usage:     "\n        -p,--pid[=FILE]         Unshare PID namespace"
 //usage:     "\n        -U,--user[=FILE]        Unshare user namespace"
-//usage:     "\n        -f,--fork               Fork before execing PROG"
-//usage:     "\n        -r,--map-root-user      Map current user to root (implies -U)"
+//usage:     "\n        -f                      Fork before execing PROG"
+//usage:     "\n        -r                      Map current user to root (implies -U)"
 //usage:     "\n        --mount-proc[=DIR]      Mount /proc filesystem first (implies -m)"
 //usage:     "\n        --propagation slave|shared|private|unchanged"
 //usage:     "\n                                Modify mount propagation in mount namespace"
diff --git a/util-linux/volume_id/erofs.c b/util-linux/volume_id/erofs.c
new file mode 100644
index 000000000..a163a353d
--- /dev/null
+++ b/util-linux/volume_id/erofs.c
@@ -0,0 +1,67 @@
+/*
+ * volume_id - reads filesystem label and uuid
+ *
+ * Copyright (C) 2020 Norbert Lange <nolange79@gmail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config FEATURE_VOLUMEID_EROFS
+//config:       bool "erofs filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:       Erofs is a compressed readonly filesystem for Linux.
+
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EROFS) += erofs.o
+
+#include "volume_id_internal.h"
+
+#define EROFS_SUPER_MAGIC_V1    0xE0F5E1E2
+#define EROFS_SUPER_OFFSET      1024
+#define EROFS_FEATURE_COMPAT_SB_CHKSUM          0x00000001
+
+/* 128-byte erofs on-disk super block */
+struct erofs_super_block {
+        uint32_t magic;           /* file system magic number */
+        uint32_t checksum;        /* crc32c(super_block) */
+        uint32_t feature_compat;
+        uint8_t blkszbits;         /* support block_size == PAGE_SIZE only */
+        uint8_t reserved;
+
+        uint16_t root_nid;      /* nid of root directory */
+        uint64_t inos;            /* total valid ino # (== f_files - f_favail) */
+
+        uint64_t build_time;      /* inode v1 time derivation */
+        uint32_t build_time_nsec;       /* inode v1 time derivation in nano scale */
+        uint32_t blocks;          /* used for statfs */
+        uint32_t meta_blkaddr;  /* start block address of metadata area */
+        uint32_t xattr_blkaddr; /* start block address of shared xattr area */
+        uint8_t uuid[16];          /* 128-bit uuid for volume */
+        uint8_t volume_name[16];   /* volume name */
+        uint32_t feature_incompat;
+        uint8_t reserved2[44];
+} PACKED;
+
+int FAST_FUNC volume_id_probe_erofs(struct volume_id *id /*,uint64_t off*/)
+{
+        struct erofs_super_block *sb;
+
+        BUILD_BUG_ON(sizeof(struct erofs_super_block) != 128);
+
+        dbg("erofs: probing at offset 0x%llx", EROFS_SUPER_OFFSET);
+        sb = volume_id_get_buffer(id, EROFS_SUPER_OFFSET, sizeof(*sb));
+        if (!sb)
+                return -1;
+
+        if (sb->magic != cpu_to_le32(EROFS_SUPER_MAGIC_V1))
+                return -1;
+
+        IF_FEATURE_BLKID_TYPE(id->type = "erofs");
+
+        volume_id_set_label_string(id, sb->volume_name,
+                MIN(sizeof(sb->volume_name), VOLUME_ID_LABEL_SIZE));
+
+        volume_id_set_uuid(id, sb->uuid, UUID_DCE);
+
+        return 0;
+}
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c
index c3f07a741..8ceb61bde 100644
--- a/util-linux/volume_id/volume_id.c
+++ b/util-linux/volume_id/volume_id.c
@@ -49,7 +49,7 @@
 typedef int FAST_FUNC (*raid_probe_fptr)(struct volume_id *id, /*uint64_t off,*/ uint64_t size);
 typedef int FAST_FUNC (*probe_fptr)(struct volume_id *id /*, uint64_t off*/);
 
-static const raid_probe_fptr raid1[] = {
+static const raid_probe_fptr raid1[] ALIGN_PTR = {
 #if ENABLE_FEATURE_VOLUMEID_LINUXRAID
         volume_id_probe_linux_raid,
 #endif
@@ -76,7 +76,7 @@ static const raid_probe_fptr raid1[] = {
 #endif
 };
 
-static const probe_fptr raid2[] = {
+static const probe_fptr raid2[] ALIGN_PTR = {
 #if ENABLE_FEATURE_VOLUMEID_LVM
         volume_id_probe_lvm1,
         volume_id_probe_lvm2,
@@ -90,7 +90,7 @@ static const probe_fptr raid2[] = {
 };
 
 /* signature in the first block, only small buffer needed */
-static const probe_fptr fs1[] = {
+static const probe_fptr fs1[] ALIGN_PTR = {
 #if ENABLE_FEATURE_VOLUMEID_FAT
         volume_id_probe_vfat,
 #endif
@@ -106,6 +106,9 @@ static const probe_fptr fs1[] = {
 #if ENABLE_FEATURE_VOLUMEID_SQUASHFS
         volume_id_probe_squashfs,
 #endif
+#if ENABLE_FEATURE_VOLUMEID_EROFS
+        volume_id_probe_erofs,
+#endif
 #if ENABLE_FEATURE_VOLUMEID_XFS
         volume_id_probe_xfs,
 #endif
@@ -115,7 +118,7 @@ static const probe_fptr fs1[] = {
 };
 
 /* fill buffer with maximum */
-static const probe_fptr fs2[] = {
+static const probe_fptr fs2[] ALIGN_PTR = {
 #if ENABLE_FEATURE_VOLUMEID_LINUXSWAP
         volume_id_probe_linux_swap,
 #endif
diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h
index ada18339d..b1e44481f 100644
--- a/util-linux/volume_id/volume_id_internal.h
+++ b/util-linux/volume_id/volume_id_internal.h
@@ -66,6 +66,9 @@ struct volume_id {
         uint8_t         *sbbuf;
         uint8_t         *seekbuf;
         uint64_t        seekbuf_off;
+#if ENABLE_FEATURE_BLKID_TYPE
+        const char      *type;
+#endif
 #ifdef UNUSED_PARTITION_CODE
         struct volume_id_partition *partitions;
         size_t          partition_count;
@@ -80,9 +83,6 @@ struct volume_id {
 //      char            type_version[VOLUME_ID_FORMAT_SIZE];
 //      smallint        usage_id;
 //      const char      *usage;
-#if ENABLE_FEATURE_BLKID_TYPE
-        const char      *type;
-#endif
 };
 
 struct volume_id* FAST_FUNC volume_id_open_node(int fd);
@@ -215,6 +215,8 @@ int FAST_FUNC volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/);
 
 int FAST_FUNC volume_id_probe_squashfs(struct volume_id *id /*,uint64_t off*/);
 
+int FAST_FUNC volume_id_probe_erofs(struct volume_id *id /*,uint64_t off*/);
+
 int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/);
 
 int FAST_FUNC volume_id_probe_udf(struct volume_id *id /*,uint64_t off*/);