Merge remote-tracking branch 'upstream/master'

250 files changed, 3469 insertions, 2479 deletions

diff --git a/Config.in b/Config.in
index 273f2de38..50d825bfe 100644
--- a/Config.in
+++ b/Config.in
@@ -151,8 +151,9 @@ config INSTALL_NO_USR
         default n
         depends on FEATURE_INSTALLER
         help
-          Disable use of /usr. busybox --install will install applets
-          only to /bin and /sbin, never to /usr/bin or /usr/sbin.
+          Disable use of /usr. busybox --install and "make install"
+          will install applets only to /bin and /sbin,
+          never to /usr/bin or /usr/sbin.
 
 config LOCALE_SUPPORT
         bool "Enable locale support (system needs locale for this to work)"
diff --git a/Makefile b/Makefile
index aff2a7a55..74c8b34f9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERSION = 1
-PATCHLEVEL = 18
+PATCHLEVEL = 19
 SUBLEVEL = 0
 EXTRAVERSION = .git
 NAME = Unnamed
@@ -465,7 +465,7 @@ core-y		:= \
 
 libs-y          := \
                 archival/ \
-                archival/libunarchive/ \
+                archival/libarchive/ \
                 console-tools/ \
                 coreutils/ \
                 coreutils/libcoreutils/ \
@@ -1010,8 +1010,8 @@ $(mrproper-dirs):
 mrproper: clean archmrproper $(mrproper-dirs)
         $(call cmd,rmdirs)
         $(call cmd,rmfiles)
-        @find -name Config.src | sed 's/.src$$/.in/' | xargs -r rm -f
-        @find -name Kbuild.src | sed 's/.src$$//' | xargs -r rm -f
+        @find . -name Config.src | sed 's/.src$$/.in/' | xargs -r rm -f
+        @find . -name Kbuild.src | sed 's/.src$$//' | xargs -r rm -f
 
 # distclean
 #
diff --git a/Makefile.flags b/Makefile.flags
index 7122d9bd6..c7a805877 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -4,7 +4,7 @@
 
 BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 export BB_VER
-SKIP_STRIP = n
+SKIP_STRIP ?= n
 
 # -std=gnu99 needed for [U]LLONG_MAX on some systems
 CPPFLAGS += $(call cc-option,-std=gnu99,)
diff --git a/archival/Kbuild.src b/archival/Kbuild.src
index a0edb123d..3466452f7 100644
--- a/archival/Kbuild.src
+++ b/archival/Kbuild.src
@@ -4,7 +4,7 @@
 #
 # Licensed under GPLv2, see file LICENSE in this source tree.
 
-libs-y                          += libunarchive/
+libs-y                          += libarchive/
 
 lib-y:=
 
@@ -19,8 +19,7 @@ lib-$(CONFIG_RPM)		+= rpm.o
 lib-$(CONFIG_TAR)               += tar.o
 lib-$(CONFIG_UNZIP)             += unzip.o
 
-lib-$(CONFIG_LZOP)              += lzop.o lzo1x_1.o lzo1x_1o.o lzo1x_d.o bbunzip.o
-lib-$(CONFIG_LZOP_COMPR_HIGH)   += lzo1x_9x.o
+lib-$(CONFIG_LZOP)              += lzop.o bbunzip.o
 lib-$(CONFIG_GZIP)              += gzip.o bbunzip.o
 lib-$(CONFIG_BZIP2)             += bzip2.o bbunzip.o
 
diff --git a/archival/ar.c b/archival/ar.c
index 05556c6cb..a2e3306ac 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -18,7 +18,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "ar.h"
 
 #if ENABLE_FEATURE_AR_CREATE
@@ -179,17 +179,17 @@ 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)
+#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_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)
+#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)
 
 int ar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ar_main(int argc UNUSED_PARAM, char **argv)
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index a195434e4..0f89443e0 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 enum {
         OPT_STDOUT     = 1 << 0,
diff --git a/archival/bzip2.c b/archival/bzip2.c
index fdb8b9306..ab08ffc1a 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -8,7 +8,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 #define CONFIG_BZIP2_FEATURE_SPEED 1
 
@@ -33,14 +33,14 @@
 /* Takes ~300 bytes, detects corruption caused by bad RAM etc */
 #define BZ_LIGHT_DEBUG 0
 
-#include "bz/bzlib.h"
+#include "libarchive/bz/bzlib.h"
 
-#include "bz/bzlib_private.h"
+#include "libarchive/bz/bzlib_private.h"
 
-#include "bz/blocksort.c"
-#include "bz/bzlib.c"
-#include "bz/compress.c"
-#include "bz/huffman.c"
+#include "libarchive/bz/blocksort.c"
+#include "libarchive/bz/bzlib.c"
+#include "libarchive/bz/compress.c"
+#include "libarchive/bz/huffman.c"
 
 /* No point in being shy and having very small buffer here.
  * bzip2 internal buffers are much bigger anyway, hundreds of kbytes.
@@ -128,10 +128,12 @@ IF_DESKTOP(long long) int FAST_FUNC compressStream(unpack_info_t *info UNUSED_PA
                         break;
         }
 
-#if ENABLE_FEATURE_CLEAN_UP
+        /* Can't be conditional on ENABLE_FEATURE_CLEAN_UP -
+         * we are called repeatedly
+         */
         BZ2_bzCompressEnd(strm);
         free(iobuf);
-#endif
+
         return total;
 }
 
diff --git a/archival/cpio.c b/archival/cpio.c
index a2d74dc79..c746a71fa 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -12,7 +12,37 @@
  *
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
+
+//usage:#define cpio_trivial_usage
+//usage:       "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]")
+//usage:       " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]")
+//usage:       " [EXTR_FILE]..."
+//usage:#define cpio_full_usage "\n\n"
+//usage:       "Extract or list files from a cpio archive"
+//usage:        IF_FEATURE_CPIO_O(", or"
+//usage:     "\ncreate an archive" IF_FEATURE_CPIO_P(" (-o) or copy files (-p)")
+//usage:                " using file list on stdin"
+//usage:        )
+//usage:     "\n"
+//usage:     "\nMain operation mode:"
+//usage:     "\n        -t      List"
+//usage:     "\n        -i      Extract EXTR_FILEs (or all)"
+//usage:        IF_FEATURE_CPIO_O(
+//usage:     "\n        -o      Create (requires -H newc)"
+//usage:        )
+//usage:        IF_FEATURE_CPIO_P(
+//usage:     "\n        -p DIR  Copy files to DIR"
+//usage:        )
+//usage:     "\nOptions:"
+//usage:     "\n        -d      Make leading directories"
+//usage:     "\n        -m      Preserve mtime"
+//usage:     "\n        -v      Verbose"
+//usage:     "\n        -u      Overwrite"
+//usage:     "\n        -F FILE Input (-t,-i,-p) or output (-o) file"
+//usage:        IF_FEATURE_CPIO_O(
+//usage:     "\n        -H newc Archive format"
+//usage:        )
 
 /* GNU cpio 2.9 --help (abridged):
 
@@ -20,7 +50,7 @@
   -t, --list                 List the archive
   -i, --extract              Extract files from an archive
   -o, --create               Create the archive
-  -p, --pass-through         Copy-pass mode [was ist das?!]
+  -p, --pass-through         Copy-pass mode
 
  Options valid in any mode:
       --block-size=SIZE      I/O block size = SIZE * 512 bytes
@@ -78,27 +108,28 @@
       --sparse               Write files with blocks of zeros as sparse files
   -u, --unconditional        Replace all files unconditionally
  */
+
 enum {
-        CPIO_OPT_EXTRACT            = (1 << 0),
-        CPIO_OPT_TEST               = (1 << 1),
-        CPIO_OPT_NUL_TERMINATED     = (1 << 2),
-        CPIO_OPT_UNCONDITIONAL      = (1 << 3),
-        CPIO_OPT_VERBOSE            = (1 << 4),
-        CPIO_OPT_CREATE_LEADING_DIR = (1 << 5),
-        CPIO_OPT_PRESERVE_MTIME     = (1 << 6),
-        CPIO_OPT_DEREF              = (1 << 7),
-        CPIO_OPT_FILE               = (1 << 8),
+        OPT_EXTRACT            = (1 << 0),
+        OPT_TEST               = (1 << 1),
+        OPT_NUL_TERMINATED     = (1 << 2),
+        OPT_UNCONDITIONAL      = (1 << 3),
+        OPT_VERBOSE            = (1 << 4),
+        OPT_CREATE_LEADING_DIR = (1 << 5),
+        OPT_PRESERVE_MTIME     = (1 << 6),
+        OPT_DEREF              = (1 << 7),
+        OPT_FILE               = (1 << 8),
         OPTBIT_FILE = 8,
         IF_FEATURE_CPIO_O(OPTBIT_CREATE     ,)
         IF_FEATURE_CPIO_O(OPTBIT_FORMAT     ,)
         IF_FEATURE_CPIO_P(OPTBIT_PASSTHROUGH,)
         IF_LONG_OPTS(     OPTBIT_QUIET      ,)
         IF_LONG_OPTS(     OPTBIT_2STDOUT    ,)
-        CPIO_OPT_CREATE             = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE     )) + 0,
-        CPIO_OPT_FORMAT             = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT     )) + 0,
-        CPIO_OPT_PASSTHROUGH        = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
-        CPIO_OPT_QUIET              = IF_LONG_OPTS(     (1 << OPTBIT_QUIET      )) + 0,
-        CPIO_OPT_2STDOUT            = IF_LONG_OPTS(     (1 << OPTBIT_2STDOUT    )) + 0,
+        OPT_CREATE             = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE     )) + 0,
+        OPT_FORMAT             = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT     )) + 0,
+        OPT_PASSTHROUGH        = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
+        OPT_QUIET              = IF_LONG_OPTS(     (1 << OPTBIT_QUIET      )) + 0,
+        OPT_2STDOUT            = IF_LONG_OPTS(     (1 << OPTBIT_2STDOUT    )) + 0,
 };
 
 #define OPTION_STR "it0uvdmLF:"
@@ -138,7 +169,7 @@ static NOINLINE int cpio_o(void)
                 char *line;
                 struct stat st;
 
-                line = (option_mask32 & CPIO_OPT_NUL_TERMINATED)
+                line = (option_mask32 & OPT_NUL_TERMINATED)
                                 ? bb_get_chunk_from_file(stdin, NULL)
                                 : xmalloc_fgetline(stdin);
 
@@ -153,7 +184,7 @@ static NOINLINE int cpio_o(void)
                                 free(line);
                                 continue;
                         }
-                        if ((option_mask32 & CPIO_OPT_DEREF)
+                        if ((option_mask32 & OPT_DEREF)
                                         ? stat(name, &st)
                                         : lstat(name, &st)
                         ) {
@@ -308,28 +339,24 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
         /* -L makes sense only with -o or -p */
 
 #if !ENABLE_FEATURE_CPIO_O
-        /* no parameters */
-        opt_complementary = "=0";
         opt = getopt32(argv, OPTION_STR, &cpio_filename);
         argv += optind;
-        if (opt & CPIO_OPT_FILE) { /* -F */
+        if (opt & OPT_FILE) { /* -F */
                 xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
         }
 #else
-        /* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */
-        opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0";
         opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt);
         argv += optind;
-        if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */
+        if ((opt & (OPT_FILE|OPT_CREATE)) == OPT_FILE) { /* -F without -o */
                 xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
         }
-        if (opt & CPIO_OPT_PASSTHROUGH) {
+        if (opt & OPT_PASSTHROUGH) {
                 pid_t pid;
                 struct fd_pair pp;
 
                 if (argv[0] == NULL)
                         bb_show_usage();
-                if (opt & CPIO_OPT_CREATE_LEADING_DIR)
+                if (opt & OPT_CREATE_LEADING_DIR)
                         mkdir(argv[0], 0777);
                 /* Crude existence check:
                  * close(xopen(argv[0], O_RDONLY | O_DIRECTORY));
@@ -361,15 +388,15 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
                 xchdir(*argv++);
                 close(pp.wr);
                 xmove_fd(pp.rd, STDIN_FILENO);
-                //opt &= ~CPIO_OPT_PASSTHROUGH;
-                opt |= CPIO_OPT_EXTRACT;
+                //opt &= ~OPT_PASSTHROUGH;
+                opt |= OPT_EXTRACT;
                 goto skip;
         }
         /* -o */
-        if (opt & CPIO_OPT_CREATE) {
+        if (opt & OPT_CREATE) {
                 if (cpio_fmt[0] != 'n') /* we _require_ "-H newc" */
                         bb_show_usage();
-                if (opt & CPIO_OPT_FILE) {
+                if (opt & OPT_FILE) {
                         xmove_fd(xopen(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
                 }
  dump:
@@ -379,35 +406,35 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         /* One of either extract or test options must be given */
-        if ((opt & (CPIO_OPT_TEST | CPIO_OPT_EXTRACT)) == 0) {
+        if ((opt & (OPT_TEST | OPT_EXTRACT)) == 0) {
                 bb_show_usage();
         }
 
-        if (opt & CPIO_OPT_TEST) {
+        if (opt & OPT_TEST) {
                 /* if both extract and test options are given, ignore extract option */
-                opt &= ~CPIO_OPT_EXTRACT;
+                opt &= ~OPT_EXTRACT;
                 archive_handle->action_header = header_list;
         }
-        if (opt & CPIO_OPT_EXTRACT) {
+        if (opt & OPT_EXTRACT) {
                 archive_handle->action_data = data_extract_all;
-                if (opt & CPIO_OPT_2STDOUT)
+                if (opt & OPT_2STDOUT)
                         archive_handle->action_data = data_extract_to_stdout;
         }
-        if (opt & CPIO_OPT_UNCONDITIONAL) {
+        if (opt & OPT_UNCONDITIONAL) {
                 archive_handle->ah_flags |= ARCHIVE_UNLINK_OLD;
                 archive_handle->ah_flags &= ~ARCHIVE_EXTRACT_NEWER;
         }
-        if (opt & CPIO_OPT_VERBOSE) {
+        if (opt & OPT_VERBOSE) {
                 if (archive_handle->action_header == header_list) {
                         archive_handle->action_header = header_verbose_list;
                 } else {
                         archive_handle->action_header = header_list;
                 }
         }
-        if (opt & CPIO_OPT_CREATE_LEADING_DIR) {
+        if (opt & OPT_CREATE_LEADING_DIR) {
                 archive_handle->ah_flags |= ARCHIVE_CREATE_LEADING_DIRS;
         }
-        if (opt & CPIO_OPT_PRESERVE_MTIME) {
+        if (opt & OPT_PRESERVE_MTIME) {
                 archive_handle->ah_flags |= ARCHIVE_RESTORE_DATE;
         }
 
@@ -423,7 +450,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
                 continue;
 
         if (archive_handle->cpio__blocks != (off_t)-1
-         && !(opt & CPIO_OPT_QUIET)
+         && !(opt & OPT_QUIET)
         ) {
                 fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
         }
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 508b4297b..c37ae3349 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -30,7 +30,7 @@
 
 #include "libbb.h"
 #include <fnmatch.h>
-#include "unarchive.h"
+#include "archive.h"
 
 /* note: if you vary hash_prime sizes be aware,
  * 1) tweaking these will have a big effect on how much memory this program uses.
@@ -939,8 +939,8 @@ static int package_satisfies_dependency(int package, int depend_type)
                 return 0;
 
         switch (depend_type) {
-        case EDGE_PRE_DEPENDS:  return get_status(status_num, 3) == search_name_hashtable("installed");
-        case EDGE_DEPENDS:      return get_status(status_num, 1) == search_name_hashtable("install");
+        case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed");
+        case EDGE_DEPENDS:     return get_status(status_num, 1) == search_name_hashtable("install");
         }
         return 0;
 }
@@ -967,7 +967,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
                 conflicts[conflicts_num] = package_num;
                 conflicts_num++;
                 /* add provides to conflicts list */
-                for (j = 0; j < package_hashtable[package_num]->num_of_edges; j++) {
+                for (j = 0; j < package_hashtable[package_num]->num_of_edges; j++) {
                         if (package_hashtable[package_num]->edge[j]->type == EDGE_PROVIDES) {
                                 const int conflicts_package_num = search_package_hashtable(
                                         package_hashtable[package_num]->edge[j]->name,
@@ -1067,12 +1067,13 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
 
                         if (package_edge->type == EDGE_OR_PRE_DEPENDS
                          || package_edge->type == EDGE_OR_DEPENDS
-                        ) {     /* start an EDGE_OR_ list */
+                        ) {
+                                /* start an EDGE_OR_ list */
                                 number_of_alternatives = package_edge->version;
                                 root_of_alternatives = package_edge;
                                 continue;
                         }
-                        if (number_of_alternatives == 0) {      /* not in the middle of an EDGE_OR_ list */
+                        if (number_of_alternatives == 0) {  /* not in the middle of an EDGE_OR_ list */
                                 number_of_alternatives = 1;
                                 root_of_alternatives = NULL;
                         }
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 4c627e890..aee7b4cf5 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -5,13 +5,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
-#define DPKG_DEB_OPT_CONTENTS   1
-#define DPKG_DEB_OPT_CONTROL    2
-#define DPKG_DEB_OPT_FIELD      4
-#define DPKG_DEB_OPT_EXTRACT    8
-#define DPKG_DEB_OPT_EXTRACT_VERBOSE    16
+#define DPKG_DEB_OPT_CONTENTS         1
+#define DPKG_DEB_OPT_CONTROL          2
+#define DPKG_DEB_OPT_FIELD            4
+#define DPKG_DEB_OPT_EXTRACT          8
+#define DPKG_DEB_OPT_EXTRACT_VERBOSE 16
 
 int dpkg_deb_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dpkg_deb_main(int argc, char **argv)
diff --git a/archival/gzip.c b/archival/gzip.c
index b573ed6ab..feeddf58f 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -40,7 +40,7 @@ aa:      85.1% -- replaced with aa.gz
 */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 
 /* ===========================================================================
diff --git a/archival/libunarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index e92b4aad2..b0bc4e5aa 100644
--- a/archival/libunarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -48,6 +48,8 @@ lib-$(CONFIG_RPM)                       += open_transformer.o decompress_unzip.o
 lib-$(CONFIG_TAR)                       += get_header_tar.o
 lib-$(CONFIG_UNCOMPRESS)                += decompress_uncompress.o
 lib-$(CONFIG_UNZIP)                     += decompress_unzip.o
+lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
+lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
 lib-$(CONFIG_FEATURE_SEAMLESS_Z)        += open_transformer.o decompress_uncompress.o
 lib-$(CONFIG_FEATURE_SEAMLESS_GZ)       += open_transformer.o decompress_unzip.o get_header_tar_gz.o
 lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o get_header_tar_bz2.o
diff --git a/archival/bz/LICENSE b/archival/libarchive/bz/LICENSE
index da4346520..da4346520 100644
--- a/archival/bz/LICENSE
+++ b/archival/libarchive/bz/LICENSE
diff --git a/archival/bz/README b/archival/libarchive/bz/README
index fffd47b8a..fffd47b8a 100644
--- a/archival/bz/README
+++ b/archival/libarchive/bz/README
diff --git a/archival/bz/blocksort.c b/archival/libarchive/bz/blocksort.c
index f70c3701d..f70c3701d 100644
--- a/archival/bz/blocksort.c
+++ b/archival/libarchive/bz/blocksort.c
diff --git a/archival/bz/bzlib.c b/archival/libarchive/bz/bzlib.c
index 834179403..5f7db747a 100644
--- a/archival/bz/bzlib.c
+++ b/archival/libarchive/bz/bzlib.c
@@ -28,7 +28,7 @@ in the file LICENSE.
  * 0.9.0a/b -- no changes in this file.
  * 0.9.0c   -- made zero-length BZ_FLUSH work correctly in bzCompress().
  *             fixed bzWrite/bzRead to ignore zero-length requests.
- *             fixed bzread to correctly handle read requests after EOF.
+ *             fixed bzread to correctly handle read requests after EOF.
  *             wrong parameter order in call to bzDecompressInit in
  *             bzBuffToBuffDecompress.  Fixed.
  */
@@ -361,7 +361,6 @@ int BZ2_bzCompress(bz_stream *strm, int action)
 
 
 /*---------------------------------------------------*/
-#if ENABLE_FEATURE_CLEAN_UP
 static
 void BZ2_bzCompressEnd(bz_stream *strm)
 {
@@ -372,9 +371,8 @@ void BZ2_bzCompressEnd(bz_stream *strm)
         free(s->arr2);
         free(s->ftab);
         free(s->crc32table);
-        free(strm->state);
+        free(s);
 }
-#endif
 
 
 /*---------------------------------------------------*/
diff --git a/archival/bz/bzlib.h b/archival/libarchive/bz/bzlib.h
index 1bb811c4a..1bb811c4a 100644
--- a/archival/bz/bzlib.h
+++ b/archival/libarchive/bz/bzlib.h
diff --git a/archival/bz/bzlib_private.h b/archival/libarchive/bz/bzlib_private.h
index 6430ce407..6430ce407 100644
--- a/archival/bz/bzlib_private.h
+++ b/archival/libarchive/bz/bzlib_private.h
diff --git a/archival/bz/compress.c b/archival/libarchive/bz/compress.c
index b9b0949a9..6f1c70a08 100644
--- a/archival/bz/compress.c
+++ b/archival/libarchive/bz/compress.c
@@ -134,15 +134,14 @@ void generateMTFValues(EState* s)
          * holds the original block data.
          *
          * The first thing to do is generate the MTF values,
-         * and put them in
-         *      ((uint16_t*)s->arr1)[0 .. s->nblock-1].
+         * and put them in ((uint16_t*)s->arr1)[0 .. s->nblock-1].
+         *
          * Because there are strictly fewer or equal MTF values
          * than block values, ptr values in this area are overwritten
          * with MTF values only when they are no longer needed.
          *
          * The final compressed bitstream is generated into the
-         * area starting at
-         *      &((uint8_t*)s->arr2)[s->nblock]
+         * area starting at &((uint8_t*)s->arr2)[s->nblock]
          *
          * These storage aliases are set up in bzCompressInit(),
          * except for the last one, which is arranged in
@@ -459,7 +458,7 @@ void sendMTFValues(EState* s)
         }
 
         AssertH(nGroups < 8, 3002);
-        AssertH(nSelectors < 32768 && nSelectors <= (2 + (900000 / BZ_G_SIZE)), 3003);
+        AssertH(nSelectors < 32768 && nSelectors <= (2 + (900000 / BZ_G_SIZE)), 3003);
 
         /*--- Compute MTF values for the selectors. ---*/
         {
diff --git a/archival/bz/huffman.c b/archival/libarchive/bz/huffman.c
index 676b1af66..676b1af66 100644
--- a/archival/bz/huffman.c
+++ b/archival/libarchive/bz/huffman.c
diff --git a/archival/libunarchive/data_align.c b/archival/libarchive/data_align.c
index 4e21a36b3..2e56fa8ff 100644
--- a/archival/libunarchive/data_align.c
+++ b/archival/libarchive/data_align.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary)
 {
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 5fb1ab2ae..1b25c8bd6 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index b54f7f215..2bbab7641 100644
--- a/archival/libunarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 enum {
         //TAR_FILETYPE,
diff --git a/archival/libunarchive/data_extract_to_stdout.c b/archival/libarchive/data_extract_to_stdout.c
index ce0713ac4..91f3f3539 100644
--- a/archival/libunarchive/data_extract_to_stdout.c
+++ b/archival/libarchive/data_extract_to_stdout.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/data_skip.c b/archival/libarchive/data_skip.c
index 06b74399d..a055424e2 100644
--- a/archival/libunarchive/data_skip.c
+++ b/archival/libarchive/data_skip.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC data_skip(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index 22015683c..4e46e6849 100644
--- a/archival/libunarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -16,10 +16,21 @@
         function, and various other tweaks.  In (limited) tests, approximately
         20% faster than bzcat on x86 and about 10% faster on arm.
 
-        Note that about 2/3 of the time is spent in read_unzip() reversing
+        Note that about 2/3 of the time is spent in read_bunzip() reversing
         the Burrows-Wheeler transformation.  Much of that time is delay
         resulting from cache misses.
 
+        (2010 update by vda: profiled "bzcat <84mbyte.bz2 >/dev/null"
+        on x86-64 CPU with L2 > 1M: get_next_block is hotter than read_bunzip:
+        %time seconds   calls function
+        71.01   12.69     444 get_next_block
+        28.65    5.12   93065 read_bunzip
+        00.22    0.04 7736490 get_bits
+        00.11    0.02      47 dealloc_bunzip
+        00.00    0.00   93018 full_write
+        ...)
+
+
         I would ask that anyone benefiting from this work, especially those
         using it in commercial products, consider making a donation to my local
         non-profit hospice organization (www.hospiceacadiana.com) in the name of
@@ -29,7 +40,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* Constants for Huffman coding */
 #define MAX_GROUPS          6
@@ -70,38 +81,41 @@ struct bunzip_data {
         /* I/O tracking data (file handles, buffers, positions, etc.) */
         unsigned inbufBitCount, inbufBits;
         int in_fd, out_fd, inbufCount, inbufPos /*, outbufPos*/;
-        unsigned char *inbuf /*,*outbuf*/;
+        uint8_t *inbuf /*,*outbuf*/;
 
         /* State for interrupting output loop */
-        int writeCopies, writePos, writeRunCountdown, writeCount, writeCurrent;
+        int writeCopies, writePos, writeRunCountdown, writeCount;
+        int writeCurrent; /* actually a uint8_t */
 
         /* The CRC values stored in the block header and calculated from the data */
         uint32_t headerCRC, totalCRC, writeCRC;
 
         /* Intermediate buffer and its size (in bytes) */
-        unsigned *dbuf, dbufSize;
+        uint32_t *dbuf;
+        unsigned dbufSize;
 
         /* For I/O error handling */
         jmp_buf jmpbuf;
 
         /* Big things go last (register-relative addressing can be larger for big offsets) */
         uint32_t crc32Table[256];
-        unsigned char selectors[32768];                 /* nSelectors=15 bits */
-        struct group_data groups[MAX_GROUPS];   /* Huffman coding tables */
+        uint8_t selectors[32768];  /* nSelectors=15 bits */
+        struct group_data groups[MAX_GROUPS];  /* Huffman coding tables */
 };
 /* typedef struct bunzip_data bunzip_data; -- done in .h file */
 
 
 /* Return the next nnn bits of input.  All reads from the compressed input
    are done through this function.  All reads are big endian */
-
 static unsigned get_bits(bunzip_data *bd, int bits_wanted)
 {
         unsigned bits = 0;
+        /* Cache bd->inbufBitCount in a CPU register (hopefully): */
+        int bit_count = bd->inbufBitCount;
 
         /* If we need to get more data from the byte buffer, do so.  (Loop getting
            one byte at a time to enforce endianness and avoid unaligned access.) */
-        while ((int)(bd->inbufBitCount) < bits_wanted) {
+        while (bit_count < bits_wanted) {
 
                 /* If we need to read more data from file into byte buffer, do so */
                 if (bd->inbufPos == bd->inbufCount) {
@@ -113,41 +127,47 @@ static unsigned get_bits(bunzip_data *bd, int bits_wanted)
                 }
 
                 /* Avoid 32-bit overflow (dump bit buffer to top of output) */
-                if (bd->inbufBitCount >= 24) {
-                        bits = bd->inbufBits & ((1 << bd->inbufBitCount) - 1);
-                        bits_wanted -= bd->inbufBitCount;
+                if (bit_count >= 24) {
+                        bits = bd->inbufBits & ((1 << bit_count) - 1);
+                        bits_wanted -= bit_count;
                         bits <<= bits_wanted;
-                        bd->inbufBitCount = 0;
+                        bit_count = 0;
                 }
 
                 /* Grab next 8 bits of input from buffer. */
                 bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++];
-                bd->inbufBitCount += 8;
+                bit_count += 8;
         }
 
         /* Calculate result */
-        bd->inbufBitCount -= bits_wanted;
-        bits |= (bd->inbufBits >> bd->inbufBitCount) & ((1 << bits_wanted) - 1);
+        bit_count -= bits_wanted;
+        bd->inbufBitCount = bit_count;
+        bits |= (bd->inbufBits >> bit_count) & ((1 << bits_wanted) - 1);
 
         return bits;
 }
 
-/* Unpacks the next block and sets up for the inverse burrows-wheeler step. */
+/* Unpacks the next block and sets up for the inverse Burrows-Wheeler step. */
 static int get_next_block(bunzip_data *bd)
 {
         struct group_data *hufGroup;
-        int dbufCount, nextSym, dbufSize, groupCount, *base, *limit, selector,
-                i, j, k, t, runPos, symCount, symTotal, nSelectors, byteCount[256];
-        unsigned char uc, symToByte[256], mtfSymbol[256], *selectors;
-        unsigned *dbuf, origPtr;
+        int dbufCount, dbufSize, groupCount, *base, *limit, selector,
+                i, j, t, runPos, symCount, symTotal, nSelectors, byteCount[256];
+        int runCnt = runCnt; /* for compiler */
+        uint8_t uc, symToByte[256], mtfSymbol[256], *selectors;
+        uint32_t *dbuf;
+        unsigned origPtr;
 
         dbuf = bd->dbuf;
         dbufSize = bd->dbufSize;
         selectors = bd->selectors;
 
+/* In bbox, we are ok with aborting through setjmp which is set up in start_bunzip */
+#if 0
         /* Reset longjmp I/O error handling */
         i = setjmp(bd->jmpbuf);
         if (i) return i;
+#endif
 
         /* Read in header signature and CRC, then validate signature.
            (last block signature means CRC is for whole file, return now) */
@@ -169,16 +189,23 @@ static int get_next_block(bunzip_data *bd)
            symbols to deal with, and writes a sparse bitfield indicating which
            values were present.  We make a translation table to convert the symbols
            back to the corresponding bytes. */
-        t = get_bits(bd, 16);
         symTotal = 0;
-        for (i = 0; i < 16; i++) {
-                if (t & (1 << (15-i))) {
-                        k = get_bits(bd, 16);
-                        for (j = 0; j < 16; j++)
-                                if (k & (1 << (15-j)))
-                                        symToByte[symTotal++] = (16*i) + j;
+        i = 0;
+        t = get_bits(bd, 16);
+        do {
+                if (t & (1 << 15)) {
+                        unsigned inner_map = get_bits(bd, 16);
+                        do {
+                                if (inner_map & (1 << 15))
+                                        symToByte[symTotal++] = i;
+                                inner_map <<= 1;
+                                i++;
+                        } while (i & 15);
+                        i -= 16;
                 }
-        }
+                t <<= 1;
+                i += 16;
+        } while (i < 256);
 
         /* How many different Huffman coding groups does this block use? */
         groupCount = get_bits(bd, 3);
@@ -189,57 +216,63 @@ static int get_next_block(bunzip_data *bd)
            group.  Read in the group selector list, which is stored as MTF encoded
            bit runs.  (MTF=Move To Front, as each value is used it's moved to the
            start of the list.) */
+        for (i = 0; i < groupCount; i++)
+                mtfSymbol[i] = i;
         nSelectors = get_bits(bd, 15);
-        if (!nSelectors) return RETVAL_DATA_ERROR;
-        for (i = 0; i < groupCount; i++) mtfSymbol[i] = i;
+        if (!nSelectors)
+                return RETVAL_DATA_ERROR;
         for (i = 0; i < nSelectors; i++) {
-
+                uint8_t tmp_byte;
                 /* Get next value */
-                for (j = 0; get_bits(bd, 1); j++)
-                        if (j >= groupCount) return RETVAL_DATA_ERROR;
-
+                int n = 0;
+                while (get_bits(bd, 1)) {
+                        if (n >= groupCount) return RETVAL_DATA_ERROR;
+                        n++;
+                }
                 /* Decode MTF to get the next selector */
-                uc = mtfSymbol[j];
-                for (;j;j--) mtfSymbol[j] = mtfSymbol[j-1];
-                mtfSymbol[0] = selectors[i] = uc;
+                tmp_byte = mtfSymbol[n];
+                while (--n >= 0)
+                        mtfSymbol[n + 1] = mtfSymbol[n];
+                mtfSymbol[0] = selectors[i] = tmp_byte;
         }
 
         /* Read the Huffman coding tables for each group, which code for symTotal
            literal symbols, plus two run symbols (RUNA, RUNB) */
         symCount = symTotal + 2;
         for (j = 0; j < groupCount; j++) {
-                unsigned char length[MAX_SYMBOLS];
+                uint8_t length[MAX_SYMBOLS];
                 /* 8 bits is ALMOST enough for temp[], see below */
                 unsigned temp[MAX_HUFCODE_BITS+1];
-                int minLen, maxLen, pp;
+                int minLen, maxLen, pp, len_m1;
 
                 /* Read Huffman code lengths for each symbol.  They're stored in
                    a way similar to mtf; record a starting value for the first symbol,
-                   and an offset from the previous value for everys symbol after that.
+                   and an offset from the previous value for every symbol after that.
                    (Subtracting 1 before the loop and then adding it back at the end is
                    an optimization that makes the test inside the loop simpler: symbol
                    length 0 becomes negative, so an unsigned inequality catches it.) */
-                t = get_bits(bd, 5) - 1;
+                len_m1 = get_bits(bd, 5) - 1;
                 for (i = 0; i < symCount; i++) {
                         for (;;) {
-                                if ((unsigned)t > (MAX_HUFCODE_BITS-1))
+                                int two_bits;
+                                if ((unsigned)len_m1 > (MAX_HUFCODE_BITS-1))
                                         return RETVAL_DATA_ERROR;
 
                                 /* If first bit is 0, stop.  Else second bit indicates whether
                                    to increment or decrement the value.  Optimization: grab 2
                                    bits and unget the second if the first was 0. */
-                                k = get_bits(bd, 2);
-                                if (k < 2) {
+                                two_bits = get_bits(bd, 2);
+                                if (two_bits < 2) {
                                         bd->inbufBitCount++;
                                         break;
                                 }
 
                                 /* Add one if second bit 1, else subtract 1.  Avoids if/else */
-                                t += (((k+1) & 2) - 1);
+                                len_m1 += (((two_bits+1) & 2) - 1);
                         }
 
                         /* Correct for the initial -1, to get the final symbol length */
-                        length[i] = t + 1;
+                        length[i] = len_m1 + 1;
                 }
 
                 /* Find largest and smallest lengths in this group */
@@ -265,17 +298,18 @@ static int get_next_block(bunzip_data *bd)
 
                 /* Note that minLen can't be smaller than 1, so we adjust the base
                    and limit array pointers so we're not always wasting the first
-                   entry.  We do this again when using them (during symbol decoding).*/
+                   entry.  We do this again when using them (during symbol decoding). */
                 base = hufGroup->base - 1;
                 limit = hufGroup->limit - 1;
 
                 /* Calculate permute[].  Concurently, initialize temp[] and limit[]. */
                 pp = 0;
                 for (i = minLen; i <= maxLen; i++) {
+                        int k;
                         temp[i] = limit[i] = 0;
-                        for (t = 0; t < symCount; t++)
-                                if (length[t] == i)
-                                        hufGroup->permute[pp++] = t;
+                        for (k = 0; k < symCount; k++)
+                                if (length[k] == i)
+                                        hufGroup->permute[pp++] = k;
                 }
 
                 /* Count symbols coded for at each bit length */
@@ -288,8 +322,10 @@ static int get_next_block(bunzip_data *bd)
                  * base[] (number of symbols to ignore at each bit length, which is
                  * limit minus the cumulative count of symbols coded for already). */
                 pp = t = 0;
-                for (i = minLen; i < maxLen; i++) {
-                        pp += temp[i];
+                for (i = minLen; i < maxLen;) {
+                        unsigned temp_i = temp[i];
+
+                        pp += temp_i;
 
                         /* We read the largest possible symbol size and then unget bits
                            after determining how many we need, and those extra bits could
@@ -299,11 +335,11 @@ static int get_next_block(bunzip_data *bd)
                            don't affect the value>limit[length] comparison. */
                         limit[i] = (pp << (maxLen - i)) - 1;
                         pp <<= 1;
-                        t += temp[i];
-                        base[i+1] = pp - t;
+                        t += temp_i;
+                        base[++i] = pp - t;
                 }
-                limit[maxLen+1] = INT_MAX; /* Sentinel value for reading next sym. */
                 limit[maxLen] = pp + temp[maxLen] - 1;
+                limit[maxLen+1] = INT_MAX; /* Sentinel value for reading next sym. */
                 base[minLen] = 0;
         }
 
@@ -312,16 +348,17 @@ static int get_next_block(bunzip_data *bd)
            and run length encoding, saving the result into dbuf[dbufCount++] = uc */
 
         /* Initialize symbol occurrence counters and symbol Move To Front table */
-        memset(byteCount, 0, sizeof(byteCount)); /* smaller, maybe slower? */
+        /*memset(byteCount, 0, sizeof(byteCount)); - smaller, but slower */
         for (i = 0; i < 256; i++) {
-                //byteCount[i] = 0;
-                mtfSymbol[i] = (unsigned char)i;
+                byteCount[i] = 0;
+                mtfSymbol[i] = (uint8_t)i;
         }
 
         /* Loop through compressed symbols. */
 
         runPos = dbufCount = selector = 0;
         for (;;) {
+                int nextSym;
 
                 /* Fetch next Huffman coding group from list. */
                 symCount = GROUP_SIZE - 1;
@@ -329,44 +366,49 @@ static int get_next_block(bunzip_data *bd)
                 hufGroup = bd->groups + selectors[selector++];
                 base = hufGroup->base - 1;
                 limit = hufGroup->limit - 1;
- continue_this_group:
 
+ continue_this_group:
                 /* Read next Huffman-coded symbol. */
 
                 /* Note: It is far cheaper to read maxLen bits and back up than it is
-                   to read minLen bits and then an additional bit at a time, testing
+                   to read minLen bits and then add additional bit at a time, testing
                    as we go.  Because there is a trailing last block (with file CRC),
                    there is no danger of the overread causing an unexpected EOF for a
-                   valid compressed file.  As a further optimization, we do the read
-                   inline (falling back to a call to get_bits if the buffer runs
-                   dry).  The following (up to got_huff_bits:) is equivalent to
-                   j = get_bits(bd, hufGroup->maxLen);
+                   valid compressed file.
                  */
-                while ((int)(bd->inbufBitCount) < hufGroup->maxLen) {
-                        if (bd->inbufPos == bd->inbufCount) {
-                                j = get_bits(bd, hufGroup->maxLen);
-                                goto got_huff_bits;
-                        }
-                        bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++];
-                        bd->inbufBitCount += 8;
-                };
-                bd->inbufBitCount -= hufGroup->maxLen;
-                j = (bd->inbufBits >> bd->inbufBitCount) & ((1 << hufGroup->maxLen) - 1);
-
- got_huff_bits:
-
-                /* Figure how how many bits are in next symbol and unget extras */
+                if (1) {
+                        /* As a further optimization, we do the read inline
+                           (falling back to a call to get_bits if the buffer runs dry).
+                         */
+                        int new_cnt;
+                        while ((new_cnt = bd->inbufBitCount - hufGroup->maxLen) < 0) {
+                                /* bd->inbufBitCount < hufGroup->maxLen */
+                                if (bd->inbufPos == bd->inbufCount) {
+                                        nextSym = get_bits(bd, hufGroup->maxLen);
+                                        goto got_huff_bits;
+                                }
+                                bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++];
+                                bd->inbufBitCount += 8;
+                        };
+                        bd->inbufBitCount = new_cnt; /* "bd->inbufBitCount -= hufGroup->maxLen;" */
+                        nextSym = (bd->inbufBits >> new_cnt) & ((1 << hufGroup->maxLen) - 1);
+ got_huff_bits: ;
+                } else { /* unoptimized equivalent */
+                        nextSym = get_bits(bd, hufGroup->maxLen);
+                }
+                /* Figure how many bits are in next symbol and unget extras */
                 i = hufGroup->minLen;
-                while (j > limit[i]) ++i;
-                bd->inbufBitCount += (hufGroup->maxLen - i);
+                while (nextSym > limit[i]) ++i;
+                j = hufGroup->maxLen - i;
+                if (j < 0)
+                        return RETVAL_DATA_ERROR;
+                bd->inbufBitCount += j;
 
                 /* Huffman decode value to get nextSym (with bounds checking) */
-                if (i > hufGroup->maxLen)
+                nextSym = (nextSym >> j) - base[i];
+                if ((unsigned)nextSym >= MAX_SYMBOLS)
                         return RETVAL_DATA_ERROR;
-                j = (j >> (hufGroup->maxLen - i)) - base[i];
-                if ((unsigned)j >= MAX_SYMBOLS)
-                        return RETVAL_DATA_ERROR;
-                nextSym = hufGroup->permute[j];
+                nextSym = hufGroup->permute[nextSym];
 
                 /* We have now decoded the symbol, which indicates either a new literal
                    byte, or a repeated run of the most recent literal byte.  First,
@@ -375,9 +417,9 @@ static int get_next_block(bunzip_data *bd)
                 if ((unsigned)nextSym <= SYMBOL_RUNB) { /* RUNA or RUNB */
 
                         /* If this is the start of a new run, zero out counter */
-                        if (!runPos) {
+                        if (runPos == 0) {
                                 runPos = 1;
-                                t = 0;
+                                runCnt = 0;
                         }
 
                         /* Neat trick that saves 1 symbol: instead of or-ing 0 or 1 at
@@ -387,7 +429,7 @@ static int get_next_block(bunzip_data *bd)
                            the basic or 0/1 method (except all bits 0, which would use no
                            symbols, but a run of length 0 doesn't mean anything in this
                            context).  Thus space is saved. */
-                        t += (runPos << nextSym); /* +runPos if RUNA; +2*runPos if RUNB */
+                        runCnt += (runPos << nextSym); /* +runPos if RUNA; +2*runPos if RUNB */
                         if (runPos < dbufSize) runPos <<= 1;
                         goto end_of_huffman_loop;
                 }
@@ -396,13 +438,13 @@ static int get_next_block(bunzip_data *bd)
                    how many times to repeat the last literal, so append that many
                    copies to our buffer of decoded symbols (dbuf) now.  (The last
                    literal used is the one at the head of the mtfSymbol array.) */
-                if (runPos) {
+                if (runPos != 0) {
+                        uint8_t tmp_byte;
+                        if (dbufCount + runCnt >= dbufSize) return RETVAL_DATA_ERROR;
+                        tmp_byte = symToByte[mtfSymbol[0]];
+                        byteCount[tmp_byte] += runCnt;
+                        while (--runCnt >= 0) dbuf[dbufCount++] = (uint32_t)tmp_byte;
                         runPos = 0;
-                        if (dbufCount + t >= dbufSize) return RETVAL_DATA_ERROR;
-
-                        uc = symToByte[mtfSymbol[0]];
-                        byteCount[uc] += t;
-                        while (t--) dbuf[dbufCount++] = uc;
                 }
 
                 /* Is this the terminating symbol? */
@@ -431,12 +473,12 @@ static int get_next_block(bunzip_data *bd)
 
                 /* We have our literal byte.  Save it into dbuf. */
                 byteCount[uc]++;
-                dbuf[dbufCount++] = (unsigned)uc;
+                dbuf[dbufCount++] = (uint32_t)uc;
 
                 /* Skip group initialization if we're not done with this group.  Done
                  * this way to avoid compiler warning. */
  end_of_huffman_loop:
-                if (symCount--) goto continue_this_group;
+                if (--symCount >= 0) goto continue_this_group;
         }
 
         /* At this point, we've read all the Huffman-coded symbols (and repeated
@@ -449,26 +491,28 @@ static int get_next_block(bunzip_data *bd)
         /* Turn byteCount into cumulative occurrence counts of 0 to n-1. */
         j = 0;
         for (i = 0; i < 256; i++) {
-                k = j + byteCount[i];
+                int tmp_count = j + byteCount[i];
                 byteCount[i] = j;
-                j = k;
+                j = tmp_count;
         }
 
         /* Figure out what order dbuf would be in if we sorted it. */
         for (i = 0; i < dbufCount; i++) {
-                uc = (unsigned char)(dbuf[i] & 0xff);
-                dbuf[byteCount[uc]] |= (i << 8);
-                byteCount[uc]++;
+                uint8_t tmp_byte = (uint8_t)dbuf[i];
+                int tmp_count = byteCount[tmp_byte];
+                dbuf[tmp_count] |= (i << 8);
+                byteCount[tmp_byte] = tmp_count + 1;
         }
 
         /* Decode first byte by hand to initialize "previous" byte.  Note that it
            doesn't get output, and if the first three characters are identical
            it doesn't qualify as a run (hence writeRunCountdown=5). */
         if (dbufCount) {
+                uint32_t tmp;
                 if ((int)origPtr >= dbufCount) return RETVAL_DATA_ERROR;
-                bd->writePos = dbuf[origPtr];
-                bd->writeCurrent = (unsigned char)(bd->writePos & 0xff);
-                bd->writePos >>= 8;
+                tmp = dbuf[origPtr];
+                bd->writeCurrent = (uint8_t)tmp;
+                bd->writePos = (tmp >> 8);
                 bd->writeRunCountdown = 5;
         }
         bd->writeCount = dbufCount;
@@ -476,70 +520,84 @@ static int get_next_block(bunzip_data *bd)
         return RETVAL_OK;
 }
 
-/* Undo burrows-wheeler transform on intermediate buffer to produce output.
+/* Undo Burrows-Wheeler transform on intermediate buffer to produce output.
    If start_bunzip was initialized with out_fd=-1, then up to len bytes of
    data are written to outbuf.  Return value is number of bytes written or
    error (all errors are negative numbers).  If out_fd!=-1, outbuf and len
    are ignored, data is written to out_fd and return is RETVAL_OK or error.
+
+   NB: read_bunzip returns < 0 on error, or the number of *unfilled* bytes
+   in outbuf. IOW: on EOF returns len ("all bytes are not filled"), not 0.
+   (Why? This allows to get rid of one local variable)
 */
 int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len)
 {
-        const unsigned *dbuf;
-        int pos, current, previous, gotcount;
+        const uint32_t *dbuf;
+        int pos, current, previous;
+        uint32_t CRC;
 
-        /* If last read was short due to end of file, return last block now */
-        if (bd->writeCount < 0) return bd->writeCount;
+        /* If we already have error/end indicator, return it */
+        if (bd->writeCount < 0)
+                return bd->writeCount;
 
-        gotcount = 0;
         dbuf = bd->dbuf;
+
+        /* Register-cached state (hopefully): */
         pos = bd->writePos;
         current = bd->writeCurrent;
+        CRC = bd->writeCRC; /* small loss on x86-32 (not enough regs), win on x86-64 */
 
         /* We will always have pending decoded data to write into the output
            buffer unless this is the very first call (in which case we haven't
            Huffman-decoded a block into the intermediate buffer yet). */
         if (bd->writeCopies) {
 
+ dec_writeCopies:
                 /* Inside the loop, writeCopies means extra copies (beyond 1) */
                 --bd->writeCopies;
 
                 /* Loop outputting bytes */
                 for (;;) {
 
-                        /* If the output buffer is full, snapshot state and return */
-                        if (gotcount >= len) {
-                                bd->writePos = pos;
-                                bd->writeCurrent = current;
-                                bd->writeCopies++;
-                                return len;
+                        /* If the output buffer is full, save cached state and return */
+                        if (--len < 0) {
+                                /* Unlikely branch.
+                                 * Use of "goto" instead of keeping code here
+                                 * helps compiler to realize this. */
+                                goto outbuf_full;
                         }
 
                         /* Write next byte into output buffer, updating CRC */
-                        outbuf[gotcount++] = current;
-                        bd->writeCRC = (bd->writeCRC << 8)
-                                ^ bd->crc32Table[(bd->writeCRC >> 24) ^ current];
+                        *outbuf++ = current;
+                        CRC = (CRC << 8) ^ bd->crc32Table[(CRC >> 24) ^ current];
 
                         /* Loop now if we're outputting multiple copies of this byte */
                         if (bd->writeCopies) {
-                                --bd->writeCopies;
-                                continue;
+                                /* Unlikely branch */
+                                /*--bd->writeCopies;*/
+                                /*continue;*/
+                                /* Same, but (ab)using other existing --writeCopies operation
+                                 * (and this if() compiles into just test+branch pair): */
+                                goto dec_writeCopies;
                         }
  decode_next_byte:
-                        if (!bd->writeCount--) break;
+                        if (--bd->writeCount < 0)
+                                break; /* input block is fully consumed, need next one */
+
                         /* Follow sequence vector to undo Burrows-Wheeler transform */
                         previous = current;
                         pos = dbuf[pos];
-                        current = pos & 0xff;
+                        current = (uint8_t)pos;
                         pos >>= 8;
 
                         /* After 3 consecutive copies of the same byte, the 4th
                          * is a repeat count.  We count down from 4 instead
                          * of counting up because testing for non-zero is faster */
-                        if (--bd->writeRunCountdown) {
+                        if (--bd->writeRunCountdown != 0) {
                                 if (current != previous)
                                         bd->writeRunCountdown = 4;
                         } else {
-
+                                /* Unlikely branch */
                                 /* We have a repeated run, this byte indicates the count */
                                 bd->writeCopies = current;
                                 current = previous;
@@ -551,30 +609,42 @@ int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len)
                                 /* Subtract the 1 copy we'd output anyway to get extras */
                                 --bd->writeCopies;
                         }
-                }
+                } /* for(;;) */
 
-                /* Decompression of this block completed successfully */
-                bd->writeCRC = ~bd->writeCRC;
-                bd->totalCRC = ((bd->totalCRC << 1) | (bd->totalCRC >> 31)) ^ bd->writeCRC;
+                /* Decompression of this input block completed successfully */
+                bd->writeCRC = CRC = ~CRC;
+                bd->totalCRC = ((bd->totalCRC << 1) | (bd->totalCRC >> 31)) ^ CRC;
 
-                /* If this block had a CRC error, force file level CRC error. */
-                if (bd->writeCRC != bd->headerCRC) {
+                /* If this block had a CRC error, force file level CRC error */
+                if (CRC != bd->headerCRC) {
                         bd->totalCRC = bd->headerCRC + 1;
                         return RETVAL_LAST_BLOCK;
                 }
         }
 
         /* Refill the intermediate buffer by Huffman-decoding next block of input */
-        /* (previous is just a convenient unused temp variable here) */
-        previous = get_next_block(bd);
-        if (previous) {
-                bd->writeCount = previous;
-                return (previous != RETVAL_LAST_BLOCK) ? previous : gotcount;
+        {
+                int r = get_next_block(bd);
+                if (r) { /* error/end */
+                        bd->writeCount = r;
+                        return (r != RETVAL_LAST_BLOCK) ? r : len;
+                }
         }
-        bd->writeCRC = ~0;
+
+        CRC = ~0;
         pos = bd->writePos;
         current = bd->writeCurrent;
         goto decode_next_byte;
+
+ outbuf_full:
+        /* Output buffer is full, save cached state and return */
+        bd->writePos = pos;
+        bd->writeCurrent = current;
+        bd->writeCRC = CRC;
+
+        bd->writeCopies++;
+
+        return 0;
 }
 
 /* Allocate the structure, read file header.  If in_fd==-1, inbuf must contain
@@ -584,8 +654,8 @@ int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len)
 /* Because bunzip2 is used for help text unpacking, and because bb_show_usage()
    should work for NOFORK applets too, we must be extremely careful to not leak
    any allocations! */
-int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *inbuf,
-                                                int len)
+int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd,
+                const void *inbuf, int len)
 {
         bunzip_data *bd;
         unsigned i;
@@ -606,9 +676,11 @@ int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *in
         if (-1 == in_fd) {
                 /* in this case, bd->inbuf is read-only */
                 bd->inbuf = (void*)inbuf; /* cast away const-ness */
-                bd->inbufCount = len;
-        } else
-                bd->inbuf = (unsigned char *)(bd + 1);
+        } else {
+                bd->inbuf = (uint8_t*)(bd + 1);
+                memcpy(bd->inbuf, inbuf, len);
+        }
+        bd->inbufCount = len;
 
         /* Init the CRC32 table (big endian) */
         crc32_filltable(bd->crc32Table, 1);
@@ -632,7 +704,7 @@ int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *in
         bd->dbufSize = 100000 * (i - h0);
 
         /* Cannot use xmalloc - may leak bd in NOFORK case! */
-        bd->dbuf = malloc_or_warn(bd->dbufSize * sizeof(int));
+        bd->dbuf = malloc_or_warn(bd->dbufSize * sizeof(bd->dbuf[0]));
         if (!bd->dbuf) {
                 free(bd);
                 xfunc_die();
@@ -652,37 +724,63 @@ IF_DESKTOP(long long) int FAST_FUNC
 unpack_bz2_stream(int src_fd, int dst_fd)
 {
         IF_DESKTOP(long long total_written = 0;)
-        char *outbuf;
         bunzip_data *bd;
+        char *outbuf;
         int i;
+        unsigned len;
 
         outbuf = xmalloc(IOBUF_SIZE);
-        i = start_bunzip(&bd, src_fd, NULL, 0);
-        if (!i) {
-                for (;;) {
-                        i = read_bunzip(bd, outbuf, IOBUF_SIZE);
-                        if (i <= 0) break;
-                        if (i != full_write(dst_fd, outbuf, i)) {
-                                i = RETVAL_SHORT_WRITE;
-                                break;
+        len = 0;
+        while (1) { /* "Process one BZ... stream" loop */
+
+                i = start_bunzip(&bd, src_fd, outbuf + 2, len);
+
+                if (i == 0) {
+                        while (1) { /* "Produce some output bytes" loop */
+                                i = read_bunzip(bd, outbuf, IOBUF_SIZE);
+                                if (i < 0) /* error? */
+                                        break;
+                                i = IOBUF_SIZE - i; /* number of bytes produced */
+                                if (i == 0) /* EOF? */
+                                        break;
+                                if (i != full_write(dst_fd, outbuf, i)) {
+                                        bb_error_msg("short write");
+                                        i = RETVAL_SHORT_WRITE;
+                                        goto release_mem;
+                                }
+                                IF_DESKTOP(total_written += i;)
                         }
-                        IF_DESKTOP(total_written += i;)
                 }
-        }
-
-        /* Check CRC and release memory */
 
-        if (i == RETVAL_LAST_BLOCK) {
+                if (i != RETVAL_LAST_BLOCK) {
+                        bb_error_msg("bunzip error %d", i);
+                        break;
+                }
                 if (bd->headerCRC != bd->totalCRC) {
                         bb_error_msg("CRC error");
-                } else {
-                        i = RETVAL_OK;
+                        break;
                 }
-        } else if (i == RETVAL_SHORT_WRITE) {
-                bb_error_msg("short write");
-        } else {
-                bb_error_msg("bunzip error %d", i);
+
+                /* Successfully unpacked one BZ stream */
+                i = RETVAL_OK;
+
+                /* Do we have "BZ..." after last processed byte?
+                 * pbzip2 (parallelized bzip2) produces such files.
+                 */
+                len = bd->inbufCount - bd->inbufPos;
+                memcpy(outbuf, &bd->inbuf[bd->inbufPos], len);
+                if (len < 2) {
+                        if (safe_read(src_fd, outbuf + len, 2 - len) != 2 - len)
+                                break;
+                        len = 2;
+                }
+                if (*(uint16_t*)outbuf != BZIP2_MAGIC) /* "BZ"? */
+                        break;
+                dealloc_bunzip(bd);
+                len -= 2;
         }
+
+ release_mem:
         dealloc_bunzip(bd);
         free(outbuf);
 
diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libarchive/decompress_uncompress.c
index 285b4efeb..44d894244 100644
--- a/archival/libunarchive/decompress_uncompress.c
+++ b/archival/libarchive/decompress_uncompress.c
@@ -25,7 +25,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 
 /* Default input buffer size */
diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index 1a3a8f86b..a04714341 100644
--- a/archival/libunarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 #if ENABLE_FEATURE_LZMA_FAST
 #  define speed_inline ALWAYS_INLINE
diff --git a/archival/libunarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index ca427231e..e90dfb06f 100644
--- a/archival/libunarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 #define XZ_FUNC FAST_FUNC
 #define XZ_EXTERN static
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libarchive/decompress_unzip.c
index cb8a3d737..a29eef837 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libarchive/decompress_unzip.c
@@ -35,7 +35,7 @@
 
 #include <setjmp.h>
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 typedef struct huft_t {
         unsigned char e;        /* number of extra bits or operation */
diff --git a/archival/libunarchive/filter_accept_all.c b/archival/libarchive/filter_accept_all.c
index cb1f506c8..e69deb679 100644
--- a/archival/libunarchive/filter_accept_all.c
+++ b/archival/libarchive/filter_accept_all.c
@@ -6,7 +6,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* Accept any non-null name, its not really a filter at all */
 char FAST_FUNC filter_accept_all(archive_handle_t *archive_handle)
diff --git a/archival/libunarchive/filter_accept_list.c b/archival/libarchive/filter_accept_list.c
index fe4414c85..a7640af79 100644
--- a/archival/libunarchive/filter_accept_list.c
+++ b/archival/libarchive/filter_accept_list.c
@@ -6,7 +6,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /*
  * Accept names that are in the accept list, ignoring reject list.
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libarchive/filter_accept_list_reassign.c
index 891f58390..d80f71668 100644
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libarchive/filter_accept_list_reassign.c
@@ -6,7 +6,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* Built and used only if ENABLE_DPKG || ENABLE_DPKG_DEB */
 
diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libarchive/filter_accept_reject_list.c
index 89a5502d5..3e86cca65 100644
--- a/archival/libunarchive/filter_accept_reject_list.c
+++ b/archival/libarchive/filter_accept_reject_list.c
@@ -6,7 +6,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /*
  * Accept names that are in the accept list and not in the reject list
diff --git a/archival/libunarchive/find_list_entry.c b/archival/libarchive/find_list_entry.c
index 5c0c85f09..5efd1af2e 100644
--- a/archival/libunarchive/find_list_entry.c
+++ b/archival/libarchive/find_list_entry.c
@@ -7,7 +7,7 @@
 
 #include <fnmatch.h>
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* Find a string in a shell pattern list */
 const llist_t* FAST_FUNC find_list_entry(const llist_t *list, const char *filename)
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index 6bfc6bc27..df603b111 100644
--- a/archival/libunarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -5,7 +5,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "ar.h"
 
 static unsigned read_num(const char *str, int base)
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index 8cd1096ba..3d99b492a 100644
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -5,7 +5,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 typedef struct hardlinks_t {
         struct hardlinks_t *next;
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index cf6487207..78b0ae25f 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -12,7 +12,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 typedef uint32_t aliased_uint32_t FIX_ALIASING;
 typedef off_t    aliased_off_t    FIX_ALIASING;
diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libarchive/get_header_tar_bz2.c
index 4ffc17086..60d32069f 100644
--- a/archival/libunarchive/get_header_tar_bz2.c
+++ b/archival/libarchive/get_header_tar_bz2.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libarchive/get_header_tar_gz.c
index a9af22e0e..b09f8691c 100644
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libarchive/get_header_tar_gz.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/get_header_tar_lzma.c b/archival/libarchive/get_header_tar_lzma.c
index 9876b3827..da08e0c72 100644
--- a/archival/libunarchive/get_header_tar_lzma.c
+++ b/archival/libarchive/get_header_tar_lzma.c
@@ -7,7 +7,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/header_list.c b/archival/libarchive/header_list.c
index 902d6ebe0..c4fc75f38 100644
--- a/archival/libunarchive/header_list.c
+++ b/archival/libarchive/header_list.c
@@ -3,7 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC header_list(const file_header_t *file_header)
 {
diff --git a/archival/libunarchive/header_skip.c b/archival/libarchive/header_skip.c
index 2af36ac9c..2bfc5253c 100644
--- a/archival/libunarchive/header_skip.c
+++ b/archival/libarchive/header_skip.c
@@ -3,7 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
 {
diff --git a/archival/libunarchive/header_verbose_list.c b/archival/libarchive/header_verbose_list.c
index d863e6a29..bc4e4154b 100644
--- a/archival/libunarchive/header_verbose_list.c
+++ b/archival/libarchive/header_verbose_list.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC header_verbose_list(const file_header_t *file_header)
 {
diff --git a/archival/libunarchive/init_handle.c b/archival/libarchive/init_handle.c
index de7021f78..6644ea13b 100644
--- a/archival/libunarchive/init_handle.c
+++ b/archival/libarchive/init_handle.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 archive_handle_t* FAST_FUNC init_handle(void)
 {
diff --git a/archival/liblzo.h b/archival/libarchive/liblzo.h
index 843997cb9..843997cb9 100644
--- a/archival/liblzo.h
+++ b/archival/libarchive/liblzo.h
diff --git a/archival/lzo1x_1.c b/archival/libarchive/lzo1x_1.c
index a88839846..a88839846 100644
--- a/archival/lzo1x_1.c
+++ b/archival/libarchive/lzo1x_1.c
diff --git a/archival/lzo1x_1o.c b/archival/libarchive/lzo1x_1o.c
index 3c61253e0..3c61253e0 100644
--- a/archival/lzo1x_1o.c
+++ b/archival/libarchive/lzo1x_1o.c
diff --git a/archival/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 483205155..483205155 100644
--- a/archival/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
diff --git a/archival/lzo1x_c.c b/archival/libarchive/lzo1x_c.c
index cc86f74b1..cc86f74b1 100644
--- a/archival/lzo1x_c.c
+++ b/archival/libarchive/lzo1x_c.c
diff --git a/archival/lzo1x_d.c b/archival/libarchive/lzo1x_d.c
index 348a85510..348a85510 100644
--- a/archival/lzo1x_d.c
+++ b/archival/libarchive/lzo1x_d.c
diff --git a/archival/libunarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index ed6a556bb..26ae565f5 100644
--- a/archival/libunarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -4,12 +4,12 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* transformer(), more than meets the eye */
 /*
  * On MMU machine, the transform_prog is removed by macro magic
- * in include/unarchive.h. On NOMMU, transformer is removed.
+ * in include/archive.h. On NOMMU, transformer is removed.
  */
 void FAST_FUNC open_transformer(int fd,
         IF_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd),
diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libarchive/seek_by_jump.c
index bda55e1b1..7c2c52ae1 100644
--- a/archival/libunarchive/seek_by_jump.c
+++ b/archival/libarchive/seek_by_jump.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC seek_by_jump(int fd, off_t amount)
 {
diff --git a/archival/libunarchive/seek_by_read.c b/archival/libarchive/seek_by_read.c
index 25b31365d..ad931a8de 100644
--- a/archival/libunarchive/seek_by_read.c
+++ b/archival/libarchive/seek_by_read.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /*  If we are reading through a pipe, or from stdin then we can't lseek,
  *  we must read and discard the data to skip over it.
diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c
index 4f68ba3d8..18dbfd54d 100644
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libarchive/unpack_ar_archive.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "ar.h"
 
 void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
diff --git a/archival/libunarchive/unxz/README b/archival/libarchive/unxz/README
index c5972f6b8..c5972f6b8 100644
--- a/archival/libunarchive/unxz/README
+++ b/archival/libarchive/unxz/README
diff --git a/archival/libunarchive/unxz/xz.h b/archival/libarchive/unxz/xz.h
index c6c071c4a..c6c071c4a 100644
--- a/archival/libunarchive/unxz/xz.h
+++ b/archival/libarchive/unxz/xz.h
diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libarchive/unxz/xz_config.h
index 187e1cbed..187e1cbed 100644
--- a/archival/libunarchive/unxz/xz_config.h
+++ b/archival/libarchive/unxz/xz_config.h
diff --git a/archival/libunarchive/unxz/xz_dec_bcj.c b/archival/libarchive/unxz/xz_dec_bcj.c
index 09162b51f..09162b51f 100644
--- a/archival/libunarchive/unxz/xz_dec_bcj.c
+++ b/archival/libarchive/unxz/xz_dec_bcj.c
diff --git a/archival/libunarchive/unxz/xz_dec_lzma2.c b/archival/libarchive/unxz/xz_dec_lzma2.c
index da71cb4d4..da71cb4d4 100644
--- a/archival/libunarchive/unxz/xz_dec_lzma2.c
+++ b/archival/libarchive/unxz/xz_dec_lzma2.c
diff --git a/archival/libunarchive/unxz/xz_dec_stream.c b/archival/libarchive/unxz/xz_dec_stream.c
index bdcbf1ba3..bdcbf1ba3 100644
--- a/archival/libunarchive/unxz/xz_dec_stream.c
+++ b/archival/libarchive/unxz/xz_dec_stream.c
diff --git a/archival/libunarchive/unxz/xz_lzma2.h b/archival/libarchive/unxz/xz_lzma2.h
index 47f21afbc..47f21afbc 100644
--- a/archival/libunarchive/unxz/xz_lzma2.h
+++ b/archival/libarchive/unxz/xz_lzma2.h
diff --git a/archival/libunarchive/unxz/xz_private.h b/archival/libarchive/unxz/xz_private.h
index 145649a83..145649a83 100644
--- a/archival/libunarchive/unxz/xz_private.h
+++ b/archival/libarchive/unxz/xz_private.h
diff --git a/archival/libunarchive/unxz/xz_stream.h b/archival/libarchive/unxz/xz_stream.h
index 36f2a7cbf..36f2a7cbf 100644
--- a/archival/libunarchive/unxz/xz_stream.h
+++ b/archival/libarchive/unxz/xz_stream.h
diff --git a/archival/lzop.c b/archival/lzop.c
index acb34fe14..094e78cf9 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -26,7 +26,7 @@
 */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "liblzo_interface.h"
 
 /* lzo-2.03/src/lzo_ptr.h */
diff --git a/archival/rpm.c b/archival/rpm.c
index 7b316a5b8..380226f9b 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -8,7 +8,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "rpm.h"
 
 #define RPM_CHAR_TYPE           1
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 70021d539..ce8cd2c2c 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "rpm.h"
 
 enum { rpm_fd = STDIN_FILENO };
diff --git a/archival/tar.c b/archival/tar.c
index 1d6e63da0..150c6f393 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -23,9 +23,28 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+/* TODO: security with -C DESTDIR option can be enhanced.
+ * Consider tar file created via:
+ * $ tar cvf bug.tar anything.txt
+ * $ ln -s /tmp symlink
+ * $ tar --append -f bug.tar symlink
+ * $ rm symlink
+ * $ mkdir symlink
+ * $ tar --append -f bug.tar symlink/evil.py
+ *
+ * This will result in an archive which contains:
+ * $ tar --list -f bug.tar
+ * anything.txt
+ * symlink
+ * symlink/evil.py
+ *
+ * Untarring it puts evil.py in '/tmp' even if the -C DESTDIR is given.
+ * This doesn't feel right, and IIRC GNU tar doesn't do that.
+ */
+
 #include <fnmatch.h>
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /* FIXME: Stop using this non-standard feature */
 #ifndef FNM_LEADING_DIR
 # define FNM_LEADING_DIR 0
@@ -884,7 +903,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         /* Prepend '-' to the first argument if required */
         opt_complementary = "--:" // first arg is options
                 "tt:vv:" // count -t,-v
-                "?:" // bail out with usage instead of error return
                 "X::T::" // cumulative lists
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
                 "\xff::" // cumulative lists for --exclude
diff --git a/archival/unzip.c b/archival/unzip.c
index 204e34952..5d62c08cb 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -20,7 +20,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 enum {
 #if BB_BIG_ENDIAN
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index 14f2ae516..1481d0dbb 100644
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -16,9 +16,9 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv)
 {
         enum {
                 SCANCODE  = (1 << 0),
-                ASCII     = (1 << 1),
+                ASCII     = (1 << 1),
                 MEDIUMRAW = (1 << 2),
-                UNICODE   = (1 << 3),
+                UNICODE   = (1 << 3),
         };
         int fd;
         unsigned opt;
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 3c77813b5..079626c20 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -136,7 +136,7 @@ static void do_loadfont(int fd, unsigned char *inbuf, int height, int width, int
  * Example:
  * At the font position for a capital A-ring glyph, we
  * may have:
- *      00C5,212B,FFFE,0041,030A,FFFF
+ *   00C5,212B,FFFE,0041,030A,FFFF
  * Some font positions may be described by sequences only,
  * namely when there is no precomposed Unicode value for the glyph.
  */
@@ -159,7 +159,7 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize,
         int glyph;
         uint16_t unicode;
 
-        maxct = tailsz; /* more than enough */
+        maxct = tailsz; /* more than enough */
         up = xmalloc(maxct * sizeof(*up));
 
         for (glyph = 0; glyph < fontsize; glyph++) {
@@ -255,10 +255,10 @@ static void do_load(int fd, unsigned char *buffer, size_t len)
         } else
 #endif
 #if ENABLE_FEATURE_LOADFONT_RAW
-        if (len == 9780) {      /* file with three code pages? */
+        if (len == 9780) {  /* file with three code pages? */
                 charsize = height = 16;
                 font += 40;
-        } else if ((len & 0377) == 0) {         /* bare font */
+        } else if ((len & 0377) == 0) {  /* bare font */
                 charsize = height = len / 256;
         } else
 #endif
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 7dffdea18..1806ce742 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -8,11 +8,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include "libbb.h"
-
 /* BTW, which "standard" package has this utility? It doesn't seem
  * to be ncurses, coreutils, console-tools... then what? */
 
+#include "libbb.h"
+
+#define ESC "\033"
+
 #if ENABLE_STTY
 int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 #endif
@@ -26,15 +28,15 @@ int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 
         /* no options, no getopt */
 
-        if (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {
+        if (/*isatty(STDIN_FILENO) &&*/ isatty(STDOUT_FILENO)) {
                 /* See 'man 4 console_codes' for details:
                  * "ESC c"        -- Reset
                  * "ESC ( K"      -- Select user mapping
-                 * "ESC [ J"      -- Erase to the end of screen
                  * "ESC [ 0 m"    -- Reset all display attributes
+                 * "ESC [ J"      -- Erase to the end of screen
                  * "ESC [ ? 25 h" -- Make cursor visible
                  */
-                printf("\033c\033(K\033[J\033[0m\033[?25h");
+                printf(ESC"c" ESC"(K" ESC"[0m" ESC"[J" ESC"[?25h");
                 /* http://bugs.busybox.net/view.php?id=1414:
                  * people want it to reset echo etc: */
 #if ENABLE_STTY
diff --git a/console-tools/resize.c b/console-tools/resize.c
index 12e50a116..fdfe2a6a0 100644
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -17,7 +17,7 @@ static void
 onintr(int sig UNUSED_PARAM)
 {
         tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
-        exit(EXIT_FAILURE);
+        _exit(EXIT_FAILURE);
 }
 
 int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/console-tools/showkey.c b/console-tools/showkey.c
index 149ea6465..e7834f702 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -10,6 +10,20 @@
 #include "libbb.h"
 #include <linux/kd.h>
 
+
+struct globals {
+        int kbmode;
+        struct termios tio, tio0;
+};
+#define G (*ptr_to_globals)
+#define kbmode (G.kbmode)
+#define tio    (G.tio)
+#define tio0   (G.tio0)
+#define INIT_G() do { \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
+
+
 // set raw tty mode
 // also used by microcom
 // libbb candidates?
@@ -20,62 +34,38 @@ static void xget1(struct termios *t, struct termios *oldt)
         cfmakeraw(t);
 }
 
-static void xset1(struct termios *tio)
+static void xset1(struct termios *t)
 {
-        int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, tio);
+        int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, t);
         if (ret) {
                 bb_perror_msg("can't tcsetattr for stdin");
         }
 }
 
-/*
- * GLOBALS
- */
-struct globals {
-        int kbmode;
-        struct termios tio, tio0;
-};
-#define G (*ptr_to_globals)
-#define kbmode  (G.kbmode)
-#define tio     (G.tio)
-#define tio0    (G.tio0)
-#define INIT_G() do { \
-        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
-} while (0)
-
-
-static void signal_handler(int signo)
-{
-        // restore keyboard and console settings
-        xset1(&tio0);
-        xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
-        // alarmed? -> exit 0
-        exit(SIGALRM == signo);
-}
-
 int showkey_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int showkey_main(int argc UNUSED_PARAM, char **argv)
 {
         enum {
-                OPT_a = (1<<0), // display the decimal/octal/hex values of the keys
-                OPT_k = (1<<1), // display only the interpreted keycodes (default)
-                OPT_s = (1<<2), // display only the raw scan-codes
+                OPT_a = (1<<0), // display the decimal/octal/hex values of the keys
+                OPT_k = (1<<1), // display only the interpreted keycodes (default)
+                OPT_s = (1<<2), // display only the raw scan-codes
         };
 
+        INIT_G();
+
         // FIXME: aks are all mutually exclusive
         getopt32(argv, "aks");
 
-        INIT_G();
-
         // get keyboard settings
         xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);
         printf("kb mode was %s\n\nPress any keys. Program terminates %s\n\n",
                 kbmode == K_RAW ? "RAW" :
                         (kbmode == K_XLATE ? "XLATE" :
                                 (kbmode == K_MEDIUMRAW ? "MEDIUMRAW" :
-                                        (kbmode == K_UNICODE ? "UNICODE" : "?UNKNOWN?")))
-                , (option_mask32 & OPT_a) ? "when CTRL+D pressed" : "10s after last keypress"
+                                        (kbmode == K_UNICODE ? "UNICODE" : "UNKNOWN")))
+                , (option_mask32 & OPT_a) ? "on EOF (ctrl-D)" : "10s after last keypress"
         );
+
         // prepare for raw mode
         xget1(&tio, &tio0);
         // put stdin in raw mode
@@ -83,34 +73,37 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
 
         if (option_mask32 & OPT_a) {
                 unsigned char c;
+
                 // just read stdin char by char
-                while (1 == safe_read(STDIN_FILENO, &c, 1)) {
+                while (1 == read(STDIN_FILENO, &c, 1)) {
                         printf("%3u 0%03o 0x%02x\r\n", c, c, c);
                         if (04 /*CTRL-D*/ == c)
                                 break;
                 }
         } else {
-                // we should exit on any signal
-                bb_signals(BB_FATAL_SIGS, signal_handler);
                 // set raw keyboard mode
                 xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)((option_mask32 & OPT_k) ? K_MEDIUMRAW : K_RAW));
 
+                // we should exit on any signal; signals should interrupt read
+                bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo);
+
                 // read and show scancodes
-                while (1) {
+                while (!bb_got_signal) {
                         char buf[18];
                         int i, n;
+
                         // setup 10s watchdog
                         alarm(10);
                         // read scancodes
                         n = read(STDIN_FILENO, buf, sizeof(buf));
                         i = 0;
                         while (i < n) {
-                                char c = buf[i];
-                                // show raw scancodes ordered? ->
                                 if (option_mask32 & OPT_s) {
+                                        // show raw scancodes
                                         printf("0x%02x ", buf[i++]);
-                                // show interpreted scancodes (default) ? ->
                                 } else {
+                                        // show interpreted scancodes (default)
+                                        char c = buf[i];
                                         int kc;
                                         if (i+2 < n
                                          && (c & 0x7f) == 0
@@ -130,9 +123,9 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 
-        // cleanup
-        signal_handler(SIGALRM);
+        // restore keyboard and console settings
+        xset1(&tio0);
+        xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
 
-        // should never be here!
         return EXIT_SUCCESS;
 }
diff --git a/coreutils/Config.src b/coreutils/Config.src
index adad4ba6d..b599f7999 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -664,13 +664,6 @@ config FEATURE_TEE_USE_BLOCK_IO
         help
           Enable this option for a faster tee, at expense of size.
 
-config TOUCH
-        bool "touch"
-        default y
-        help
-          touch is used to create or change the access and/or
-          modification timestamp of specified files.
-
 config TRUE
         bool "true"
         default y
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src
index 630b048df..4ea0fa50a 100644
--- a/coreutils/Kbuild.src
+++ b/coreutils/Kbuild.src
@@ -74,7 +74,6 @@ lib-$(CONFIG_SYNC)      += sync.o
 lib-$(CONFIG_TAC)       += tac.o
 lib-$(CONFIG_TAIL)      += tail.o
 lib-$(CONFIG_TEE)       += tee.o
-lib-$(CONFIG_TOUCH)     += touch.o
 lib-$(CONFIG_TRUE)      += true.o
 lib-$(CONFIG_TTY)       += tty.o
 lib-$(CONFIG_UNAME)     += uname.o
diff --git a/coreutils/date.c b/coreutils/date.c
index eed4714f9..22d0a5327 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -250,6 +250,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                 ts.tv_sec = statbuf.st_mtime;
 #if ENABLE_FEATURE_DATE_NANO
                 ts.tv_nsec = statbuf.st_mtim.tv_nsec;
+                /* Some toolchains use .st_mtimensec instead of st_mtim.tv_nsec.
+                 * If you need #define _SVID_SOURCE 1 to enable st_mtim.tv_nsec,
+                 * drop a mail to project mailing list please
+                 */
 #endif
         } else {
 #if ENABLE_FEATURE_DATE_NANO
@@ -278,7 +282,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 /* Correct any day of week and day of year etc. fields */
-                tm_time.tm_isdst = -1;  /* Be sure to recheck dst */
+                /* Be sure to recheck dst (but not if date is time_t format) */
+                if (date_str[0] != '@')
+                        tm_time.tm_isdst = -1;
                 ts.tv_sec = validate_tm_time(date_str, &tm_time);
 
                 maybe_set_utc(opt);
diff --git a/coreutils/dd.c b/coreutils/dd.c
index c22a39da7..da205ec69 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -24,7 +24,7 @@ static const struct suffix_mult dd_suffixes[] = {
         { "b", 512 },
         { "kD", 1000 },
         { "k", 1024 },
-        { "K", 1024 },  /* compat with coreutils dd */
+        { "K", 1024 },  /* compat with coreutils dd */
         { "MD", 1000000 },
         { "M", 1048576 },
         { "GD", 1000000000 },
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 1a670201c..1afe28c8d 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -29,6 +29,71 @@
  * [2009-03]
  * ls sorts listing now, and supports almost all options.
  */
+
+//usage:#define ls_trivial_usage
+//usage:        "[-1AaCxd"
+//usage:        IF_FEATURE_LS_FOLLOWLINKS("LH")
+//usage:        IF_FEATURE_LS_RECURSIVE("R")
+//usage:        IF_FEATURE_LS_FILETYPES("Fp") "lins"
+//usage:        IF_FEATURE_LS_TIMESTAMPS("e")
+//usage:        IF_FEATURE_HUMAN_READABLE("h")
+//usage:        IF_FEATURE_LS_SORTFILES("rSXv")
+//usage:        IF_FEATURE_LS_TIMESTAMPS("ctu")
+//usage:        IF_SELINUX("kKZ") "]"
+//usage:        IF_FEATURE_AUTOWIDTH(" -w WIDTH") " [FILE]..."
+//usage:#define ls_full_usage "\n\n"
+//usage:       "List directory contents\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -1      List in a single column"
+//usage:     "\n        -A      Don't list . and .."
+//usage:     "\n        -a      Don't hide entries starting with ."
+//usage:     "\n        -C      List by columns"
+//usage:     "\n        -x      List by lines"
+//usage:     "\n        -d      List directory entries instead of contents"
+//usage:        IF_FEATURE_LS_FOLLOWLINKS(
+//usage:     "\n        -L      Follow symlinks"
+//usage:     "\n        -H      Follow symlinks on command line only"
+//usage:        )
+//usage:        IF_FEATURE_LS_RECURSIVE(
+//usage:     "\n        -R      Recurse"
+//usage:        )
+//usage:        IF_FEATURE_LS_FILETYPES(
+//usage:     "\n        -F      Append indicator (one of */=@|) to entries"
+//usage:     "\n        -p      Append indicator (one of /=@|) to entries"
+//usage:        )
+//usage:     "\n        -l      Long listing format"
+//usage:     "\n        -i      List inode numbers"
+//usage:     "\n        -n      List numeric UIDs and GIDs instead of names"
+//usage:     "\n        -s      List the size of each file, in blocks"
+//usage:        IF_FEATURE_LS_TIMESTAMPS(
+//usage:     "\n        -e      List full date and time"
+//usage:        )
+//usage:        IF_FEATURE_HUMAN_READABLE(
+//usage:     "\n        -h      List sizes in human readable format (1K 243M 2G)"
+//usage:        )
+//usage:        IF_FEATURE_LS_SORTFILES(
+//usage:     "\n        -r      Sort in reverse order"
+//usage:     "\n        -S      Sort by file size"
+//usage:     "\n        -X      Sort by extension"
+//usage:     "\n        -v      Sort by version"
+//usage:        )
+//usage:        IF_FEATURE_LS_TIMESTAMPS(
+//usage:     "\n        -c      With -l: sort by ctime"
+//usage:     "\n        -t      With -l: sort by modification time"
+//usage:     "\n        -u      With -l: sort by access time"
+//usage:        )
+//usage:        IF_SELINUX(
+//usage:     "\n        -k      List security context"
+//usage:     "\n        -K      List security context in long format"
+//usage:     "\n        -Z      List security context and permission"
+//usage:        )
+//usage:        IF_FEATURE_AUTOWIDTH(
+//usage:     "\n        -w N    Assume the terminal is N columns wide"
+//usage:        )
+//usage:        IF_FEATURE_LS_COLOR(
+//usage:     "\n        --color[={always,never,auto}]   Control coloring"
+//usage:        )
+
 #include "libbb.h"
 #include "unicode.h"
 
@@ -53,13 +118,12 @@
 
 enum {
 TERMINAL_WIDTH  = 80,           /* use 79 if terminal has linefold bug */
-COLUMN_GAP      = 2,            /* includes the file type char */
 
-/* what is the overall style of the listing */
-STYLE_COLUMNS   = 1 << 21,      /* fill columns */
-STYLE_LONG      = 2 << 21,      /* one record per line, extended info */
-STYLE_SINGLE    = 3 << 21,      /* one record per line */
-STYLE_MASK      = STYLE_SINGLE,
+SPLIT_DIR       = 1,
+SPLIT_FILE      = 0,
+SPLIT_SUBDIR    = 2,
+
+/* Bits in all_fmt: */
 
 /* 51306 lrwxrwxrwx  1 root     root         2 May 11 01:43 /bin/view -> vi* */
 /* what file information will be listed */
@@ -71,75 +135,74 @@ LIST_ID_NAME    = 1 << 4,
 LIST_ID_NUMERIC = 1 << 5,
 LIST_CONTEXT    = 1 << 6,
 LIST_SIZE       = 1 << 7,
-//LIST_DEV        = 1 << 8, - unused, synonym to LIST_SIZE
-LIST_DATE_TIME  = 1 << 9,
-LIST_FULLTIME   = 1 << 10,
-LIST_FILENAME   = 1 << 11,
-LIST_SYMLINK    = 1 << 12,
-LIST_FILETYPE   = 1 << 13,
-LIST_EXEC       = 1 << 14,
+LIST_DATE_TIME  = 1 << 8,
+LIST_FULLTIME   = 1 << 9,
+LIST_SYMLINK    = 1 << 10,
+LIST_FILETYPE   = 1 << 11,
+LIST_EXEC       = 1 << 12,
 LIST_MASK       = (LIST_EXEC << 1) - 1,
 
 /* what files will be displayed */
-DISP_DIRNAME    = 1 << 15,      /* 2 or more items? label directories */
-DISP_HIDDEN     = 1 << 16,      /* show filenames starting with . */
-DISP_DOT        = 1 << 17,      /* show . and .. */
-DISP_NOLIST     = 1 << 18,      /* show directory as itself, not contents */
-DISP_RECURSIVE  = 1 << 19,      /* show directory and everything below it */
-DISP_ROWS       = 1 << 20,      /* print across rows */
+DISP_DIRNAME    = 1 << 13,      /* 2 or more items? label directories */
+DISP_HIDDEN     = 1 << 14,      /* show filenames starting with . */
+DISP_DOT        = 1 << 15,      /* show . and .. */
+DISP_NOLIST     = 1 << 16,      /* show directory as itself, not contents */
+DISP_RECURSIVE  = 1 << 17,      /* show directory and everything below it */
+DISP_ROWS       = 1 << 18,      /* print across rows */
 DISP_MASK       = ((DISP_ROWS << 1) - 1) & ~(DISP_DIRNAME - 1),
 
-/* how will the files be sorted (CONFIG_FEATURE_LS_SORTFILES) */
-SORT_FORWARD    = 0,            /* sort in reverse order */
-SORT_REVERSE    = 1 << 27,      /* sort in reverse order */
-
-SORT_NAME       = 0,            /* sort by file name */
-SORT_SIZE       = 1 << 28,      /* sort by file size */
-SORT_ATIME      = 2 << 28,      /* sort by last access time */
-SORT_CTIME      = 3 << 28,      /* sort by last change time */
-SORT_MTIME      = 4 << 28,      /* sort by last modification time */
-SORT_VERSION    = 5 << 28,      /* sort by version */
-SORT_EXT        = 6 << 28,      /* sort by file name extension */
-SORT_DIR        = 7 << 28,      /* sort by file or directory */
-SORT_MASK       = (7 << 28) * ENABLE_FEATURE_LS_SORTFILES,
+/* what is the overall style of the listing */
+STYLE_COLUMNAR  = 1 << 19,      /* many records per line */
+STYLE_LONG      = 2 << 19,      /* one record per line, extended info */
+STYLE_SINGLE    = 3 << 19,      /* one record per line */
+STYLE_MASK      = STYLE_SINGLE,
 
 /* which of the three times will be used */
-TIME_CHANGE     = (1 << 23) * ENABLE_FEATURE_LS_TIMESTAMPS,
-TIME_ACCESS     = (1 << 24) * ENABLE_FEATURE_LS_TIMESTAMPS,
-TIME_MASK       = (3 << 23) * ENABLE_FEATURE_LS_TIMESTAMPS,
+TIME_CHANGE     = (1 << 21) * ENABLE_FEATURE_LS_TIMESTAMPS,
+TIME_ACCESS     = (1 << 22) * ENABLE_FEATURE_LS_TIMESTAMPS,
+TIME_MASK       = (3 << 21) * ENABLE_FEATURE_LS_TIMESTAMPS,
 
-FOLLOW_LINKS    = (1 << 25) * ENABLE_FEATURE_LS_FOLLOWLINKS,
+/* how will the files be sorted (CONFIG_FEATURE_LS_SORTFILES) */
+SORT_REVERSE    = 1 << 23,
 
-LS_DISP_HR      = (1 << 26) * ENABLE_FEATURE_HUMAN_READABLE,
+SORT_NAME       = 0,            /* sort by file name */
+SORT_SIZE       = 1 << 24,      /* sort by file size */
+SORT_ATIME      = 2 << 24,      /* sort by last access time */
+SORT_CTIME      = 3 << 24,      /* sort by last change time */
+SORT_MTIME      = 4 << 24,      /* sort by last modification time */
+SORT_VERSION    = 5 << 24,      /* sort by version */
+SORT_EXT        = 6 << 24,      /* sort by file name extension */
+SORT_DIR        = 7 << 24,      /* sort by file or directory */
+SORT_MASK       = (7 << 24) * ENABLE_FEATURE_LS_SORTFILES,
 
-LIST_SHORT      = LIST_FILENAME,
 LIST_LONG       = LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | LIST_SIZE | \
-                  LIST_DATE_TIME | LIST_FILENAME | LIST_SYMLINK,
-
-SPLIT_DIR       = 1,
-SPLIT_FILE      = 0,
-SPLIT_SUBDIR    = 2,
+                  LIST_DATE_TIME | LIST_SYMLINK,
 };
 
-/* "[-]Cadil1", POSIX mandated options, busybox always supports */
-/* "[-]gnsx", POSIX non-mandated options, busybox always supports */
-/* "[-]Q" GNU option? busybox always supports */
-/* "[-]Ak" GNU options, busybox always supports */
-/* "[-]FLRctur", POSIX mandated options, busybox optionally supports */
-/* "[-]p", POSIX non-mandated options, busybox optionally supports */
-/* "[-]SXvThw", GNU options, busybox optionally supports */
-/* "[-]K", SELinux mandated options, busybox optionally supports */
-/* "[-]e", I think we made this one up */
+/* -Cadil1  Std options, busybox always supports */
+/* -gnsxA   Std options, busybox always supports */
+/* -Q       GNU option, busybox always supports */
+/* -k       SELinux option, busybox always supports (ignores if !SELinux) */
+/*          Std has -k which means "show sizes in kbytes" */
+/* -FLHRctur Std options, busybox optionally supports */
+/* -p       Std option, busybox optionally supports */
+/*          Not fully compatible - we show not only '/' but other chars too */
+/* -SXvhTw  GNU options, busybox optionally supports */
+/*          -T TABWIDTH is ignored (we don't use tabs on output) */
+/* -K       SELinux mandated options, busybox optionally supports */
+/* -e       I think we made this one up (looks similar to GNU --full-time) */
+/* Std opts we do not support: */
+/* -H       Follow the links on command line only */
 static const char ls_options[] ALIGN1 =
-        "Cadil1gnsxQAk" /* 13 opts, total 13 */
+        "Cadil1gnsxQAk"      /* 13 opts, total 13 */
         IF_FEATURE_LS_TIMESTAMPS("cetu") /* 4, 17 */
         IF_FEATURE_LS_SORTFILES("SXrv")  /* 4, 21 */
         IF_FEATURE_LS_FILETYPES("Fp")    /* 2, 23 */
-        IF_FEATURE_LS_FOLLOWLINKS("L")   /* 1, 24 */
-        IF_FEATURE_LS_RECURSIVE("R")     /* 1, 25 */
-        IF_FEATURE_HUMAN_READABLE("h")   /* 1, 26 */
-        IF_SELINUX("KZ") /* 2, 28 */
-        IF_FEATURE_AUTOWIDTH("T:w:") /* 2, 30 */
+        IF_FEATURE_LS_RECURSIVE("R")     /* 1, 24 */
+        IF_SELINUX("KZ")                 /* 2, 26 */
+        IF_FEATURE_LS_FOLLOWLINKS("LH")  /* 2, 28 */
+        IF_FEATURE_HUMAN_READABLE("h")   /* 1, 29 */
+        IF_FEATURE_AUTOWIDTH("T:w:")     /* 2, 31 */
         ;
 enum {
         //OPT_C = (1 << 0),
@@ -155,75 +218,88 @@ enum {
         OPT_Q = (1 << 10),
         //OPT_A = (1 << 11),
         //OPT_k = (1 << 12),
-        OPTBIT_color = 13
-                + 4 * ENABLE_FEATURE_LS_TIMESTAMPS
-                + 4 * ENABLE_FEATURE_LS_SORTFILES
-                + 2 * ENABLE_FEATURE_LS_FILETYPES
-                + 1 * ENABLE_FEATURE_LS_FOLLOWLINKS
-                + 1 * ENABLE_FEATURE_LS_RECURSIVE
-                + 1 * ENABLE_FEATURE_HUMAN_READABLE
-                + 2 * ENABLE_SELINUX
-                + 2 * ENABLE_FEATURE_AUTOWIDTH,
-        OPT_color = 1 << OPTBIT_color,
-};
 
-enum {
-        LIST_MASK_TRIGGER       = 0,
-        STYLE_MASK_TRIGGER      = STYLE_MASK,
-        DISP_MASK_TRIGGER       = DISP_ROWS,
-        SORT_MASK_TRIGGER       = SORT_MASK,
+        OPTBIT_c = 13,
+        OPTBIT_e,
+        OPTBIT_t,
+        OPTBIT_u,
+        OPTBIT_S = OPTBIT_c + 4 * ENABLE_FEATURE_LS_TIMESTAMPS,
+        OPTBIT_X, /* 18 */
+        OPTBIT_r,
+        OPTBIT_v,
+        OPTBIT_F = OPTBIT_S + 4 * ENABLE_FEATURE_LS_SORTFILES,
+        OPTBIT_p, /* 22 */
+        OPTBIT_R = OPTBIT_F + 2 * ENABLE_FEATURE_LS_FILETYPES,
+        OPTBIT_K = OPTBIT_R + 1 * ENABLE_FEATURE_LS_RECURSIVE,
+        OPTBIT_Z, /* 25 */
+        OPTBIT_L = OPTBIT_K + 2 * ENABLE_SELINUX,
+        OPTBIT_H, /* 27 */
+        OPTBIT_h = OPTBIT_L + 1 * ENABLE_FEATURE_LS_FOLLOWLINKS,
+        OPTBIT_T = OPTBIT_h + 2 * ENABLE_FEATURE_HUMAN_READABLE,
+        OPTBIT_w, /* 30 */
+        OPTBIT_color = OPTBIT_T + 2 * ENABLE_FEATURE_AUTOWIDTH,
+
+        OPT_c = (1 << OPTBIT_c) * ENABLE_FEATURE_LS_TIMESTAMPS,
+        OPT_e = (1 << OPTBIT_e) * ENABLE_FEATURE_LS_TIMESTAMPS,
+        OPT_t = (1 << OPTBIT_t) * ENABLE_FEATURE_LS_TIMESTAMPS,
+        OPT_u = (1 << OPTBIT_u) * ENABLE_FEATURE_LS_TIMESTAMPS,
+        OPT_S = (1 << OPTBIT_S) * ENABLE_FEATURE_LS_SORTFILES,
+        OPT_X = (1 << OPTBIT_X) * ENABLE_FEATURE_LS_SORTFILES,
+        OPT_r = (1 << OPTBIT_r) * ENABLE_FEATURE_LS_SORTFILES,
+        OPT_v = (1 << OPTBIT_v) * ENABLE_FEATURE_LS_SORTFILES,
+        OPT_F = (1 << OPTBIT_F) * ENABLE_FEATURE_LS_FILETYPES,
+        OPT_p = (1 << OPTBIT_p) * ENABLE_FEATURE_LS_FILETYPES,
+        OPT_R = (1 << OPTBIT_R) * ENABLE_FEATURE_LS_RECURSIVE,
+        OPT_K = (1 << OPTBIT_K) * ENABLE_SELINUX,
+        OPT_Z = (1 << OPTBIT_Z) * ENABLE_SELINUX,
+        OPT_L = (1 << OPTBIT_L) * ENABLE_FEATURE_LS_FOLLOWLINKS,
+        OPT_H = (1 << OPTBIT_H) * ENABLE_FEATURE_LS_FOLLOWLINKS,
+        OPT_h = (1 << OPTBIT_h) * ENABLE_FEATURE_HUMAN_READABLE,
+        OPT_T = (1 << OPTBIT_T) * ENABLE_FEATURE_AUTOWIDTH,
+        OPT_w = (1 << OPTBIT_w) * ENABLE_FEATURE_AUTOWIDTH,
+        OPT_color = (1 << OPTBIT_color) * ENABLE_FEATURE_LS_COLOR,
 };
 
 /* TODO: simple toggles may be stored as OPT_xxx bits instead */
-static const unsigned opt_flags[] = {
-        LIST_SHORT | STYLE_COLUMNS, /* C */
-        DISP_HIDDEN | DISP_DOT,     /* a */
-        DISP_NOLIST,                /* d */
-        LIST_INO,                   /* i */
-        LIST_LONG | STYLE_LONG,     /* l - remember LS_DISP_HR in mask! */
-        LIST_SHORT | STYLE_SINGLE,  /* 1 */
-        0,                          /* g (don't show group) - handled via OPT_g */
-        LIST_ID_NUMERIC,            /* n */
-        LIST_BLOCKS,                /* s */
-        DISP_ROWS,                  /* x */
-        0,                          /* Q (quote filename) - handled via OPT_Q */
-        DISP_HIDDEN,                /* A */
+static const uint32_t opt_flags[] = {
+        STYLE_COLUMNAR,              /* C */
+        DISP_HIDDEN | DISP_DOT,      /* a */
+        DISP_NOLIST,                 /* d */
+        LIST_INO,                    /* i */
+        LIST_LONG | STYLE_LONG,      /* l */
+        STYLE_SINGLE,                /* 1 */
+        0,                           /* g (don't show owner) - handled via OPT_g */
+        LIST_ID_NUMERIC,             /* n */
+        LIST_BLOCKS,                 /* s */
+        DISP_ROWS | STYLE_COLUMNAR,  /* x */
+        0,                           /* Q (quote filename) - handled via OPT_Q */
+        DISP_HIDDEN,                 /* A */
         ENABLE_SELINUX * LIST_CONTEXT, /* k (ignored if !SELINUX) */
 #if ENABLE_FEATURE_LS_TIMESTAMPS
-        TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME),   /* c */
-        LIST_FULLTIME,              /* e */
-        ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME,   /* t */
-        TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME),   /* u */
+        TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME), /* c */
+        LIST_FULLTIME,               /* e */
+        ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME, /* t */
+        TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME), /* u */
 #endif
 #if ENABLE_FEATURE_LS_SORTFILES
-        SORT_SIZE,                  /* S */
-        SORT_EXT,                   /* X */
-        SORT_REVERSE,               /* r */
-        SORT_VERSION,               /* v */
+        SORT_SIZE,                   /* S */
+        SORT_EXT,                    /* X */
+        SORT_REVERSE,                /* r */
+        SORT_VERSION,                /* v */
 #endif
 #if ENABLE_FEATURE_LS_FILETYPES
-        LIST_FILETYPE | LIST_EXEC,  /* F */
-        LIST_FILETYPE,              /* p */
-#endif
-#if ENABLE_FEATURE_LS_FOLLOWLINKS
-        FOLLOW_LINKS,               /* L */
+        LIST_FILETYPE | LIST_EXEC,   /* F */
+        LIST_FILETYPE,               /* p */
 #endif
 #if ENABLE_FEATURE_LS_RECURSIVE
-        DISP_RECURSIVE,             /* R */
-#endif
-#if ENABLE_FEATURE_HUMAN_READABLE
-        LS_DISP_HR,                 /* h */
+        DISP_RECURSIVE,              /* R */
 #endif
 #if ENABLE_SELINUX
         LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */
-#endif
-#if ENABLE_SELINUX
         LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT, /* Z */
 #endif
-        (1U<<31)
-        /* options after Z are not processed through opt_flags:
-         * T, w - ignored
-         */
+        (1U << 31)
+        /* options after Z are not processed through opt_flags */
 };
 
 
@@ -246,7 +322,6 @@ struct globals {
         smallint exit_code;
         unsigned all_fmt;
 #if ENABLE_FEATURE_AUTOWIDTH
-        unsigned tabstops; // = COLUMN_GAP;
         unsigned terminal_width; // = TERMINAL_WIDTH;
 #endif
 #if ENABLE_FEATURE_LS_TIMESTAMPS
@@ -263,11 +338,9 @@ enum { show_color = 0 };
 #define exit_code       (G.exit_code     )
 #define all_fmt         (G.all_fmt       )
 #if ENABLE_FEATURE_AUTOWIDTH
-# define tabstops       (G.tabstops      )
 # define terminal_width (G.terminal_width)
 #else
 enum {
-        tabstops = COLUMN_GAP,
         terminal_width = TERMINAL_WIDTH,
 };
 #endif
@@ -275,7 +348,6 @@ enum {
 #define INIT_G() do { \
         /* we have to zero it out because of NOEXEC */ \
         memset(&G, 0, sizeof(G)); \
-        IF_FEATURE_AUTOWIDTH(tabstops = COLUMN_GAP;) \
         IF_FEATURE_AUTOWIDTH(terminal_width = TERMINAL_WIDTH;) \
         IF_FEATURE_LS_TIMESTAMPS(time(&current_time_t);) \
 } while (0)
@@ -287,7 +359,7 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f
         struct dnode *cur;
         IF_SELINUX(security_context_t sid = NULL;)
 
-        if ((all_fmt & FOLLOW_LINKS) || force_follow) {
+        if ((option_mask32 & OPT_L) || force_follow) {
 #if ENABLE_SELINUX
                 if (is_selinux_enabled())  {
                          getfilecon(fullname, &sid);
@@ -547,7 +619,7 @@ static unsigned calc_name_len(const char *name)
 
 
 /* Return the number of used columns.
- * Note that only STYLE_COLUMNS uses return value.
+ * Note that only STYLE_COLUMNAR uses return value.
  * STYLE_SINGLE and STYLE_LONG don't care.
  * coreutils 7.2 also supports:
  * ls -b (--escape) = octal escapes (although it doesn't look like working)
@@ -581,7 +653,7 @@ static unsigned print_name(const char *name)
 }
 
 /* Return the number of used columns.
- * Note that only STYLE_COLUMNS uses return value,
+ * Note that only STYLE_COLUMNAR uses return value,
  * STYLE_SINGLE and STYLE_LONG don't care.
  */
 static NOINLINE unsigned list_single(const struct dnode *dn)
@@ -625,7 +697,7 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
         if (all_fmt & LIST_ID_NAME) {
                 if (option_mask32 & OPT_g) {
                         column += printf("%-8.8s ",
-                                get_cached_username(dn->dstat.st_uid));
+                                get_cached_groupname(dn->dstat.st_gid));
                 } else {
                         column += printf("%-8.8s %-8.8s ",
                                 get_cached_username(dn->dstat.st_uid),
@@ -635,19 +707,19 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
 #endif
         if (all_fmt & LIST_ID_NUMERIC) {
                 if (option_mask32 & OPT_g)
-                        column += printf("%-8u ", (int) dn->dstat.st_uid);
+                        column += printf("%-8u ", (int) dn->dstat.st_gid);
                 else
                         column += printf("%-8u %-8u ",
                                         (int) dn->dstat.st_uid,
                                         (int) dn->dstat.st_gid);
         }
-        if (all_fmt & (LIST_SIZE /*|LIST_DEV*/ )) {
+        if (all_fmt & LIST_SIZE) {
                 if (S_ISBLK(dn->dstat.st_mode) || S_ISCHR(dn->dstat.st_mode)) {
                         column += printf("%4u, %3u ",
                                         (int) major(dn->dstat.st_rdev),
                                         (int) minor(dn->dstat.st_rdev));
                 } else {
-                        if (all_fmt & LS_DISP_HR) {
+                        if (option_mask32 & OPT_h) {
                                 column += printf("%"HUMAN_READABLE_MAX_WIDTH_STR"s ",
                                         /* print st_size, show one fractional, use suffixes */
                                         make_human_readable_str(dn->dstat.st_size, 1, 0)
@@ -689,20 +761,20 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
                 freecon(dn->sid);
         }
 #endif
-        if (all_fmt & LIST_FILENAME) {
+
 #if ENABLE_FEATURE_LS_COLOR
-                if (show_color) {
-                        info.st_mode = 0; /* for fgcolor() */
-                        lstat(dn->fullname, &info);
-                        printf("\033[%u;%um", bold(info.st_mode),
-                                        fgcolor(info.st_mode));
-                }
+        if (show_color) {
+                info.st_mode = 0; /* for fgcolor() */
+                lstat(dn->fullname, &info);
+                printf("\033[%u;%um", bold(info.st_mode),
+                        fgcolor(info.st_mode));
+        }
 #endif
-                column += print_name(dn->name);
-                if (show_color) {
-                        printf("\033[0m");
-                }
+        column += print_name(dn->name);
+        if (show_color) {
+                printf("\033[0m");
         }
+
         if (all_fmt & LIST_SYMLINK) {
                 if (S_ISLNK(dn->dstat.st_mode) && lpath) {
                         printf(" -> ");
@@ -742,9 +814,9 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
 static void showfiles(struct dnode **dn, unsigned nfiles)
 {
         unsigned i, ncols, nrows, row, nc;
-        unsigned column = 0;
-        unsigned nexttab = 0;
-        unsigned column_width = 0; /* used only by STYLE_COLUMNS */
+        unsigned column;
+        unsigned nexttab;
+        unsigned column_width = 0; /* used only by STYLE_COLUMNAR */
 
         if (all_fmt & STYLE_LONG) { /* STYLE_LONG or STYLE_SINGLE */
                 ncols = 1;
@@ -755,7 +827,7 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
                         if (column_width < len)
                                 column_width = len;
                 }
-                column_width += tabstops +
+                column_width += 1 +
                         IF_SELINUX( ((all_fmt & LIST_CONTEXT) ? 33 : 0) + )
                                 ((all_fmt & LIST_INO) ? 8 : 0) +
                                 ((all_fmt & LIST_BLOCKS) ? 5 : 0);
@@ -771,6 +843,8 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
                 ncols = 1;
         }
 
+        column = 0;
+        nexttab = 0;
         for (row = 0; row < nrows; row++) {
                 for (nc = 0; nc < ncols; nc++) {
                         /* reach into the array based on the column and row */
@@ -781,8 +855,8 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
                         if (i < nfiles) {
                                 if (column > 0) {
                                         nexttab -= column;
-                                        printf("%*s", nexttab, "");
-                                        column += nexttab;
+                                        printf("%*s ", nexttab, "");
+                                        column += nexttab + 1;
                                 }
                                 nexttab = column + column_width;
                                 column += list_single(dn[i]);
@@ -835,12 +909,6 @@ static void showdirs(struct dnode **dn, int first)
         struct dnode **subdnp;
         struct dnode **dnd;
 
-        /* Never happens:
-        if (dn == NULL || ndirs < 1) {
-                return;
-        }
-        */
-
         for (; *dn; dn++) {
                 if (all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) {
                         if (!first)
@@ -981,8 +1049,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
 
         init_unicode();
 
-        all_fmt = LIST_SHORT |
-                (ENABLE_FEATURE_LS_SORTFILES * (SORT_NAME | SORT_FORWARD));
+        all_fmt = ENABLE_FEATURE_LS_SORTFILES * SORT_NAME;
 
 #if ENABLE_FEATURE_AUTOWIDTH
         /* obtain the terminal width */
@@ -993,32 +1060,38 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
 
         /* process options */
         IF_FEATURE_LS_COLOR(applet_long_options = ls_longopts;)
-#if ENABLE_FEATURE_AUTOWIDTH
-        opt_complementary = "T+:w+"; /* -T N, -w N */
-        opt = getopt32(argv, ls_options, &tabstops, &terminal_width
-                                IF_FEATURE_LS_COLOR(, &color_opt));
-#else
-        opt = getopt32(argv, ls_options IF_FEATURE_LS_COLOR(, &color_opt));
-#endif
-        for (i = 0; opt_flags[i] != (1U<<31); i++) {
+        opt_complementary =
+                /* -e implies -l */
+                "el"
+                /* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html:
+                 * in some pairs of opts, only last one takes effect:
+                 */
+                IF_FEATURE_LS_TIMESTAMPS(IF_FEATURE_LS_SORTFILES(":t-S:S-t")) /* time/size */
+                // ":m-l:l-m" - we don't have -m
+                IF_FEATURE_LS_FOLLOWLINKS(":H-L:L-H")
+                ":C-xl:x-Cl:l-xC" /* bycols/bylines/long */
+                ":C-1:1-C" /* bycols/oneline */
+                ":x-1:1-x" /* bylines/oneline (not in SuS, but in GNU coreutils 8.4) */
+                ":c-u:u-c" /* mtime/atime */
+                /* -w NUM: */
+                IF_FEATURE_AUTOWIDTH(":w+");
+        opt = getopt32(argv, ls_options
+                IF_FEATURE_AUTOWIDTH(, NULL, &terminal_width)
+                IF_FEATURE_LS_COLOR(, &color_opt)
+        );
+        for (i = 0; opt_flags[i] != (1U << 31); i++) {
                 if (opt & (1 << i)) {
-                        unsigned flags = opt_flags[i];
+                        uint32_t flags = opt_flags[i];
 
-                        if (flags & LIST_MASK_TRIGGER)
-                                all_fmt &= ~LIST_MASK;
-                        if (flags & STYLE_MASK_TRIGGER)
+                        if (flags & STYLE_MASK)
                                 all_fmt &= ~STYLE_MASK;
-                        if (flags & SORT_MASK_TRIGGER)
+                        if (flags & SORT_MASK)
                                 all_fmt &= ~SORT_MASK;
-                        if (flags & DISP_MASK_TRIGGER)
-                                all_fmt &= ~DISP_MASK;
                         if (flags & TIME_MASK)
                                 all_fmt &= ~TIME_MASK;
+
                         if (flags & LIST_CONTEXT)
                                 all_fmt |= STYLE_SINGLE;
-                        /* huh?? opt cannot be 'l' */
-                        //if (LS_DISP_HR && opt == 'l')
-                        //      all_fmt &= ~LS_DISP_HR;
                         all_fmt |= flags;
                 }
         }
@@ -1058,14 +1131,14 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                         all_fmt = (all_fmt & ~SORT_MASK) | SORT_ATIME;
         }
         if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* only for long list */
-                all_fmt &= ~(LIST_ID_NUMERIC|LIST_FULLTIME|LIST_ID_NAME|LIST_ID_NUMERIC);
+                all_fmt &= ~(LIST_ID_NUMERIC|LIST_ID_NAME|LIST_FULLTIME);
         if (ENABLE_FEATURE_LS_USERNAME)
                 if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC))
                         all_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */
 
-        /* choose a display format */
+        /* choose a display format if one was not already specified by an option */
         if (!(all_fmt & STYLE_MASK))
-                all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNS : STYLE_SINGLE);
+                all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNAR : STYLE_SINGLE);
 
         argv += optind;
         if (!argv[0])
@@ -1078,8 +1151,12 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
         dn = NULL;
         nfiles = 0;
         do {
-                /* NB: follow links on command line unless -l or -s */
-                cur = my_stat(*argv, *argv, !(all_fmt & (STYLE_LONG|LIST_BLOCKS)));
+                cur = my_stat(*argv, *argv,
+                        /* follow links on command line unless -l, -s or -F: */
+                        !((all_fmt & (STYLE_LONG|LIST_BLOCKS)) || (option_mask32 & OPT_F))
+                        /* ... or if -H: */
+                        || (option_mask32 & OPT_H)
+                );
                 argv++;
                 if (!cur)
                         continue;
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 245639bd0..399f391b2 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -92,7 +92,7 @@ int mv_main(int argc, char **argv)
                             || (flags & OPT_FILEUTILS_INTERACTIVE))
                         ) {
                                 if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) {
-                                        goto RET_1;     /* Ouch! fprintf failed! */
+                                        goto RET_1;  /* Ouch! fprintf failed! */
                                 }
                                 if (!bb_ask_confirmation()) {
                                         goto RET_0;
diff --git a/coreutils/nice.c b/coreutils/nice.c
index 6b8fce24d..35d6bf3d9 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -17,12 +17,12 @@ int nice_main(int argc, char **argv)
 
         old_priority = getpriority(PRIO_PROCESS, 0);
 
-        if (!*++argv) { /* No args, so (GNU) output current nice value. */
+        if (!*++argv) { /* No args, so (GNU) output current nice value. */
                 printf("%d\n", old_priority);
                 fflush_stdout_and_exit(EXIT_SUCCESS);
         }
 
-        adjustment = 10;                        /* Set default adjustment. */
+        adjustment = 10;  /* Set default adjustment. */
 
         if (argv[0][0] == '-') {
                 if (argv[0][1] == 'n') { /* -n */
@@ -32,7 +32,7 @@ int nice_main(int argc, char **argv)
                 } else { /* -NNN (NNN may be negative) == -n NNN */
                         argv[0] += 1; argv--; argc++;
                 }
-                if (argc < 4) {                 /* Missing priority and/or utility! */
+                if (argc < 4) {  /* Missing priority and/or utility! */
                         bb_show_usage();
                 }
                 adjustment = xatoi_range(argv[1], INT_MIN/2, INT_MAX/2);
diff --git a/coreutils/od.c b/coreutils/od.c
index dcd693446..e62711671 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -4,7 +4,7 @@
  * Based on code from util-linux v 2.11l
  *
  * Copyright (c) 1990
- *      The Regents of the University of California.  All rights reserved.
+ * The Regents of the University of California.  All rights reserved.
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
@@ -174,7 +174,7 @@ int od_main(int argc, char **argv)
                                 bb_dump_add(dumper, "\"         \"");
                         }
                         bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]);
-                } else {        /* P, p, s, w, or other unhandled */
+                } else {  /* P, p, s, w, or other unhandled */
                         bb_show_usage();
                 }
         }
diff --git a/coreutils/sort.c b/coreutils/sort.c
index eccc2d437..3562464d1 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -52,8 +52,8 @@ enum {
 static char key_separator;
 
 static struct sort_key {
-        struct sort_key *next_key;      /* linked list */
-        unsigned range[4];      /* start word, start char, end word, end char */
+        struct sort_key *next_key;  /* linked list */
+        unsigned range[4];          /* start word, start char, end word, end char */
         unsigned flags;
 } *key_list;
 
diff --git a/coreutils/stat.c b/coreutils/stat.c
index b4e6f10fd..7351f5956 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -630,10 +630,9 @@ static bool do_stat(const char *filename, const char *format)
 # if ENABLE_SELINUX
                 printf("   S_Context: %lc\n", *scontext);
 # endif
-                printf("Access: %s\n" "Modify: %s\n" "Change: %s\n",
-                       human_time(statbuf.st_atime),
-                       human_time(statbuf.st_mtime),
-                       human_time(statbuf.st_ctime));
+                printf("Access: %s\n", human_time(statbuf.st_atime));
+                printf("Modify: %s\n", human_time(statbuf.st_mtime));
+                printf("Change: %s\n", human_time(statbuf.st_ctime));
         }
 #endif  /* FEATURE_STAT_FORMAT */
         return 1;
diff --git a/coreutils/test.c b/coreutils/test.c
index 1952337b3..3e9ab7c65 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -49,9 +49,9 @@
  * state. */
 
 /* test(1) accepts the following grammar:
-        oexpr   ::= aexpr | aexpr "-o" oexpr ;
-        aexpr   ::= nexpr | nexpr "-a" aexpr ;
-        nexpr   ::= primary | "!" primary
+        oexpr   ::= aexpr | aexpr "-o" oexpr ;
+        aexpr   ::= nexpr | nexpr "-a" aexpr ;
+        nexpr   ::= primary | "!" primary
         primary ::= unary-operator operand
                 | operand binary-operator operand
                 | operand
@@ -901,7 +901,10 @@ int test_main(int argc, char **argv)
         res = !oexpr(check_operator(*args));
 
         if (*args != NULL && *++args != NULL) {
-                /* TODO: example when this happens? */
+                /* Examples:
+                 * test 3 -lt 5 6
+                 * test -t 1 2
+                 */
                 bb_error_msg("%s: unknown operand", *args);
                 res = 2;
         }
diff --git a/coreutils/touch.c b/coreutils/touch.c
index afff36b4d..6c2b948e6 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -19,6 +19,35 @@
 
 #include "libbb.h"
 
+//config:config TOUCH
+//config:       bool "touch"
+//config:       default y
+//config:       help
+//config:         touch is used to create or change the access and/or
+//config:         modification timestamp of specified files.
+
+//applet:IF_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_DROP, touch))
+
+//kbuild:lib-$(CONFIG_TOUCH) += touch.o
+
+//usage:#define touch_trivial_usage
+//usage:       "[-c]" IF_DESKTOP(" [-d DATE] [-r FILE]") " FILE [FILE]..."
+//usage:#define touch_full_usage "\n\n"
+//usage:       "Update the last-modified date on the given FILE[s]\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -c      Don't create files"
+//usage:        IF_DESKTOP(
+//usage:     "\n        -d DT   Date/time to use"
+//usage:     "\n        -r FILE Use FILE's date/time"
+//usage:        )
+//usage:
+//usage:#define touch_example_usage
+//usage:       "$ ls -l /tmp/foo\n"
+//usage:       "/bin/ls: /tmp/foo: No such file or directory\n"
+//usage:       "$ touch /tmp/foo\n"
+//usage:       "$ ls -l /tmp/foo\n"
+//usage:       "-rw-rw-r--    1 andersen andersen        0 Apr 15 01:11 /tmp/foo\n"
+
 /* This is a NOFORK applet. Be very careful! */
 
 /* coreutils implements:
@@ -91,9 +120,10 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
                 struct tm tm_time;
                 time_t t;
 
-                //time(&t);
-                //localtime_r(&t, &tm_time);
-                memset(&tm_time, 0, sizeof(tm_time));
+                //memset(&tm_time, 0, sizeof(tm_time));
+                /* Better than memset: makes "HH:MM" dates meaningful */
+                time(&t);
+                localtime_r(&t, &tm_time);
                 parse_datestr(date_str, &tm_time);
 
                 /* Correct any day of week and day of year etc. fields */
diff --git a/coreutils/tr.c b/coreutils/tr.c
index d6bc7d20a..21d77ef95 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -203,7 +203,7 @@ static unsigned expand(const char *arg, char **buffer_p)
                                 buffer[pos++] = *arg; /* copy CHAR */
                                 if (!arg[0] || arg[1] != '=' || arg[2] != ']')
                                         bb_show_usage();
-                                arg += 3;       /* skip CHAR=] */
+                                arg += 3;  /* skip CHAR=] */
                                 continue;
                         }
                         /* The rest of "[xyz..." cases is treated as normal
@@ -258,9 +258,9 @@ int tr_main(int argc UNUSED_PARAM, char **argv)
         char *invec  = vector + ASCII;
         char *outvec = vector + ASCII * 2;
 
-#define TR_OPT_complement       (3 << 0)
-#define TR_OPT_delete           (1 << 2)
-#define TR_OPT_squeeze_reps     (1 << 3)
+#define TR_OPT_complement   (3 << 0)
+#define TR_OPT_delete       (1 << 2)
+#define TR_OPT_squeeze_reps (1 << 3)
 
         for (i = 0; i < ASCII; i++) {
                 vector[i] = i;
diff --git a/coreutils/wc.c b/coreutils/wc.c
index ecadae59b..fe3f274f8 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -153,7 +153,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
                                         bb_simple_perror_msg(arg);
                                         status = EXIT_FAILURE;
                                 }
-                                goto DO_EOF;            /* Treat an EOF as '\r'. */
+                                goto DO_EOF;  /* Treat an EOF as '\r'. */
                         }
 
                         /* Cater for -c and -m */
@@ -179,7 +179,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
                                  */
                                 if (c == '\t') {
                                         linepos = (linepos | 7) + 1;
-                                } else {                        /* '\n', '\r', '\f', or '\v' */
+                                } else {  /* '\n', '\r', '\f', or '\v' */
  DO_EOF:
                                         if (linepos > counts[WC_LENGTH]) {
                                                 counts[WC_LENGTH] = linepos;
@@ -230,7 +230,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
          * effect of trashing the totals array after outputting it, but that's
          * irrelavent since we no longer need it. */
         if (num_files > 1) {
-                num_files = 0;                          /* Make sure we don't get here again. */
+                num_files = 0;  /* Make sure we don't get here again. */
                 arg = "total";
                 pcounts = totals;
                 --argv;
diff --git a/docs/keep_data_small.txt b/docs/keep_data_small.txt
index 01c0d3c7b..21d732674 100644
--- a/docs/keep_data_small.txt
+++ b/docs/keep_data_small.txt
@@ -59,7 +59,7 @@ wait
                 Example 1
 
 One example how to reduce global data usage is in
-archival/libunarchive/decompress_unzip.c:
+archival/libarchive/decompress_unzip.c:
 
 /* This is somewhat complex-looking arrangement, but it allows
  * to place decompressor state either in bss or in
diff --git a/docs/new-applet-HOWTO.txt b/docs/new-applet-HOWTO.txt
index 2f237564d..bb29999cf 100644
--- a/docs/new-applet-HOWTO.txt
+++ b/docs/new-applet-HOWTO.txt
@@ -19,8 +19,7 @@ such as who you stole the code from and so forth. Also include the mini-GPL
 boilerplate. Be sure to name the main function <applet>_main instead of main.
 And be sure to put it in <applet>.c. Usage does not have to be taken care of by
 your applet.
-Make sure to #include "libbb.h" as the first include file in your applet so
-the bb_config.h and appropriate platform specific files are included properly.
+Make sure to #include "libbb.h" as the first include file in your applet.
 
 For a new applet mu, here is the code that would go in mu.c:
 
@@ -99,14 +98,14 @@ int function(char *a)
 ----end example code------
 
 Add <function_name>.o in the right alphabetically sorted place
-in libbb/Kbuild. You should look at the conditional part of
-libbb/Kbuild aswell.
+in libbb/Kbuild.src. You should look at the conditional part of
+libbb/Kbuild.src as well.
 
 You should also try to find a suitable place in include/libbb.h for
 the function declaration. If not, add it somewhere anyway, with or without
 ifdefs to include or not.
 
-You can look at libbb/Config.in and try to find out if the function is
+You can look at libbb/Config.src and try to find out if the function is
 tunable and add it there if it is.
 
 
@@ -118,11 +117,11 @@ Find the appropriate directory for your new applet.
 Make sure you find the appropriate places in the files, the applets are
 sorted alphabetically.
 
-Add the applet to Kbuild in the chosen directory:
+Add the applet to Kbuild.src in the chosen directory:
 
 lib-$(CONFIG_MU)               += mu.o
 
-Add the applet to Config.in in the chosen directory:
+Add the applet to Config.src in the chosen directory:
 
 config MU
         bool "MU"
@@ -134,7 +133,7 @@ config MU
 Usage String(s)
 ---------------
 
-Next, add usage information for you applet to include/usage.h.
+Next, add usage information for you applet to include/usage.src.h.
 This should look like the following:
 
         #define mu_trivial_usage \
@@ -149,17 +148,17 @@ This should look like the following:
 If your program supports flags, the flags should be mentioned on the first
 line (-[abcde]) and a detailed description of each flag should go in the
 mu_full_usage section, one flag per line. (Numerous examples of this
-currently exist in usage.h.)
+currently exist in usage.src.h.)
 
 
 Header Files
 ------------
 
-Next, add an entry to include/applets.h.  Be *sure* to keep the list
+Next, add an entry to include/applets.src.h.  Be *sure* to keep the list
 in alphabetical order, or else it will break the binary-search lookup
 algorithm in busybox.c and the Gods of BusyBox smite you. Yea, verily:
 
-Be sure to read the top of applets.h before adding your applet.
+Be sure to read the top of applets.src.h before adding your applet.
 
         /* all programs above here are alphabetically "less than" 'mu' */
         IF_MU(APPLET(mu, _BB_DIR_USR_BIN, _BB_SUID_DROP))
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.h b/e2fsprogs/old_e2fsprogs/e2fsck.h
index fdfa2d84a..330209d69 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.h
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.h
@@ -629,7 +629,7 @@ struct e2fsck_struct {
 };
 
 
-#define tid_gt(x, y)            ((x - y) > 0)
+#define tid_gt(x, y)  ((x - y) > 0)
 
 static inline int tid_geq(tid_t x, tid_t y)
 {
diff --git a/editors/Config.src b/editors/Config.src
index fc824ccd5..201ee6eb9 100644
--- a/editors/Config.src
+++ b/editors/Config.src
@@ -60,12 +60,6 @@ config ED
           Small, simple, evil. Part of SUSv3. If you're not already using
           this, you don't need it.
 
-config PATCH
-        bool "patch"
-        default y
-        help
-          Apply a unified diff formatted patch.
-
 config SED
         bool "sed"
         default y
diff --git a/editors/Kbuild.src b/editors/Kbuild.src
index 98128064d..2f23ae12f 100644
--- a/editors/Kbuild.src
+++ b/editors/Kbuild.src
@@ -11,6 +11,5 @@ lib-$(CONFIG_AWK)       += awk.o
 lib-$(CONFIG_CMP)       += cmp.o
 lib-$(CONFIG_DIFF)      += diff.o
 lib-$(CONFIG_ED)        += ed.o
-lib-$(CONFIG_PATCH)     += patch.o
 lib-$(CONFIG_SED)       += sed.o
 lib-$(CONFIG_VI)        += vi.o
diff --git a/editors/awk.c b/editors/awk.c
index 8bc56756c..2eeb9d77a 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -277,10 +277,10 @@ enum {
 
 /* tokens and their corresponding info values */
 
-#define NTC     "\377"  /* switch to next token class (tc<<1) */
-#define NTCC    '\377'
+#define NTC     "\377"  /* switch to next token class (tc<<1) */
+#define NTCC    '\377'
 
-#define OC_B    OC_BUILTIN
+#define OC_B  OC_BUILTIN
 
 static const char tokenlist[] ALIGN1 =
         "\1("         NTC
@@ -368,7 +368,7 @@ static const uint32_t tokeninfo[] = {
         OC_B|B_ss|P(0x8f), OC_FBLTIN|F_ti,    OC_B|B_ti|P(0x0b), OC_B|B_mt|P(0x0b),
         OC_B|B_lo|P(0x49), OC_B|B_up|P(0x49),
         OC_GETLINE|SV|P(0),
-        0,                 0,
+        0,                 0,
         0,
         0 /* END */
 };
@@ -380,7 +380,7 @@ enum {
         ORS,        RS,         RT,         FILENAME,
         SUBSEP,     F0,         ARGIND,     ARGC,
         ARGV,       ERRNO,      FNR,        NR,
-        NF,         IGNORECASE, ENVIRON,    NUM_INTERNAL_VARS
+        NF,         IGNORECASE, ENVIRON,    NUM_INTERNAL_VARS
 };
 
 static const char vNames[] ALIGN1 =
@@ -2335,7 +2335,7 @@ static var *evaluate(node *op, var *res)
 #define fnargs (G.evaluate__fnargs)
 /* seed is initialized to 1 */
 #define seed   (G.evaluate__seed)
-#define sreg   (G.evaluate__sreg)
+#define sreg   (G.evaluate__sreg)
 
         var *v1;
 
@@ -2611,7 +2611,7 @@ static var *evaluate(node *op, var *res)
                                                 rsm->F = popen(L.s, "r");
                                                 rsm->is_pipe = TRUE;
                                         } else {
-                                                rsm->F = fopen_for_read(L.s);           /* not xfopen! */
+                                                rsm->F = fopen_for_read(L.s);  /* not xfopen! */
                                         }
                                 }
                         } else {
diff --git a/editors/cmp.c b/editors/cmp.c
index f495da7d2..f84a56e3e 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -33,8 +33,6 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
         int retval = 0;
 
-        xfunc_error_retval = 2; /* 1 is returned if files are different. */
-
         opt_complementary = "-1"
                         IF_DESKTOP(":?4")
                         IF_NOT_DESKTOP(":?2")
@@ -43,8 +41,6 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
         argv += optind;
 
         filename1 = *argv;
-        fp1 = xfopen_stdin(filename1);
-
         if (*++argv) {
                 filename2 = *argv;
                 if (ENABLE_DESKTOP && *++argv) {
@@ -55,6 +51,10 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 
+        xfunc_error_retval = 2;  /* missing file results in exitcode 2 */
+        if (opt & CMP_OPT_s)
+                logmode = 0;  /* -s suppresses open error messages */
+        fp1 = xfopen_stdin(filename1);
         fp2 = xfopen_stdin(filename2);
         if (fp1 == fp2) {               /* Paranoia check... stdin == stdin? */
                 /* Note that we don't bother reading stdin.  Neither does gnu wc.
@@ -63,6 +63,7 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
                  */
                 return 0;
         }
+        logmode = LOGMODE_STDIO;
 
         if (opt & CMP_OPT_l)
                 fmt = fmt_l_opt;
diff --git a/editors/diff.c b/editors/diff.c
index d9d709db6..cc7ba472e 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -230,7 +230,7 @@ static int search(const int *c, int k, int y, const struct cand *list)
 {
         int i, j;
 
-        if (list[c[k]].y < y)   /* quick look for typical case */
+        if (list[c[k]].y < y)  /* quick look for typical case */
                 return k + 1;
 
         for (i = 0, j = k + 1;;) {
diff --git a/editors/patch.c b/editors/patch.c
index 33ff8b569..9c6d967b9 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -1,8 +1,7 @@
-/* Adapted from toybox's patch. */
-
 /* vi: set sw=4 ts=4:
  *
- * patch.c - Apply a "universal" diff.
+ * Apply a "universal" diff.
+ * Adapted from toybox's patch implementation.
  *
  * Copyright 2007 Rob Landley <rob@landley.net>
  *
@@ -20,30 +19,45 @@
  * -f force (no questions asked)
  * -F fuzz (number, default 2)
  * [file] which file to patch
+ */
+
+//applet:IF_PATCH(APPLET(patch, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_PATCH) += patch.o
+
+//config:config PATCH
+//config:       bool "patch"
+//config:       default y
+//config:       help
+//config:         Apply a unified diff formatted patch.
+
+//usage:#define patch_trivial_usage
+//usage:       "[OPTIONS] [ORIGFILE [PATCHFILE]]"
+//usage:#define patch_full_usage "\n\n"
+//usage:        IF_LONG_OPTS(
+//usage:       "        -p,--strip N            Strip N leading components from file names"
+//usage:     "\n        -i,--input DIFF         Read DIFF instead of stdin"
+//usage:     "\n        -R,--reverse            Reverse patch"
+//usage:     "\n        -N,--forward            Ignore already applied patches"
+//usage:     "\n        --dry-run               Don't actually change files"
+//usage:     "\n        -E,--remove-empty-files Remove output files if they become empty"
+//usage:        )
+//usage:        IF_NOT_LONG_OPTS(
+//usage:       "        -p N    Strip N leading components from file names"
+//usage:     "\n        -i DIFF Read DIFF instead of stdin"
+//usage:     "\n        -R      Reverse patch"
+//usage:     "\n        -N      Ignore already applied patches"
+//usage:     "\n        -E      Remove output files if they become empty"
+//usage:        )
+//usage:
+//usage:#define patch_example_usage
+//usage:       "$ patch -p1 < example.diff\n"
+//usage:       "$ patch -p0 -i example.diff"
 
-USE_PATCH(NEWTOY(patch, USE_TOYBOX_DEBUG("x")"up#i:R", TOYFLAG_USR|TOYFLAG_BIN))
-
-config PATCH
-        bool "patch"
-        default y
-        help
-          usage: patch [-i file] [-p depth] [-Ru]
-
-          Apply a unified diff to one or more files.
+#include "libbb.h"
 
-          -i    Input file (defaults=stdin)
-          -p    number of '/' to strip from start of file paths (default=all)
-          -R    Reverse patch.
-          -u    Ignored (only handles "unified" diffs)
 
-          This version of patch only handles unified diffs, and only modifies
-          a file when all all hunks to that file apply.  Patch prints failed
-          hunks to stderr, and exits with nonzero status if any hunks fail.
-
-          A file compared against /dev/null (or with a date <= the epoch) is
-          created or deleted if -E or --remove-empty-files set.
-*/
-#include "libbb.h"
+// libbb candidate?
 
 struct double_list {
         struct double_list *next;
@@ -51,188 +65,55 @@ struct double_list {
         char *data;
 };
 
-// Return the first item from the list, advancing the list (which must be called
-// as &list)
-static
-void *TOY_llist_pop(void *list)
-{
-        // I'd use a void ** for the argument, and even accept the typecast in all
-        // callers as documentation you need the &, except the stupid compiler
-        // would then scream about type-punned pointers.  Screw it.
-        void **llist = (void **)list;
-        void **next = (void **)*llist;
-        *llist = *next;
-
-        return (void *)next;
-}
-
 // Free all the elements of a linked list
-// if freeit!=NULL call freeit() on each element before freeing it.
+// Call freeit() on each element before freeing it.
 static
-void TOY_llist_free(void *list, void (*freeit)(void *data))
+void dlist_free(struct double_list *list, void (*freeit)(void *data))
 {
         while (list) {
-                void *pop = TOY_llist_pop(&list);
-                if (freeit) freeit(pop);
-                else free(pop);
-
-                // End doubly linked list too.
-                if (list==pop) break;
+                void *pop = list;
+                list = list->next;
+                freeit(pop);
+                // Bail out also if list is circular.
+                if (list == pop) break;
         }
 }
-//Override bbox's names
-#define llist_pop TOY_llist_pop
-#define llist_free TOY_llist_free
 
-// Add an entry to the end off a doubly linked list
+// Add an entry before "list" element in (circular) doubly linked list
 static
 struct double_list *dlist_add(struct double_list **list, char *data)
 {
-        struct double_list *line = xmalloc(sizeof(struct double_list));
+        struct double_list *llist;
+        struct double_list *line = xmalloc(sizeof(*line));
 
         line->data = data;
-        if (*list) {
-                line->next = *list;
-                line->prev = (*list)->prev;
-                (*list)->prev->next = line;
-                (*list)->prev = line;
-        } else *list = line->next = line->prev = line;
+        llist = *list;
+        if (llist) {
+                struct double_list *p;
+                line->next = llist;
+                p = line->prev = llist->prev;
+                // (list is circular, we assume p is never NULL)
+                p->next = line;
+                llist->prev = line;
+        } else
+                *list = line->next = line->prev = line;
 
         return line;
 }
 
-// Ensure entire path exists.
-// If mode != -1 set permissions on newly created dirs.
-// Requires that path string be writable (for temporary null terminators).
-static
-void xmkpath(char *path, int mode)
-{
-        char *p, old;
-        mode_t mask;
-        int rc;
-        struct stat st;
-
-        for (p = path; ; p++) {
-                if (!*p || *p == '/') {
-                        old = *p;
-                        *p = rc = 0;
-                        if (stat(path, &st) || !S_ISDIR(st.st_mode)) {
-                                if (mode != -1) {
-                                        mask = umask(0);
-                                        rc = mkdir(path, mode);
-                                        umask(mask);
-                                } else rc = mkdir(path, 0777);
-                        }
-                        *p = old;
-                        if(rc) bb_perror_msg_and_die("mkpath '%s'", path);
-                }
-                if (!*p) break;
-        }
-}
-
-// Slow, but small.
-static
-char *get_rawline(int fd, long *plen, char end)
-{
-        char c, *buf = NULL;
-        long len = 0;
-
-        for (;;) {
-                if (1>read(fd, &c, 1)) break;
-                if (!(len & 63)) buf=xrealloc(buf, len+65);
-                if ((buf[len++]=c) == end) break;
-        }
-        if (buf) buf[len]=0;
-        if (plen) *plen = len;
-
-        return buf;
-}
-
-static
-char *get_line(int fd)
-{
-        long len;
-        char *buf = get_rawline(fd, &len, '\n');
-
-        if (buf && buf[--len]=='\n') buf[len]=0;
-
-        return buf;
-}
-
-// Copy the rest of in to out and close both files.
-static
-void xsendfile(int in, int out)
-{
-        long len;
-        char buf[4096];
-
-        if (in<0) return;
-        for (;;) {
-                len = safe_read(in, buf, 4096);
-                if (len<1) break;
-                xwrite(out, buf, len);
-        }
-}
-
-// Copy the rest of the data and replace the original with the copy.
-static
-void replace_tempfile(int fdin, int fdout, char **tempname)
-{
-        char *temp = xstrdup(*tempname);
-
-        temp[strlen(temp)-6]=0;
-        if (fdin != -1) {
-                xsendfile(fdin, fdout);
-                xclose(fdin);
-        }
-        xclose(fdout);
-        rename(*tempname, temp);
-        free(*tempname);
-        free(temp);
-        *tempname = NULL;
-}
-
-// Open a temporary file to copy an existing file into.
-static
-int copy_tempfile(int fdin, char *name, char **tempname)
-{
-        struct stat statbuf;
-        int fd;
-
-        *tempname = xasprintf("%sXXXXXX", name);
-        fd = xmkstemp(*tempname);
-
-        // Set permissions of output file
-        fstat(fdin, &statbuf);
-        fchmod(fd, statbuf.st_mode);
-
-        return fd;
-}
-
-// Abort the copy and delete the temporary file.
-static
-void delete_tempfile(int fdin, int fdout, char **tempname)
-{
-        close(fdin);
-        close(fdout);
-        unlink(*tempname);
-        free(*tempname);
-        *tempname = NULL;
-}
-
-
 
 struct globals {
         char *infile;
         long prefix;
 
         struct double_list *current_hunk;
+
         long oldline, oldlen, newline, newlen;
         long linenum;
-        int context, state, filein, fileout, filepatch, hunknum;
+        int context, state, hunknum;
+        int filein, fileout;
         char *tempname;
 
-        // was toys.foo:
         int exitval;
 };
 #define TT (*ptr_to_globals)
@@ -263,7 +144,7 @@ struct globals {
 
 static void do_line(void *data)
 {
-        struct double_list *dlist = (struct double_list *)data;
+        struct double_list *dlist = data;
 
         if (TT.state>1 && *dlist->data != TT.state)
                 fdprintf(TT.state == 2 ? 2 : TT.fileout,
@@ -272,19 +153,35 @@ static void do_line(void *data)
         if (PATCH_DEBUG) fdprintf(2, "DO %d: %s\n", TT.state, dlist->data);
 
         free(dlist->data);
-        free(data);
+        free(dlist);
 }
 
 static void finish_oldfile(void)
 {
-        if (TT.tempname) replace_tempfile(TT.filein, TT.fileout, &TT.tempname);
+        if (TT.tempname) {
+                // Copy the rest of the data and replace the original with the copy.
+                char *temp;
+
+                if (TT.filein != -1) {
+                        bb_copyfd_eof(TT.filein, TT.fileout);
+                        xclose(TT.filein);
+                }
+                xclose(TT.fileout);
+
+                temp = xstrdup(TT.tempname);
+                temp[strlen(temp) - 6] = '\0';
+                rename(TT.tempname, temp);
+                free(temp);
+
+                free(TT.tempname);
+                TT.tempname = NULL;
+        }
         TT.fileout = TT.filein = -1;
 }
 
 static void fail_hunk(void)
 {
         if (!TT.current_hunk) return;
-        TT.current_hunk->prev->next = 0;
 
         fdprintf(2, "Hunk %d FAILED %ld/%ld.\n", TT.hunknum, TT.oldline, TT.newline);
         TT.exitval = 1;
@@ -293,9 +190,17 @@ static void fail_hunk(void)
         // this file and advance to next file.
 
         TT.state = 2;
-        llist_free(TT.current_hunk, do_line);
+        TT.current_hunk->prev->next = NULL;
+        dlist_free(TT.current_hunk, do_line);
         TT.current_hunk = NULL;
-        delete_tempfile(TT.filein, TT.fileout, &TT.tempname);
+
+        // Abort the copy and delete the temporary file.
+        close(TT.filein);
+        close(TT.fileout);
+        unlink(TT.tempname);
+        free(TT.tempname);
+        TT.tempname = NULL;
+
         TT.state = 0;
 }
 
@@ -333,8 +238,8 @@ static int apply_one_hunk(void)
         // complete hunk.
         plist = TT.current_hunk;
         buf = NULL;
-        if (TT.context) for (;;) {
-                char *data = get_line(TT.filein);
+        if (reverse ? TT.oldlen : TT.newlen) for (;;) {
+                char *data = xmalloc_reads(TT.filein, NULL, NULL);
 
                 TT.linenum++;
 
@@ -368,7 +273,9 @@ static int apply_one_hunk(void)
                         // File ended before we found a place for this hunk.
                         fail_hunk();
                         goto done;
-                } else if (PATCH_DEBUG) fdprintf(2, "IN: %s\n", data);
+                }
+
+                if (PATCH_DEBUG) fdprintf(2, "IN: %s\n", data);
                 check = dlist_add(&buf, data);
 
                 // Compare this line with next expected line of hunk.
@@ -390,7 +297,8 @@ static int apply_one_hunk(void)
                                         fdprintf(2, "NOT: %s\n", plist->data);
 
                                 TT.state = 3;
-                                check = llist_pop(&buf);
+                                check = buf;
+                                buf = buf->next;
                                 check->prev->next = buf;
                                 buf->prev = check->prev;
                                 do_line(check);
@@ -398,8 +306,8 @@ static int apply_one_hunk(void)
 
                                 // If we've reached the end of the buffer without confirming a
                                 // match, read more lines.
-                                if (check==buf) {
-                                        buf = 0;
+                                if (check == buf) {
+                                        buf = NULL;
                                         break;
                                 }
                                 check = buf;
@@ -417,13 +325,13 @@ static int apply_one_hunk(void)
 out:
         // We have a match.  Emit changed data.
         TT.state = "-+"[reverse ^ dummy_revert];
-        llist_free(TT.current_hunk, do_line);
+        dlist_free(TT.current_hunk, do_line);
         TT.current_hunk = NULL;
         TT.state = 1;
 done:
         if (buf) {
                 buf->prev->next = NULL;
-                llist_free(buf, do_line);
+                dlist_free(buf, do_line);
         }
 
         return TT.state;
@@ -444,6 +352,8 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
         int reverse, state = 0;
         char *oldname = NULL, *newname = NULL;
         char *opt_p, *opt_i;
+        long oldlen = oldlen; /* for compiler */
+        long newlen = newlen; /* for compiler */
 
         INIT_TT();
 
@@ -453,10 +363,10 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
         TT.prefix = (opts & FLAG_PATHLEN) ? xatoi(opt_p) : 0; // can be negative!
         TT.filein = TT.fileout = -1;
         if (opts & FLAG_INPUT) {
-                TT.filepatch = xopen_stdin(opt_i);
+                xmove_fd(xopen_stdin(opt_i), STDIN_FILENO);
         } else {
                 if (argv[0] && argv[1]) {
-                        TT.filepatch = xopen_stdin(argv[1]);
+                        xmove_fd(xopen_stdin(argv[1]), STDIN_FILENO);
                 }
         }
         if (argv[0]) {
@@ -468,7 +378,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
         for(;;) {
                 char *patchline;
 
-                patchline = get_line(TT.filepatch);
+                patchline = xmalloc_fgetline(stdin);
                 if (!patchline) break;
 
                 // Other versions of patch accept damaged patches,
@@ -483,8 +393,8 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                         if (*patchline==' ' || *patchline=='+' || *patchline=='-') {
                                 dlist_add(&TT.current_hunk, patchline);
 
-                                if (*patchline != '+') TT.oldlen--;
-                                if (*patchline != '-') TT.newlen--;
+                                if (*patchline != '+') oldlen--;
+                                if (*patchline != '-') newlen--;
 
                                 // Context line?
                                 if (*patchline==' ' && state==2) TT.context++;
@@ -492,7 +402,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
 
                                 // If we've consumed all expected hunk lines, apply the hunk.
 
-                                if (!TT.oldlen && !TT.newlen) state = apply_one_hunk();
+                                if (!oldlen && !newlen) state = apply_one_hunk();
                                 continue;
                         }
                         fail_hunk();
@@ -539,11 +449,14 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
 
                         // Read oldline[,oldlen] +newline[,newlen]
 
-                        TT.oldlen = TT.newlen = 1;
+                        TT.oldlen = oldlen = TT.newlen = newlen = 1;
                         TT.oldline = strtol(s, &s, 10);
-                        if (*s == ',') TT.oldlen=strtol(s+1, &s, 10);
+                        if (*s == ',') TT.oldlen = oldlen = strtol(s+1, &s, 10);
                         TT.newline = strtol(s+2, &s, 10);
-                        if (*s == ',') TT.newlen = strtol(s+1, &s, 10);
+                        if (*s == ',') TT.newlen = newlen = strtol(s+1, &s, 10);
+
+                        if (oldlen < 1 && newlen < 1)
+                                bb_error_msg_and_die("Really? %s", patchline);
 
                         TT.context = 0;
                         state = 2;
@@ -553,8 +466,8 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                 int oldsum, newsum, empty = 0;
                                 char *name;
 
-                                oldsum = TT.oldline + TT.oldlen;
-                                newsum = TT.newline + TT.newlen;
+                                oldsum = TT.oldline + oldlen;
+                                newsum = TT.newline + newlen;
 
                                 name = reverse ? oldname : newname;
 
@@ -588,13 +501,15 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                         }
                                 // If we've got a file to open, do so.
                                 } else if (!(option_mask32 & FLAG_PATHLEN) || i <= TT.prefix) {
+                                        struct stat statbuf;
+
                                         // If the old file was null, we're creating a new one.
                                         if (!strcmp(oldname, "/dev/null") || !oldsum) {
                                                 printf("creating %s\n", name);
                                                 s = strrchr(name, '/');
                                                 if (s) {
                                                         *s = 0;
-                                                        xmkpath(name, -1);
+                                                        bb_make_directory(name, -1, FILEUTILS_RECUR);
                                                         *s = '/';
                                                 }
                                                 TT.filein = xopen(name, O_CREAT|O_EXCL|O_RDWR);
@@ -602,7 +517,13 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                                 printf("patching file %s\n", name);
                                                 TT.filein = xopen(name, O_RDONLY);
                                         }
-                                        TT.fileout = copy_tempfile(TT.filein, name, &TT.tempname);
+
+                                        TT.tempname = xasprintf("%sXXXXXX", name);
+                                        TT.fileout = xmkstemp(TT.tempname);
+                                        // Set permissions of output file
+                                        fstat(TT.filein, &statbuf);
+                                        fchmod(TT.fileout, statbuf.st_mode);
+
                                         TT.linenum = 0;
                                         TT.hunknum = 0;
                                 }
@@ -620,7 +541,6 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
         finish_oldfile();
 
         if (ENABLE_FEATURE_CLEAN_UP) {
-                close(TT.filepatch);
                 free(oldname);
                 free(newname);
         }
diff --git a/editors/sed.c b/editors/sed.c
index 964d0405e..b91acfb7f 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -117,9 +117,9 @@ struct globals {
         char *add_cmd_line;
 
         struct pipeline {
-                char *buf;      /* Space to hold string */
-                int idx;        /* Space used */
-                int len;        /* Space allocated */
+                char *buf;  /* Space to hold string */
+                int idx;    /* Space used */
+                int len;    /* Space allocated */
         } pipeline;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
diff --git a/examples/depmod.pl b/examples/depmod.pl
index 8c6548d28..f324b121a 100755
--- a/examples/depmod.pl
+++ b/examples/depmod.pl
@@ -173,6 +173,9 @@ sub add_mod_deps
 
         $depth .= " ";
         warn "${depth}loading deps of module: $this_module\n" if $verbose;
+        if (length($depth) > 50) {
+                die "too much recursion (circular dependencies in modules?)";
+        }
 
         foreach my $md (keys %{$mod->{$this_module}}) {
                 add_mod_deps ($depth, $mod, $mod2, $module, $md);
diff --git a/examples/var_service/README b/examples/var_service/README
new file mode 100644
index 000000000..06817c8bc
--- /dev/null
+++ b/examples/var_service/README
@@ -0,0 +1,59 @@
+In many cases, network configuration makes it necessary to run several daemons:
+dhcp, zeroconf, ppp, openvpn and such. They need to be controlled,
+and in many cases you also want to babysit them. runsvdir is a good tool for this.
+examples/var_service directory provides a few examples. It is meant to be used
+this way: copy it somewhere (say, /var/service) and run something like
+
+env - PATH=... <other vars=...> runsvdir /var/service &
+
+from one of system startup scripts. (Google "man runsvdir" and "man runsv"
+for more info about these tools).
+
+Some existing examples:
+
+var_service/dhcp_if -
+controls a udhcpc instance which provides dhpc-assigned IP
+address on interface named "if". Copy/rename this directory as needed to run
+udhcpc on other interfaces (var_service/dhcp_if/run script uses _foo suffix
+of the parent directory as interface name). When IP address is obtained or lost,
+var_service/dhcp_if/dhcp_handler is run. It saves new config data to
+/var/run/service/fw/dhcp_if.ipconf and (re)starts /var/service/fw service.
+This example can be used as a template for other dynamic network link services
+(ppp/vpn/zcip).
+
+var_service/ifplugd_if -
+watches link status of interface if. Downs and ups /var/service/dhcp_if
+service accordingly. In effect, it allows you to unplug/plug-to-different-network
+and have your IP properly re-negotiated at once.
+
+var_service/dhcp_if_pinger -
+Uses var_service/dhcp_if's data (/var/service/dhcp_if/dhcp_if.out file)
+to determine router IP. Pings it. If ping fails, restarts /var/service/dhcp_if
+service. Basically, an example of watchdog service for networks
+which are not reliable and need babysitting.
+
+var_service/fw -
+A *one-shot* service which reconfigures network based on current known state
+of ALL interfaces. Uses conf/*.ipconf (static config) and /var/run/service/fw/*.ipconf
+(dynamic config from dhcp/ppp/vpn/etc) to determine what to do.
+One-shot-ness of this service means that it shuts itself off after single run.
+IOW: it is not a constantly running daemon sort of thing.
+It starts, it configures the network, it shuts down, all done
+(unlike infamous NetworkManagers which sit in RAM forever, doing hell knows what).
+
+However, any dhcp/ppp/vpn or similar service can restart it anytime
+when it senses the change in network configuration.
+This even works while fw service runs: if dhcp signals fw to (re)start
+while fw runs, fw will not stop after its execution, but will re-execute once,
+picking up dhcp's new configuration.
+This is achieved very simply by having
+# Make ourself one-shot
+sv o .
+at the very beginning of fw/run script, not at the end.
+Therefore, any "sv u /var/run/service/fw" command by any other
+script "undoes" o(ne-shot) command if fw still runs, thus
+runsv will rerun it; or start it in a normal way if fw is not running.
+
+System administrators are expected to edit fw/run script, since
+network configuration needs are likely to be very complex and different
+for non-trivial installations.
diff --git a/include/applets.src.h b/include/applets.src.h
index 879dbf760..261ef2333 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -16,6 +16,8 @@ s     - suid type:
         and is run by non-root (applet_main() will not be called at all)
         _BB_SUID_DROP: will drop suid prior to applet_main()
         _BB_SUID_MAYBE: neither of the above
+        (every instance of _BB_SUID_REQUIRE and _BB_SUID_MAYBE
+        needs to be justified in comment)
 */
 
 #if defined(PROTOTYPES)
@@ -56,6 +58,11 @@ s     - suid type:
 # define APPLET_NOFORK(name,main,l,s,name2)  { #name, #main, l, s, 1, 1 },
 #endif
 
+#if ENABLE_INSTALL_NO_USR
+# define _BB_DIR_USR_BIN _BB_DIR_BIN
+# define _BB_DIR_USR_SBIN _BB_DIR_SBIN
+#endif
+
 
 INSERT
 IF_TEST(APPLET_NOFORK([,  test, _BB_DIR_USR_BIN, _BB_SUID_DROP, test))
@@ -95,6 +102,7 @@ IF_COMM(APPLET(comm, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CP(APPLET_NOEXEC(cp, cp, _BB_DIR_BIN, _BB_SUID_DROP, cp))
 IF_CPIO(APPLET(cpio, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_CROND(APPLET(crond, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to change /var/spool/cron* files: */
 IF_CRONTAB(APPLET(crontab, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
 IF_CRYPTPW(APPLET(cryptpw, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CUT(APPLET_NOEXEC(cut, cut, _BB_DIR_USR_BIN, _BB_SUID_DROP, cut))
@@ -110,6 +118,7 @@ IF_DHCPRELAY(APPLET(dhcprelay, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_DIFF(APPLET(diff, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_DIRNAME(APPLET_NOFORK(dirname, dirname, _BB_DIR_USR_BIN, _BB_SUID_DROP, dirname))
 IF_DMESG(APPLET(dmesg, _BB_DIR_BIN, _BB_SUID_DROP))
+/* Why _BB_SUID_REQUIRE? */
 IF_DNSD(APPLET(dnsd, _BB_DIR_USR_SBIN, _BB_SUID_REQUIRE))
 IF_HOSTNAME(APPLET_ODDNAME(dnsdomainname, hostname, _BB_DIR_BIN, _BB_SUID_DROP, dnsdomainname))
 IF_DOS2UNIX(APPLET_NOEXEC(dos2unix, dos2unix, _BB_DIR_USR_BIN, _BB_SUID_DROP, dos2unix))
@@ -137,6 +146,7 @@ IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, _BB_DIR_BIN, _BB_SUID_DROP, fdfl
 IF_FDFORMAT(APPLET(fdformat, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_FDISK(APPLET(fdisk, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_FGCONSOLE(APPLET(fgconsole, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+/* Benefits from suid root: better access to /dev/BLOCKDEVs: */
 IF_FINDFS(APPLET(findfs, _BB_DIR_SBIN, _BB_SUID_MAYBE))
 IF_FLASH_ERASEALL(APPLET(flash_eraseall, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_lock))
@@ -188,7 +198,9 @@ IF_IP(APPLET(ip, _BB_DIR_BIN, _BB_SUID_DROP))
 #endif
 IF_IPADDR(APPLET(ipaddr, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP))
+/* Why _BB_SUID_REQUIRE? On Fedora, it isn't suid root */
 IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
+/* Why _BB_SUID_REQUIRE? On Fedora, it isn't suid root */
 IF_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
 IF_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_DROP))
@@ -209,6 +221,7 @@ IF_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to change uid and gid: */
 IF_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_REQUIRE))
 IF_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_DROP, logname))
 IF_LOGREAD(APPLET(logread, _BB_DIR_SBIN, _BB_SUID_DROP))
@@ -245,6 +258,10 @@ IF_CRYPTPW(APPLET_ODDNAME(mkpasswd, cryptpw, _BB_DIR_USR_BIN, _BB_SUID_DROP, mkp
 IF_MKSWAP(APPLET(mkswap, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MKTEMP(APPLET(mktemp, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_MORE(APPLET(more, _BB_DIR_BIN, _BB_SUID_DROP))
+/* On full-blown systems, requires suid for user mounts.
+ * But it's not unthinkable to have it available in non-suid flavor on some systems,
+ * for viewing mount table.
+ * Therefore we use _BB_SUID_MAYBE instead of _BB_SUID_REQUIRE: */
 IF_MOUNT(APPLET(mount, _BB_DIR_BIN, IF_DESKTOP(_BB_SUID_MAYBE) IF_NOT_DESKTOP(_BB_SUID_DROP)))
 IF_MOUNTPOINT(APPLET(mountpoint, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_DROP))
@@ -253,19 +270,16 @@ IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_NOHUP(APPLET(nohup, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_NSLOOKUP(APPLET(nslookup, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_NTPD(APPLET(ntpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_OD(APPLET(od, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 //IF_PARSE(APPLET(parse, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to change /etc/{passwd,shadow}: */
 IF_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
-IF_PATCH(APPLET(patch, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_PIDOF(APPLET(pidof, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_PING(APPLET(ping, _BB_DIR_BIN, _BB_SUID_MAYBE))
-IF_PING6(APPLET(ping6, _BB_DIR_BIN, _BB_SUID_MAYBE))
 IF_PIPE_PROGRESS(APPLET(pipe_progress, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_PIVOT_ROOT(APPLET(pivot_root, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_PKILL(APPLET_ODDNAME(pkill, pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP, pkill))
@@ -322,7 +336,7 @@ IF_SHA256SUM(APPLET_NOEXEC(sha256sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DR
 IF_SHA512SUM(APPLET_NOEXEC(sha512sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha512sum))
 IF_SHOWKEY(APPLET(showkey, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_SLATTACH(APPLET(slattach, _BB_DIR_SBIN, _BB_SUID_DROP))
-/* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells */
+/* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells: */
 IF_SLEEP(APPLET(sleep, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, softlimit))
 IF_SORT(APPLET_NOEXEC(sort, sort, _BB_DIR_USR_BIN, _BB_SUID_DROP, sort))
@@ -331,6 +345,7 @@ IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, _BB_DI
 IF_STAT(APPLET(stat, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_STRINGS(APPLET(strings, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_STTY(APPLET(stty, _BB_DIR_BIN, _BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to change uid and gid: */
 IF_SU(APPLET(su, _BB_DIR_BIN, _BB_SUID_REQUIRE))
 IF_SULOGIN(APPLET(sulogin, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_SUM(APPLET(sum, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -359,8 +374,8 @@ IF_TFTPD(APPLET(tftpd, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_TIME(APPLET(time, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_TIMEOUT(APPLET(timeout, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_DROP, touch))
 IF_TR(APPLET(tr, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore _BB_SUID_MAYBE: */
 IF_TRACEROUTE(APPLET(traceroute, _BB_DIR_USR_BIN, _BB_SUID_MAYBE))
 IF_TRACEROUTE6(APPLET(traceroute6, _BB_DIR_USR_BIN, _BB_SUID_MAYBE))
 IF_TRUE(APPLET_NOFORK(true, true, _BB_DIR_BIN, _BB_SUID_DROP, true))
@@ -387,8 +402,10 @@ IF_UUDECODE(APPLET(uudecode, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_UUENCODE(APPLET(uuencode, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_VCONFIG(APPLET(vconfig, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_VI(APPLET(vi, _BB_DIR_BIN, _BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to change uid and gid: */
 IF_VLOCK(APPLET(vlock, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
 IF_VOLNAME(APPLET(volname, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to write to /dev/TTY: */
 IF_WALL(APPLET(wall, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
 IF_WATCH(APPLET(watch, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_WATCHDOG(APPLET(watchdog, _BB_DIR_SBIN, _BB_SUID_DROP))
diff --git a/include/unarchive.h b/include/archive.h
index b55af6d9d..ba6d323e0 100644
--- a/include/unarchive.h
+++ b/include/archive.h
@@ -193,7 +193,9 @@ extern const llist_t *find_list_entry2(const llist_t *list, const char *filename
 
 /* A bit of bunzip2 internals are exposed for compressed help support: */
 typedef struct bunzip_data bunzip_data;
-int start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *inbuf, int len) FAST_FUNC;
+int start_bunzip(bunzip_data **bdp, int in_fd, const void *inbuf, int len) FAST_FUNC;
+/* NB: read_bunzip returns < 0 on error, or the number of *unfilled* bytes
+ * in outbuf. IOW: on EOF returns len ("all bytes are not filled"), not 0: */
 int read_bunzip(bunzip_data *bd, char *outbuf, int len) FAST_FUNC;
 void dealloc_bunzip(bunzip_data *bd) FAST_FUNC;
 
diff --git a/include/grp_.h b/include/grp_.h
index 7a95f88a6..5c24d558a 100644
--- a/include/grp_.h
+++ b/include/grp_.h
@@ -18,7 +18,7 @@
    02111-1307 USA.
  */
 /*
- *      POSIX Standard: 9.2.1 Group Database Access     <grp.h>
+ * POSIX Standard: 9.2.1 Group Database Access  <grp.h>
  */
 #ifndef BB_GRP_H
 #define BB_GRP_H 1
diff --git a/include/libbb.h b/include/libbb.h
index 715f1e102..fdd920f3c 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1440,6 +1440,7 @@ typedef struct procps_status_t {
         char *argv0;
         char *exe;
         IF_SELINUX(char *context;)
+        IF_FEATURE_SHOW_THREADS(unsigned main_thread_pid;)
         /* Everything below must contain no ptrs to malloc'ed data:
          * it is memset(0) for each process in procps_scan() */
         unsigned long vsz, rss; /* we round it to kbytes */
diff --git a/archival/liblzo_interface.h b/include/liblzo_interface.h
index 9a84c0b6b..9a84c0b6b 100644
--- a/archival/liblzo_interface.h
+++ b/include/liblzo_interface.h
diff --git a/include/platform.h b/include/platform.h
index 04fee8d03..5f49deb41 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -165,7 +165,7 @@
 # include <sex.h>
 #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
    || defined(__APPLE__)
-# include <sys/resource.h>      /* rlimit */
+# include <sys/resource.h>  /* rlimit */
 # include <machine/endian.h>
 # define bswap_64 __bswap64
 # define bswap_32 __bswap32
diff --git a/include/pwd_.h b/include/pwd_.h
index aa63ac940..e40b71dab 100644
--- a/include/pwd_.h
+++ b/include/pwd_.h
@@ -18,7 +18,7 @@
    02111-1307 USA.  */
 
 /*
- *      POSIX Standard: 9.2.2 User Database Access      <pwd.h>
+ * POSIX Standard: 9.2.2 User Database Access   <pwd.h>
  */
 
 #ifndef BB_PWD_H
diff --git a/include/rtc_.h b/include/rtc_.h
index bd322c940..750fc20ec 100644
--- a/include/rtc_.h
+++ b/include/rtc_.h
@@ -35,9 +35,9 @@ struct linux_rtc_time {
 };
 
 struct linux_rtc_wkalrm {
-        unsigned char enabled;  /* 0 = alarm disabled, 1 = alarm enabled */
+        unsigned char enabled;  /* 0 = alarm disabled, 1 = alarm enabled */
         unsigned char pending;  /* 0 = alarm not pending, 1 = alarm pending */
-        struct linux_rtc_time time;     /* time the alarm is set to */
+        struct linux_rtc_time time;  /* time the alarm is set to */
 };
 
 /*
diff --git a/include/usage.src.h b/include/usage.src.h
index 6973c93ef..ea0e6a452 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -592,35 +592,6 @@ INSERT
      "\n        -i      Prompt before overwrite" \
      "\n        -l,-s   Create (sym)links" \
 
-#define cpio_trivial_usage \
-       "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]") \
-       " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]")
-#define cpio_full_usage "\n\n" \
-       "Extract or list files from a cpio archive" \
-        IF_FEATURE_CPIO_O(", or" \
-     "\ncreate an archive" IF_FEATURE_CPIO_P(" (-o) or copy files (-p)") \
-                " using file list on stdin" \
-        ) \
-     "\n" \
-     "\nMain operation mode:" \
-     "\n        -t      List" \
-     "\n        -i      Extract" \
-        IF_FEATURE_CPIO_O( \
-     "\n        -o      Create (requires -H newc)" \
-        ) \
-        IF_FEATURE_CPIO_P( \
-     "\n        -p DIR  Copy files to DIR" \
-        ) \
-     "\nOptions:" \
-     "\n        -d      Make leading directories" \
-     "\n        -m      Preserve mtime" \
-     "\n        -v      Verbose" \
-     "\n        -u      Overwrite" \
-     "\n        -F FILE Input (-t,-i,-p) or output (-o) file" \
-        IF_FEATURE_CPIO_O( \
-     "\n        -H newc Archive format" \
-        ) \
-
 #define crond_trivial_usage \
        "-fbS -l N " IF_FEATURE_CROND_D("-d N ") "-L LOGFILE -c DIR"
 #define crond_full_usage "\n\n" \
@@ -1577,8 +1548,8 @@ INSERT
      "\n        -c              One-byte character display" \
      "\n        -C              Canonical hex+ASCII, 16 bytes per line" \
      "\n        -d              Two-byte decimal display" \
-     "\n        -e FORMAT STRING" \
-     "\n        -f FORMAT FILE" \
+     "\n        -e FORMAT_STRING" \
+     "\n        -f FORMAT_FILE" \
      "\n        -n LENGTH       Interpret only LENGTH bytes of input" \
      "\n        -o              Two-byte octal display" \
      "\n        -s OFFSET       Skip OFFSET bytes" \
@@ -2044,9 +2015,6 @@ INSERT
 #define linux64_trivial_usage NOUSAGE_STR
 #define linux64_full_usage ""
 
-#define linuxrc_trivial_usage NOUSAGE_STR
-#define linuxrc_full_usage ""
-
 #define setarch_trivial_usage \
        "personality PROG ARGS"
 #define setarch_full_usage "\n\n" \
@@ -2176,67 +2144,6 @@ INSERT
      "\n        -h      Print banner page too" \
      "\n        -V      Verbose" \
 
-#define ls_trivial_usage \
-       "[-1Aa" IF_FEATURE_LS_TIMESTAMPS("c") "Cd" \
-        IF_FEATURE_LS_TIMESTAMPS("e") IF_FEATURE_LS_FILETYPES("F") "iln" \
-        IF_FEATURE_LS_FILETYPES("p") IF_FEATURE_LS_FOLLOWLINKS("L") \
-        IF_FEATURE_LS_RECURSIVE("R") IF_FEATURE_LS_SORTFILES("rS") "s" \
-        IF_FEATURE_AUTOWIDTH("T") IF_FEATURE_LS_TIMESTAMPS("tu") \
-        IF_FEATURE_LS_SORTFILES("v") IF_FEATURE_AUTOWIDTH("w") "x" \
-        IF_FEATURE_LS_SORTFILES("X") IF_FEATURE_HUMAN_READABLE("h") "k" \
-        IF_SELINUX("K") "] [FILE]..."
-#define ls_full_usage "\n\n" \
-       "List directory contents\n" \
-     "\nOptions:" \
-     "\n        -1      List in a single column" \
-     "\n        -A      Don't list . and .." \
-     "\n        -a      Don't hide entries starting with ." \
-     "\n        -C      List by columns" \
-        IF_FEATURE_LS_TIMESTAMPS( \
-     "\n        -c      With -l: sort by ctime") \
-        IF_FEATURE_LS_COLOR( \
-     "\n        --color[={always,never,auto}]   Control coloring") \
-     "\n        -d      List directory entries instead of contents" \
-        IF_FEATURE_LS_TIMESTAMPS( \
-     "\n        -e      List full date and time") \
-        IF_FEATURE_LS_FILETYPES( \
-     "\n        -F      Append indicator (one of */=@|) to entries") \
-     "\n        -i      List inode numbers" \
-     "\n        -l      Long listing format" \
-     "\n        -n      List numeric UIDs and GIDs instead of names" \
-        IF_FEATURE_LS_FILETYPES( \
-     "\n        -p      Append indicator (one of /=@|) to entries") \
-        IF_FEATURE_LS_FOLLOWLINKS( \
-     "\n        -L      List entries pointed to by symlinks") \
-        IF_FEATURE_LS_RECURSIVE( \
-     "\n        -R      Recurse") \
-        IF_FEATURE_LS_SORTFILES( \
-     "\n        -r      Sort in reverse order") \
-        IF_FEATURE_LS_SORTFILES( \
-     "\n        -S      Sort by file size") \
-     "\n        -s      List the size of each file, in blocks" \
-        IF_FEATURE_AUTOWIDTH( \
-     "\n        -T N    Assume tabstop every N columns") \
-        IF_FEATURE_LS_TIMESTAMPS( \
-     "\n        -t      With -l: sort by modification time") \
-        IF_FEATURE_LS_TIMESTAMPS( \
-     "\n        -u      With -l: sort by access time") \
-        IF_FEATURE_LS_SORTFILES( \
-     "\n        -v      Sort by version") \
-        IF_FEATURE_AUTOWIDTH( \
-     "\n        -w N    Assume the terminal is N columns wide") \
-     "\n        -x      List by lines" \
-        IF_FEATURE_LS_SORTFILES( \
-     "\n        -X      Sort by extension") \
-        IF_FEATURE_HUMAN_READABLE( \
-     "\n        -h      List sizes in human readable format (1K 243M 2G)") \
-        IF_SELINUX( \
-     "\n        -k      List security context") \
-        IF_SELINUX( \
-     "\n        -K      List security context in long format") \
-        IF_SELINUX( \
-     "\n        -Z      List security context and permission") \
-
 #define lsattr_trivial_usage \
        "[-Radlv] [FILE]..."
 #define lsattr_full_usage "\n\n" \
@@ -2709,31 +2616,6 @@ INSERT
        " or\n" \
        "$ nameif -c /etc/my_mactab_file\n" \
 
-#define nmeter_trivial_usage \
-       "format_string"
-#define nmeter_full_usage "\n\n" \
-       "Monitor system in real time\n\n" \
-       "Format specifiers:\n" \
-       " %Nc or %[cN]   Monitor CPU. N - bar size, default 10\n" \
-       "                (displays: S:system U:user N:niced D:iowait I:irq i:softirq)\n" \
-       " %[niface]      Monitor network interface 'iface'\n" \
-       " %m             Monitor allocated memory\n" \
-       " %[mf]          Monitor free memory\n" \
-       " %[mt]          Monitor total memory\n" \
-       " %s             Monitor allocated swap\n" \
-       " %f             Monitor number of used file descriptors\n" \
-       " %Ni            Monitor total/specific IRQ rate\n" \
-       " %x             Monitor context switch rate\n" \
-       " %p             Monitor forks\n" \
-       " %[pn]          Monitor # of processes\n" \
-       " %b             Monitor block io\n" \
-       " %Nt            Show time (with N decimal points)\n" \
-       " %Nd            Milliseconds between updates (default:1000)\n" \
-       " %r             Print <cr> instead of <lf> at EOL" \
-
-#define nmeter_example_usage \
-       "nmeter '%250d%t %20c int %i bio %b mem %m forks%p'"
-
 #define nohup_trivial_usage \
        "PROG ARGS"
 #define nohup_full_usage "\n\n" \
@@ -2820,29 +2702,6 @@ INSERT
      "\n        -m      Use MD5 encryption instead of DES" \
         )
 
-#define patch_trivial_usage \
-       "[OPTIONS] [ORIGFILE [PATCHFILE]]"
-#define patch_full_usage "\n\n" \
-        IF_LONG_OPTS( \
-       "        -p,--strip N            Strip N leading components from file names" \
-     "\n        -i,--input DIFF         Read DIFF instead of stdin" \
-     "\n        -R,--reverse            Reverse patch" \
-     "\n        -N,--forward            Ignore already applied patches" \
-     "\n        --dry-run               Don't actually change files" \
-     "\n        -E,--remove-empty-files Remove output files if they become empty" \
-        ) \
-        IF_NOT_LONG_OPTS( \
-       "        -p N    Strip N leading components from file names" \
-     "\n        -i DIFF Read DIFF instead of stdin" \
-     "\n        -R      Reverse patch" \
-     "\n        -N      Ignore already applied patches" \
-     "\n        -E      Remove output files if they become empty" \
-        )
-
-#define patch_example_usage \
-       "$ patch -p1 < example.diff\n" \
-       "$ patch -p0 -i example.diff"
-
 #define pgrep_trivial_usage \
        "[-flnovx] [-s SID|-P PPID|PATTERN]"
 #define pgrep_full_usage "\n\n" \
@@ -2885,61 +2744,6 @@ INSERT
         IF_FEATURE_PIDOF_OMIT( \
        "$ pidof /bin/sh -o %PPID\n20351 5950")
 
-#if !ENABLE_FEATURE_FANCY_PING
-#define ping_trivial_usage \
-       "host"
-#define ping_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts"
-#define ping6_trivial_usage \
-       "host"
-#define ping6_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts"
-#else
-#define ping_trivial_usage \
-       "[OPTIONS] HOST"
-#define ping_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts\n" \
-     "\nOptions:" \
-     "\n        -4,-6           Force IP or IPv6 name resolution" \
-     "\n        -c CNT          Send only CNT pings" \
-     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)" \
-     "\n        -I IFACE/IP     Use interface or IP address as source" \
-     "\n        -W SEC          Seconds to wait for the first response (default:10)" \
-     "\n                        (after all -c CNT packets are sent)" \
-     "\n        -w SEC          Seconds until ping exits (default:infinite)" \
-     "\n                        (can exit earlier with -c CNT)" \
-     "\n        -q              Quiet, only displays output at start" \
-     "\n                        and when finished" \
-
-#define ping6_trivial_usage \
-       "[OPTIONS] HOST"
-#define ping6_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts\n" \
-     "\nOptions:" \
-     "\n        -c CNT          Send only CNT pings" \
-     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)" \
-     "\n        -I IFACE/IP     Use interface or IP address as source" \
-     "\n        -q              Quiet, only displays output at start" \
-     "\n                        and when finished" \
-
-#endif
-#define ping_example_usage \
-       "$ ping localhost\n" \
-       "PING slag (127.0.0.1): 56 data bytes\n" \
-       "64 bytes from 127.0.0.1: icmp_seq=0 ttl=255 time=20.1 ms\n" \
-       "\n" \
-       "--- debian ping statistics ---\n" \
-       "1 packets transmitted, 1 packets received, 0% packet loss\n" \
-       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
-#define ping6_example_usage \
-       "$ ping6 ip6-localhost\n" \
-       "PING ip6-localhost (::1): 56 data bytes\n" \
-       "64 bytes from ::1: icmp6_seq=0 ttl=64 time=20.1 ms\n" \
-       "\n" \
-       "--- ip6-localhost ping statistics ---\n" \
-       "1 packets transmitted, 1 packets received, 0% packet loss\n" \
-       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
-
 #define pipe_progress_trivial_usage NOUSAGE_STR
 #define pipe_progress_full_usage ""
 
@@ -3378,36 +3182,6 @@ INSERT
 #define selinuxenabled_trivial_usage NOUSAGE_STR
 #define selinuxenabled_full_usage ""
 
-#define sendmail_trivial_usage \
-       "[OPTIONS] [RECIPIENT_EMAIL]..."
-#define sendmail_full_usage "\n\n" \
-       "Read email from stdin and send it\n" \
-     "\nStandard options:" \
-     "\n        -t              Read additional recipients from message body" \
-     "\n        -f sender       Sender (required)" \
-     "\n        -o options      Various options. -oi implied, others are ignored" \
-     "\n        -i              -oi synonym. implied and ignored" \
-     "\n" \
-     "\nBusybox specific options:" \
-     "\n        -w seconds      Network timeout" \
-     "\n        -H 'PROG ARGS'  Run connection helper" \
-     "\n                        Examples:" \
-     "\n                        -H 'exec openssl s_client -quiet -tls1 -starttls smtp" \
-     "\n                                -connect smtp.gmail.com:25' <email.txt" \
-     "\n                                [4<username_and_passwd.txt | -au<username> -ap<password>]" \
-     "\n                        -H 'exec openssl s_client -quiet -tls1" \
-     "\n                                -connect smtp.gmail.com:465' <email.txt" \
-     "\n                                [4<username_and_passwd.txt | -au<username> -ap<password>]" \
-     "\n        -S server[:port] Server" \
-     "\n        -au<username>   Username for AUTH LOGIN" \
-     "\n        -ap<password>   Password for AUTH LOGIN" \
-     "\n        -am<method>     Authentication method. Ignored. LOGIN is implied" \
-     "\n" \
-     "\nOther options are silently ignored; -oi -t is implied" \
-        IF_MAKEMIME( \
-     "\nUse makemime applet to create message with attachments" \
-        )
-
 #define seq_trivial_usage \
        "[-w] [-s SEP] [FIRST [INC]] LAST"
 #define seq_full_usage "\n\n" \
@@ -3750,15 +3524,6 @@ INSERT
      "\n        -g              Print in stty-readable form" \
      "\n        [SETTING]       See manpage" \
 
-#define su_trivial_usage \
-       "[OPTIONS] [-] [USERNAME]"
-#define su_full_usage "\n\n" \
-       "Change user id or become root\n" \
-     "\nOptions:" \
-     "\n        -p,-m   Preserve environment" \
-     "\n        -c CMD  Command to pass to 'sh -c'" \
-     "\n        -s SH   Shell to use instead of default shell" \
-
 #define sulogin_trivial_usage \
        "[-t N] [TTY]"
 #define sulogin_full_usage "\n\n" \
@@ -4086,22 +3851,6 @@ INSERT
        "and display a screenful of them." \
 //TODO: add options and keyboard commands
 
-#define touch_trivial_usage \
-       "[-c] [-d DATE] [-r FILE] FILE [FILE]..."
-#define touch_full_usage "\n\n" \
-       "Update the last-modified date on the given FILE[s]\n" \
-     "\nOptions:" \
-     "\n        -c      Don't create files" \
-     "\n        -d DT   Date/time to use" \
-     "\n        -r FILE Use FILE's date/time" \
-
-#define touch_example_usage \
-       "$ ls -l /tmp/foo\n" \
-       "/bin/ls: /tmp/foo: No such file or directory\n" \
-       "$ touch /tmp/foo\n" \
-       "$ ls -l /tmp/foo\n" \
-       "-rw-rw-r--    1 andersen andersen        0 Apr 15 01:11 /tmp/foo\n"
-
 #define tr_trivial_usage \
        "[-cds] STRING1 [STRING2]"
 #define tr_full_usage "\n\n" \
diff --git a/include/volume_id.h b/include/volume_id.h
index 77e874d40..4a78cd1e4 100644
--- a/include/volume_id.h
+++ b/include/volume_id.h
@@ -28,3 +28,4 @@ void display_uuid_cache(void);
  *    *fsname is replaced if device with such UUID or LABEL is found
  */
 int resolve_mount_spec(char **fsname);
+int add_to_uuid_cache(const char *device);
diff --git a/init/bootchartd.c b/init/bootchartd.c
index 5a1b3e8e8..ac3f261c8 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -441,8 +441,7 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv)
                 pid_t pid = xvfork();
                 if (pid == 0) { /* child */
                         argv += 2;
-                        execvp(argv[0], argv);
-                        bb_perror_msg_and_die("can't execute '%s'", argv[0]);
+                        BB_EXECVP_or_die(argv);
                 }
                 /* parent */
                 waitpid(pid, NULL, 0);
diff --git a/init/init.c b/init/init.c
index a7bbd5e64..a2cc3b5f5 100644
--- a/init/init.c
+++ b/init/init.c
@@ -108,138 +108,6 @@
 //config:         Note that on Linux, init attempts to detect serial terminal and
 //config:         sets TERM to "vt102" if one is found.
 
-//usage:#define init_trivial_usage
-//usage:       ""
-//usage:#define init_full_usage "\n\n"
-//usage:       "Init is the parent of all processes"
-//usage:
-//usage:#define init_notes_usage
-//usage:        "This version of init is designed to be run only by the kernel.\n"
-//usage:        "\n"
-//usage:        "BusyBox init doesn't support multiple runlevels. The runlevels field of\n"
-//usage:        "the /etc/inittab file is completely ignored by BusyBox init. If you want\n"
-//usage:        "runlevels, use sysvinit.\n"
-//usage:        "\n"
-//usage:        "BusyBox init works just fine without an inittab. If no inittab is found,\n"
-//usage:        "it has the following default behavior:\n"
-//usage:        "\n"
-//usage:        "       ::sysinit:/etc/init.d/rcS\n"
-//usage:        "       ::askfirst:/bin/sh\n"
-//usage:        "       ::ctrlaltdel:/sbin/reboot\n"
-//usage:        "       ::shutdown:/sbin/swapoff -a\n"
-//usage:        "       ::shutdown:/bin/umount -a -r\n"
-//usage:        "       ::restart:/sbin/init\n"
-//usage:        "\n"
-//usage:        "if it detects that /dev/console is _not_ a serial console, it will also run:\n"
-//usage:        "\n"
-//usage:        "       tty2::askfirst:/bin/sh\n"
-//usage:        "       tty3::askfirst:/bin/sh\n"
-//usage:        "       tty4::askfirst:/bin/sh\n"
-//usage:        "\n"
-//usage:        "If you choose to use an /etc/inittab file, the inittab entry format is as follows:\n"
-//usage:        "\n"
-//usage:        "       <id>:<runlevels>:<action>:<process>\n"
-//usage:        "\n"
-//usage:        "       <id>:\n"
-//usage:        "\n"
-//usage:        "               WARNING: This field has a non-traditional meaning for BusyBox init!\n"
-//usage:        "               The id field is used by BusyBox init to specify the controlling tty for\n"
-//usage:        "               the specified process to run on. The contents of this field are\n"
-//usage:        "               appended to \"/dev/\" and used as-is. There is no need for this field to\n"
-//usage:        "               be unique, although if it isn't you may have strange results. If this\n"
-//usage:        "               field is left blank, the controlling tty is set to the console. Also\n"
-//usage:        "               note that if BusyBox detects that a serial console is in use, then only\n"
-//usage:        "               entries whose controlling tty is either the serial console or /dev/null\n"
-//usage:        "               will be run. BusyBox init does nothing with utmp. We don't need no\n"
-//usage:        "               stinkin' utmp.\n"
-//usage:        "\n"
-//usage:        "       <runlevels>:\n"
-//usage:        "\n"
-//usage:        "               The runlevels field is completely ignored.\n"
-//usage:        "\n"
-//usage:        "       <action>:\n"
-//usage:        "\n"
-//usage:        "               Valid actions include: sysinit, respawn, askfirst, wait,\n"
-//usage:        "               once, restart, ctrlaltdel, and shutdown.\n"
-//usage:        "\n"
-//usage:        "               The available actions can be classified into two groups: actions\n"
-//usage:        "               that are run only once, and actions that are re-run when the specified\n"
-//usage:        "               process exits.\n"
-//usage:        "\n"
-//usage:        "               Run only-once actions:\n"
-//usage:        "\n"
-//usage:        "                       'sysinit' is the first item run on boot. init waits until all\n"
-//usage:        "                       sysinit actions are completed before continuing. Following the\n"
-//usage:        "                       completion of all sysinit actions, all 'wait' actions are run.\n"
-//usage:        "                       'wait' actions, like 'sysinit' actions, cause init to wait until\n"
-//usage:        "                       the specified task completes. 'once' actions are asynchronous,\n"
-//usage:        "                       therefore, init does not wait for them to complete. 'restart' is\n"
-//usage:        "                       the action taken to restart the init process. By default this should\n"
-//usage:        "                       simply run /sbin/init, but can be a script which runs pivot_root or it\n"
-//usage:        "                       can do all sorts of other interesting things. The 'ctrlaltdel' init\n"
-//usage:        "                       actions are run when the system detects that someone on the system\n"
-//usage:        "                       console has pressed the CTRL-ALT-DEL key combination. Typically one\n"
-//usage:        "                       wants to run 'reboot' at this point to cause the system to reboot.\n"
-//usage:        "                       Finally the 'shutdown' action specifies the actions to taken when\n"
-//usage:        "                       init is told to reboot. Unmounting filesystems and disabling swap\n"
-//usage:        "                       is a very good here.\n"
-//usage:        "\n"
-//usage:        "               Run repeatedly actions:\n"
-//usage:        "\n"
-//usage:        "                       'respawn' actions are run after the 'once' actions. When a process\n"
-//usage:        "                       started with a 'respawn' action exits, init automatically restarts\n"
-//usage:        "                       it. Unlike sysvinit, BusyBox init does not stop processes from\n"
-//usage:        "                       respawning out of control. The 'askfirst' actions acts just like\n"
-//usage:        "                       respawn, except that before running the specified process it\n"
-//usage:        "                       displays the line \"Please press Enter to activate this console.\"\n"
-//usage:        "                       and then waits for the user to press enter before starting the\n"
-//usage:        "                       specified process.\n"
-//usage:        "\n"
-//usage:        "               Unrecognized actions (like initdefault) will cause init to emit an\n"
-//usage:        "               error message, and then go along with its business. All actions are\n"
-//usage:        "               run in the order they appear in /etc/inittab.\n"
-//usage:        "\n"
-//usage:        "       <process>:\n"
-//usage:        "\n"
-//usage:        "               Specifies the process to be executed and its command line.\n"
-//usage:        "\n"
-//usage:        "Example /etc/inittab file:\n"
-//usage:        "\n"
-//usage:        "       # This is run first except when booting in single-user mode\n"
-//usage:        "       #\n"
-//usage:        "       ::sysinit:/etc/init.d/rcS\n"
-//usage:        "       \n"
-//usage:        "       # /bin/sh invocations on selected ttys\n"
-//usage:        "       #\n"
-//usage:        "       # Start an \"askfirst\" shell on the console (whatever that may be)\n"
-//usage:        "       ::askfirst:-/bin/sh\n"
-//usage:        "       # Start an \"askfirst\" shell on /dev/tty2-4\n"
-//usage:        "       tty2::askfirst:-/bin/sh\n"
-//usage:        "       tty3::askfirst:-/bin/sh\n"
-//usage:        "       tty4::askfirst:-/bin/sh\n"
-//usage:        "       \n"
-//usage:        "       # /sbin/getty invocations for selected ttys\n"
-//usage:        "       #\n"
-//usage:        "       tty4::respawn:/sbin/getty 38400 tty4\n"
-//usage:        "       tty5::respawn:/sbin/getty 38400 tty5\n"
-//usage:        "       \n"
-//usage:        "       \n"
-//usage:        "       # Example of how to put a getty on a serial line (for a terminal)\n"
-//usage:        "       #\n"
-//usage:        "       #::respawn:/sbin/getty -L ttyS0 9600 vt100\n"
-//usage:        "       #::respawn:/sbin/getty -L ttyS1 9600 vt100\n"
-//usage:        "       #\n"
-//usage:        "       # Example how to put a getty on a modem line\n"
-//usage:        "       #::respawn:/sbin/getty 57600 ttyS2\n"
-//usage:        "       \n"
-//usage:        "       # Stuff to do when restarting the init process\n"
-//usage:        "       ::restart:/sbin/init\n"
-//usage:        "       \n"
-//usage:        "       # Stuff to do before rebooting\n"
-//usage:        "       ::ctrlaltdel:/sbin/reboot\n"
-//usage:        "       ::shutdown:/bin/umount -a -r\n"
-//usage:        "       ::shutdown:/sbin/swapoff -a\n"
-
 #include "libbb.h"
 #include <syslog.h>
 #include <paths.h>
@@ -533,20 +401,22 @@ static void init_exec(const char *command)
         char buf[COMMAND_SIZE + 6];  /* COMMAND_SIZE+strlen("exec ")+1 */
         int dash = (command[0] == '-' /* maybe? && command[1] == '/' */);
 
+        command += dash;
+
         /* See if any special /bin/sh requiring characters are present */
         if (strpbrk(command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) {
-                strcpy(buf, "exec ");
-                strcpy(buf + 5, command + dash); /* excluding "-" */
+                sprintf(buf, "exec %s", command); /* excluding "-" */
                 /* NB: LIBBB_DEFAULT_LOGIN_SHELL define has leading dash */
                 cmd[0] = (char*)(LIBBB_DEFAULT_LOGIN_SHELL + !dash);
                 cmd[1] = (char*)"-c";
                 cmd[2] = buf;
                 cmd[3] = NULL;
+                command = LIBBB_DEFAULT_LOGIN_SHELL + 1;
         } else {
                 /* Convert command (char*) into cmd (char**, one word per string) */
                 char *word, *next;
                 int i = 0;
-                next = strcpy(buf, command); /* including "-" */
+                next = strcpy(buf, command - dash); /* command including "-" */
                 while ((word = strsep(&next, " \t")) != NULL) {
                         if (*word != '\0') { /* not two spaces/tabs together? */
                                 cmd[i] = word;
@@ -557,14 +427,14 @@ static void init_exec(const char *command)
         }
         /* If we saw leading "-", it is interactive shell.
          * Try harder to give it a controlling tty.
-         * And skip "-" in actual exec call. */
-        if (dash) {
+         */
+        if (ENABLE_FEATURE_INIT_SCTTY && dash) {
                 /* _Attempt_ to make stdin a controlling tty. */
-                if (ENABLE_FEATURE_INIT_SCTTY)
-                        ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/);
+                ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/);
         }
-        BB_EXECVP(cmd[0] + dash, cmd);
-        message(L_LOG | L_CONSOLE, "can't run '%s': %s", cmd[0], strerror(errno));
+        /* Here command never contains the dash, cmd[0] might */
+        BB_EXECVP(command, cmd);
+        message(L_LOG | L_CONSOLE, "can't run '%s': %s", command, strerror(errno));
         /* returns if execvp fails */
 }
 
@@ -1095,9 +965,9 @@ int init_main(int argc UNUSED_PARAM, char **argv)
         if (!DEBUG_INIT) {
                 /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
                 if (getpid() != 1
-                 && (!ENABLE_FEATURE_INITRD || !strstr(applet_name, "linuxrc"))
+                 && (!ENABLE_FEATURE_INITRD || applet_name[0] != 'l') /* not linuxrc? */
                 ) {
-                        bb_show_usage();
+                        bb_error_msg_and_die("must be run as PID 1");
                 }
 #ifdef RB_DISABLE_CAD
                 /* Turn off rebooting via CTL-ALT-DEL - we get a
@@ -1286,3 +1156,138 @@ int init_main(int argc UNUSED_PARAM, char **argv)
                 }
         } /* while (1) */
 }
+
+//usage:#define linuxrc_trivial_usage NOUSAGE_STR
+//usage:#define linuxrc_full_usage ""
+
+//usage:#define init_trivial_usage
+//usage:       ""
+//usage:#define init_full_usage "\n\n"
+//usage:       "Init is the parent of all processes"
+//usage:
+//usage:#define init_notes_usage
+//usage:        "This version of init is designed to be run only by the kernel.\n"
+//usage:        "\n"
+//usage:        "BusyBox init doesn't support multiple runlevels. The runlevels field of\n"
+//usage:        "the /etc/inittab file is completely ignored by BusyBox init. If you want\n"
+//usage:        "runlevels, use sysvinit.\n"
+//usage:        "\n"
+//usage:        "BusyBox init works just fine without an inittab. If no inittab is found,\n"
+//usage:        "it has the following default behavior:\n"
+//usage:        "\n"
+//usage:        "       ::sysinit:/etc/init.d/rcS\n"
+//usage:        "       ::askfirst:/bin/sh\n"
+//usage:        "       ::ctrlaltdel:/sbin/reboot\n"
+//usage:        "       ::shutdown:/sbin/swapoff -a\n"
+//usage:        "       ::shutdown:/bin/umount -a -r\n"
+//usage:        "       ::restart:/sbin/init\n"
+//usage:        "\n"
+//usage:        "if it detects that /dev/console is _not_ a serial console, it will also run:\n"
+//usage:        "\n"
+//usage:        "       tty2::askfirst:/bin/sh\n"
+//usage:        "       tty3::askfirst:/bin/sh\n"
+//usage:        "       tty4::askfirst:/bin/sh\n"
+//usage:        "\n"
+//usage:        "If you choose to use an /etc/inittab file, the inittab entry format is as follows:\n"
+//usage:        "\n"
+//usage:        "       <id>:<runlevels>:<action>:<process>\n"
+//usage:        "\n"
+//usage:        "       <id>:\n"
+//usage:        "\n"
+//usage:        "               WARNING: This field has a non-traditional meaning for BusyBox init!\n"
+//usage:        "               The id field is used by BusyBox init to specify the controlling tty for\n"
+//usage:        "               the specified process to run on. The contents of this field are\n"
+//usage:        "               appended to \"/dev/\" and used as-is. There is no need for this field to\n"
+//usage:        "               be unique, although if it isn't you may have strange results. If this\n"
+//usage:        "               field is left blank, the controlling tty is set to the console. Also\n"
+//usage:        "               note that if BusyBox detects that a serial console is in use, then only\n"
+//usage:        "               entries whose controlling tty is either the serial console or /dev/null\n"
+//usage:        "               will be run. BusyBox init does nothing with utmp. We don't need no\n"
+//usage:        "               stinkin' utmp.\n"
+//usage:        "\n"
+//usage:        "       <runlevels>:\n"
+//usage:        "\n"
+//usage:        "               The runlevels field is completely ignored.\n"
+//usage:        "\n"
+//usage:        "       <action>:\n"
+//usage:        "\n"
+//usage:        "               Valid actions include: sysinit, respawn, askfirst, wait,\n"
+//usage:        "               once, restart, ctrlaltdel, and shutdown.\n"
+//usage:        "\n"
+//usage:        "               The available actions can be classified into two groups: actions\n"
+//usage:        "               that are run only once, and actions that are re-run when the specified\n"
+//usage:        "               process exits.\n"
+//usage:        "\n"
+//usage:        "               Run only-once actions:\n"
+//usage:        "\n"
+//usage:        "                       'sysinit' is the first item run on boot. init waits until all\n"
+//usage:        "                       sysinit actions are completed before continuing. Following the\n"
+//usage:        "                       completion of all sysinit actions, all 'wait' actions are run.\n"
+//usage:        "                       'wait' actions, like 'sysinit' actions, cause init to wait until\n"
+//usage:        "                       the specified task completes. 'once' actions are asynchronous,\n"
+//usage:        "                       therefore, init does not wait for them to complete. 'restart' is\n"
+//usage:        "                       the action taken to restart the init process. By default this should\n"
+//usage:        "                       simply run /sbin/init, but can be a script which runs pivot_root or it\n"
+//usage:        "                       can do all sorts of other interesting things. The 'ctrlaltdel' init\n"
+//usage:        "                       actions are run when the system detects that someone on the system\n"
+//usage:        "                       console has pressed the CTRL-ALT-DEL key combination. Typically one\n"
+//usage:        "                       wants to run 'reboot' at this point to cause the system to reboot.\n"
+//usage:        "                       Finally the 'shutdown' action specifies the actions to taken when\n"
+//usage:        "                       init is told to reboot. Unmounting filesystems and disabling swap\n"
+//usage:        "                       is a very good here.\n"
+//usage:        "\n"
+//usage:        "               Run repeatedly actions:\n"
+//usage:        "\n"
+//usage:        "                       'respawn' actions are run after the 'once' actions. When a process\n"
+//usage:        "                       started with a 'respawn' action exits, init automatically restarts\n"
+//usage:        "                       it. Unlike sysvinit, BusyBox init does not stop processes from\n"
+//usage:        "                       respawning out of control. The 'askfirst' actions acts just like\n"
+//usage:        "                       respawn, except that before running the specified process it\n"
+//usage:        "                       displays the line \"Please press Enter to activate this console.\"\n"
+//usage:        "                       and then waits for the user to press enter before starting the\n"
+//usage:        "                       specified process.\n"
+//usage:        "\n"
+//usage:        "               Unrecognized actions (like initdefault) will cause init to emit an\n"
+//usage:        "               error message, and then go along with its business. All actions are\n"
+//usage:        "               run in the order they appear in /etc/inittab.\n"
+//usage:        "\n"
+//usage:        "       <process>:\n"
+//usage:        "\n"
+//usage:        "               Specifies the process to be executed and its command line.\n"
+//usage:        "\n"
+//usage:        "Example /etc/inittab file:\n"
+//usage:        "\n"
+//usage:        "       # This is run first except when booting in single-user mode\n"
+//usage:        "       #\n"
+//usage:        "       ::sysinit:/etc/init.d/rcS\n"
+//usage:        "       \n"
+//usage:        "       # /bin/sh invocations on selected ttys\n"
+//usage:        "       #\n"
+//usage:        "       # Start an \"askfirst\" shell on the console (whatever that may be)\n"
+//usage:        "       ::askfirst:-/bin/sh\n"
+//usage:        "       # Start an \"askfirst\" shell on /dev/tty2-4\n"
+//usage:        "       tty2::askfirst:-/bin/sh\n"
+//usage:        "       tty3::askfirst:-/bin/sh\n"
+//usage:        "       tty4::askfirst:-/bin/sh\n"
+//usage:        "       \n"
+//usage:        "       # /sbin/getty invocations for selected ttys\n"
+//usage:        "       #\n"
+//usage:        "       tty4::respawn:/sbin/getty 38400 tty4\n"
+//usage:        "       tty5::respawn:/sbin/getty 38400 tty5\n"
+//usage:        "       \n"
+//usage:        "       \n"
+//usage:        "       # Example of how to put a getty on a serial line (for a terminal)\n"
+//usage:        "       #\n"
+//usage:        "       #::respawn:/sbin/getty -L ttyS0 9600 vt100\n"
+//usage:        "       #::respawn:/sbin/getty -L ttyS1 9600 vt100\n"
+//usage:        "       #\n"
+//usage:        "       # Example how to put a getty on a modem line\n"
+//usage:        "       #::respawn:/sbin/getty 57600 ttyS2\n"
+//usage:        "       \n"
+//usage:        "       # Stuff to do when restarting the init process\n"
+//usage:        "       ::restart:/sbin/init\n"
+//usage:        "       \n"
+//usage:        "       # Stuff to do before rebooting\n"
+//usage:        "       ::ctrlaltdel:/sbin/reboot\n"
+//usage:        "       ::shutdown:/bin/umount -a -r\n"
+//usage:        "       ::shutdown:/sbin/swapoff -a\n"
diff --git a/libbb/Config.src b/libbb/Config.src
index f6c7a11ea..85892d3fe 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -135,7 +135,7 @@ config FEATURE_NON_POSIX_CP
           and create a regular file. This does not conform to POSIX,
           but prevents a symlink attack.
           Similarly, "cp file device" will not send file's data
-          to the device.
+          to the device. (To do that, use "cat file >device")
 
 config FEATURE_VERBOSE_CP_MESSAGE
         bool "Give more precise messages when copy fails (cp, mv etc)"
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index e3866e456..b88fa8fe7 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -159,6 +159,7 @@ lib-$(CONFIG_RTCWAKE) += rtc.o
 
 lib-$(CONFIG_IOSTAT) += get_cpu_count.o
 lib-$(CONFIG_MPSTAT) += get_cpu_count.o
+lib-$(CONFIG_POWERTOP) += get_cpu_count.o
 
 # We shouldn't build xregcomp.c if we don't need it - this ensures we don't
 # require regex.h to be in the include dir even if we don't need it thereby
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 3b691f945..b1c772cf3 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -28,7 +28,11 @@
  */
 #include "busybox.h"
 #include <assert.h>
-#include <malloc.h>
+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
+        || defined(__APPLE__) \
+    )
+# include <malloc.h> /* for mallopt */
+#endif
 /* Try to pull in PAGE_SIZE */
 #ifdef __linux__
 # include <sys/user.h>
@@ -66,7 +70,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
 #if ENABLE_FEATURE_COMPRESS_USAGE
 
 static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
-# include "unarchive.h"
+# include "archive.h"
 static const char *unpack_usage_messages(void)
 {
         char *outbuf = NULL;
@@ -75,7 +79,7 @@ static const char *unpack_usage_messages(void)
 
         i = start_bunzip(&bd,
                         /* src_fd: */ -1,
-                        /* inbuf:  */ (void *)packed_usage,
+                        /* inbuf:  */ packed_usage,
                         /* len:    */ sizeof(packed_usage));
         /* read_bunzip can longjmp to start_bunzip, and ultimately
          * end up here with i != 0 on read data errors! Not trivial */
@@ -103,14 +107,13 @@ void FAST_FUNC bb_show_usage(void)
         if (ENABLE_SHOW_USAGE) {
 #ifdef SINGLE_APPLET_STR
                 /* Imagine that this applet is "true". Dont suck in printf! */
-                const char *p;
-                const char *usage_string = p = unpack_usage_messages();
+                const char *usage_string = unpack_usage_messages();
 
-                if (*p == '\b') {
+                if (*usage_string == '\b') {
                         full_write2_str("No help available.\n\n");
                 } else {
                         full_write2_str("Usage: "SINGLE_APPLET_STR" ");
-                        full_write2_str(p);
+                        full_write2_str(usage_string);
                         full_write2_str("\n\n");
                 }
                 if (ENABLE_FEATURE_CLEAN_UP)
@@ -228,7 +231,7 @@ bool re_execed;
 
 IF_FEATURE_SUID(static uid_t ruid;)  /* real uid */
 
-#if ENABLE_FEATURE_SUID_CONFIG
+# if ENABLE_FEATURE_SUID_CONFIG
 
 /* applets[] is const, so we have to define this "override" structure */
 static struct BB_suid_config {
@@ -499,15 +502,15 @@ static void parse_config_file(void)
                 sct_head = sct;
         }
 }
-#else
+# else
 static inline void parse_config_file(void)
 {
         IF_FEATURE_SUID(ruid = getuid();)
 }
-#endif /* FEATURE_SUID_CONFIG */
+# endif /* FEATURE_SUID_CONFIG */
 
 
-#if ENABLE_FEATURE_SUID
+# if ENABLE_FEATURE_SUID
 static void check_suid(int applet_no)
 {
         gid_t rgid;  /* real gid */
@@ -516,7 +519,7 @@ static void check_suid(int applet_no)
                 return; /* run by root - no need to check more */
         rgid = getgid();
 
-#if ENABLE_FEATURE_SUID_CONFIG
+#  if ENABLE_FEATURE_SUID_CONFIG
         if (suid_cfg_readable) {
                 uid_t uid;
                 struct BB_suid_config *sct;
@@ -559,7 +562,7 @@ static void check_suid(int applet_no)
                         bb_perror_msg_and_die("setresuid");
                 return;
         }
-#if !ENABLE_FEATURE_SUID_CONFIG_QUIET
+#   if !ENABLE_FEATURE_SUID_CONFIG_QUIET
         {
                 static bool onetime = 0;
 
@@ -568,9 +571,9 @@ static void check_suid(int applet_no)
                         fprintf(stderr, "Using fallback suid method\n");
                 }
         }
-#endif
+#   endif
  check_need_suid:
-#endif
+#  endif
         if (APPLET_SUID(applet_no) == _BB_SUID_REQUIRE) {
                 /* Real uid is not 0. If euid isn't 0 too, suid bit
                  * is most probably not set on our executable */
@@ -581,25 +584,24 @@ static void check_suid(int applet_no)
                 xsetuid(ruid);
         }
 }
-#else
-#define check_suid(x) ((void)0)
-#endif /* FEATURE_SUID */
+# else
+#  define check_suid(x) ((void)0)
+# endif /* FEATURE_SUID */
 
 
-#if ENABLE_FEATURE_INSTALLER
+# if ENABLE_FEATURE_INSTALLER
 static const char usr_bin [] ALIGN1 = "/usr/bin/";
 static const char usr_sbin[] ALIGN1 = "/usr/sbin/";
 static const char *const install_dir[] = {
         &usr_bin [8], /* "/" */
         &usr_bin [4], /* "/bin/" */
         &usr_sbin[4]  /* "/sbin/" */
-# if !ENABLE_INSTALL_NO_USR
+#  if !ENABLE_INSTALL_NO_USR
         ,usr_bin
         ,usr_sbin
-# endif
+#  endif
 };
 
-
 /* create (sym)links for each applet */
 static void install_links(const char *busybox, int use_symbolic_links,
                 char *custom_install_dir)
@@ -629,9 +631,9 @@ static void install_links(const char *busybox, int use_symbolic_links,
                 free(fpc);
         }
 }
-#else
-# define install_links(x,y,z) ((void)0)
-#endif
+# else
+#  define install_links(x,y,z) ((void)0)
+# endif
 
 /* If we were called as "busybox..." */
 static int busybox_main(char **argv)
@@ -696,10 +698,10 @@ static int busybox_main(char **argv)
                 const char *a = applet_names;
                 dup2(1, 2);
                 while (*a) {
-#if ENABLE_FEATURE_INSTALLER
+# if ENABLE_FEATURE_INSTALLER
                         if (argv[1][6]) /* --list-path? */
                                 full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
-#endif
+# endif
                         full_write2_str(a);
                         full_write2_str("\n");
                         i++;
@@ -772,7 +774,7 @@ void FAST_FUNC run_applet_and_exit(const char *name, char **argv)
         int applet = find_applet_by_name(name);
         if (applet >= 0)
                 run_applet_no_and_exit(applet, argv);
-        if (!strncmp(name, "busybox", 7))
+        if (strncmp(name, "busybox", 7) == 0)
                 exit(busybox_main(argv));
 }
 
@@ -804,14 +806,6 @@ int main(int argc UNUSED_PARAM, char **argv)
         mallopt(M_MMAP_THRESHOLD, 8 * PAGE_SIZE - 256);
 #endif
 
-#if defined(SINGLE_APPLET_MAIN)
-        /* Only one applet is selected by the user! */
-        /* applet_names in this case is just "applet\0\0" */
-        lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv));
-        return SINGLE_APPLET_MAIN(argc, argv);
-#else
-        lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
-
 #if !BB_MMU
         /* NOMMU re-exec trick sets high-order bit in first byte of name */
         if (argv[0][0] & 0x80) {
@@ -819,6 +813,19 @@ int main(int argc UNUSED_PARAM, char **argv)
                 argv[0][0] &= 0x7f;
         }
 #endif
+
+#if defined(SINGLE_APPLET_MAIN)
+        /* Only one applet is selected in .config */
+        if (argv[1] && strncmp(argv[0], "busybox", 7) == 0) {
+                /* "busybox <applet> <params>" should still work as expected */
+                argv++;
+        }
+        /* applet_names in this case is just "applet\0\0" */
+        lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv));
+        return SINGLE_APPLET_MAIN(argc, argv);
+#else
+        lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
+
         applet_name = argv[0];
         if (applet_name[0] == '-')
                 applet_name++;
diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c
index 32c86cea8..8436cd664 100644
--- a/libbb/find_root_device.c
+++ b/libbb/find_root_device.c
@@ -29,14 +29,15 @@ static char *find_block_device_in_dir(struct arena *ap)
         char *retpath = NULL;
         int len, rem;
 
-        dir = opendir(ap->devpath);
-        if (!dir)
-                return NULL;
-
         len = strlen(ap->devpath);
         rem = DEVNAME_MAX-2 - len;
         if (rem <= 0)
                 return NULL;
+
+        dir = opendir(ap->devpath);
+        if (!dir)
+                return NULL;
+
         ap->devpath[len++] = '/';
 
         while ((entry = readdir(dir)) != NULL) {
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index ab77755fc..187cb3a79 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -115,7 +115,7 @@ const char *opt_complementary
         found.
 
  "ww"   Adjacent double options have a counter associated which indicates
-        the number of occurences of the option.
+        the number of occurrences of the option.
         For example the ps applet needs:
         if w is given once, GNU ps sets the width to 132,
         if w is given more than once, it is "unlimited"
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index e427f6080..b87d1dde8 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -158,11 +158,11 @@ static void FAST_FUNC md5_process_block64(md5_ctx_t *ctx)
         };
         static const char P_array[] ALIGN1 = {
 # if MD5_SIZE_VS_SPEED > 1
-                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,   /* 1 */
+                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 1 */
 # endif
-                1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12,   /* 2 */
-                5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2,   /* 3 */
-                0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9    /* 4 */
+                1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, /* 2 */
+                5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, /* 3 */
+                0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9  /* 4 */
         };
 #endif
         uint32_t *words = (void*) ctx->wbuffer;
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 182dfac13..f9658711a 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -94,8 +94,10 @@ static bool BB_ispunct(CHAR_T c) { return ((unsigned)c < 256 && ispunct(c)); }
 #endif
 
 
-#define SEQ_CLEAR_TILL_END_OF_SCREEN "\033[J"
-//#define SEQ_CLEAR_TILL_END_OF_LINE   "\033[K"
+#define ESC "\033"
+
+#define SEQ_CLEAR_TILL_END_OF_SCREEN  ESC"[J"
+//#define SEQ_CLEAR_TILL_END_OF_LINE  ESC"[K"
 
 
 enum {
@@ -446,7 +448,7 @@ static void input_backward(unsigned num)
                         } while (--num);
                         return;
                 }
-                printf("\033[%uD", num);
+                printf(ESC"[%uD", num);
                 return;
         }
 
@@ -471,7 +473,7 @@ static void input_backward(unsigned num)
                  */
                 unsigned sv_cursor;
                 /* go to 1st column; go up to first line */
-                printf("\r" "\033[%uA", cmdedit_y);
+                printf("\r" ESC"[%uA", cmdedit_y);
                 cmdedit_y = 0;
                 sv_cursor = cursor;
                 put_prompt(); /* sets cursor to 0 */
@@ -488,12 +490,12 @@ static void input_backward(unsigned num)
                 cmdedit_x = (width * cmdedit_y - num) % width;
                 cmdedit_y -= lines_up;
                 /* go to 1st column; go up */
-                printf("\r" "\033[%uA", lines_up);
+                printf("\r" ESC"[%uA", lines_up);
                 /* go to correct column.
                  * xterm, konsole, Linux VT interpret 0 as 1 below! wow.
                  * need to *make sure* we skip it if cmdedit_x == 0 */
                 if (cmdedit_x)
-                        printf("\033[%uC", cmdedit_x);
+                        printf(ESC"[%uC", cmdedit_x);
         }
 }
 
@@ -501,7 +503,7 @@ static void input_backward(unsigned num)
 static void redraw(int y, int back_cursor)
 {
         if (y > 0) /* up y lines */
-                printf("\033[%uA", y);
+                printf(ESC"[%uA", y);
         bb_putchar('\r');
         put_prompt();
         put_till_end_and_adv_cursor();
@@ -582,6 +584,12 @@ static void input_forward(void)
 
 #if ENABLE_FEATURE_TAB_COMPLETION
 
+//FIXME:
+//needs to be more clever: currently it thinks that "foo\ b<TAB>
+//matches the file named "foo bar", which is untrue.
+//Also, perhaps "foo b<TAB> needs to complete to "foo bar" <cursor>,
+//not "foo bar <cursor>...
+
 static void free_tab_completion_data(void)
 {
         if (matches) {
@@ -599,7 +607,7 @@ static void add_match(char *matched)
         num_matches++;
 }
 
-#if ENABLE_FEATURE_USERNAME_COMPLETION
+# if ENABLE_FEATURE_USERNAME_COMPLETION
 /* Replace "~user/..." with "/homedir/...".
  * The parameter is malloced, free it or return it
  * unchanged if no user is matched.
@@ -655,7 +663,7 @@ static NOINLINE unsigned complete_username(const char *ud)
 
         return 1 + userlen;
 }
-#endif  /* FEATURE_USERNAME_COMPLETION */
+# endif  /* FEATURE_USERNAME_COMPLETION */
 
 enum {
         FIND_EXE_ONLY = 0,
@@ -740,10 +748,10 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                 pfind++;
                 /* dirbuf = ".../.../.../" */
                 dirbuf = xstrndup(command, pfind - command);
-#if ENABLE_FEATURE_USERNAME_COMPLETION
+# if ENABLE_FEATURE_USERNAME_COMPLETION
                 if (dirbuf[0] == '~')   /* ~/... or ~user/... */
                         dirbuf = username_path_completion(dirbuf);
-#endif
+# endif
                 path1[0] = dirbuf;
         }
         pf_len = strlen(pfind);
@@ -1021,13 +1029,18 @@ static void showfiles(void)
         }
 }
 
-static char *add_quote_for_spec_chars(char *found)
+static const char *is_special_char(char c)
+{
+        return strchr(" `\"#$%^&*()=+{}[]:;'|\\<>", c);
+}
+
+static char *quote_special_chars(char *found)
 {
         int l = 0;
         char *s = xzalloc((strlen(found) + 1) * 2);
 
         while (*found) {
-                if (strchr(" `\"#$%^&*()=+{}[]:;'|\\<>", *found))
+                if (is_special_char(*found))
                         s[l++] = '\\';
                 s[l++] = *found++;
         }
@@ -1044,10 +1057,10 @@ static NOINLINE void input_tab(smallint *lastWasTab)
         /* Length of string used for matching */
         unsigned match_pfx_len = match_pfx_len;
         int find_type;
-#if ENABLE_UNICODE_SUPPORT
+# if ENABLE_UNICODE_SUPPORT
         /* cursor pos in command converted to multibyte form */
         int cursor_mb;
-#endif
+# endif
         if (!(state->flags & TAB_COMPLETION))
                 return;
 
@@ -1074,9 +1087,9 @@ static NOINLINE void input_tab(smallint *lastWasTab)
          * (we then also (ab)use this extra space later - see (**))
          */
         match_buf = xmalloc(MAX_LINELEN * sizeof(int16_t));
-#if !ENABLE_UNICODE_SUPPORT
+# if !ENABLE_UNICODE_SUPPORT
         save_string(match_buf, cursor + 1); /* +1 for NUL */
-#else
+# else
         {
                 CHAR_T wc = command_ps[cursor];
                 command_ps[cursor] = BB_NUL;
@@ -1084,26 +1097,37 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 command_ps[cursor] = wc;
                 cursor_mb = strlen(match_buf);
         }
-#endif
+# endif
         find_type = build_match_prefix(match_buf);
 
         /* Free up any memory already allocated */
         free_tab_completion_data();
 
-#if ENABLE_FEATURE_USERNAME_COMPLETION
-        /* If the word starts with `~' and there is no slash in the word,
+# if ENABLE_FEATURE_USERNAME_COMPLETION
+        /* If the word starts with ~ and there is no slash in the word,
          * then try completing this word as a username. */
         if (state->flags & USERNAME_COMPLETION)
                 if (match_buf[0] == '~' && strchr(match_buf, '/') == NULL)
                         match_pfx_len = complete_username(match_buf);
-#endif
-        /* Try to match a command in $PATH, or a directory, or a file */
+# endif
+        /* If complete_username() did not match,
+         * try to match a command in $PATH, or a directory, or a file */
         if (!matches)
                 match_pfx_len = complete_cmd_dir_file(match_buf, find_type);
+
+        /* Account for backslashes which will be inserted
+         * by quote_special_chars() later */
+        {
+                const char *e = match_buf + strlen(match_buf);
+                const char *s = e - match_pfx_len;
+                while (s < e)
+                        if (is_special_char(*s++))
+                                match_pfx_len++;
+        }
+
         /* Remove duplicates */
         if (matches) {
-                unsigned i;
-                unsigned n = 0;
+                unsigned i, n = 0;
                 qsort_string_vector(matches, num_matches);
                 for (i = 0; i < num_matches - 1; ++i) {
                         //if (matches[i] && matches[i+1]) { /* paranoia */
@@ -1118,6 +1142,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 matches[n++] = matches[i];
                 num_matches = n;
         }
+
         /* Did we find exactly one match? */
         if (num_matches != 1) { /* no */
                 char *cp;
@@ -1139,7 +1164,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                         goto ret; /* no */
                 }
                 *cp = '\0';
-                cp = add_quote_for_spec_chars(chosen_match);
+                cp = quote_special_chars(chosen_match);
                 free(chosen_match);
                 chosen_match = cp;
                 len_found = strlen(chosen_match);
@@ -1147,7 +1172,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 /* Next <tab> is not a double-tab */
                 *lastWasTab = 0;
 
-                chosen_match = add_quote_for_spec_chars(matches[0]);
+                chosen_match = quote_special_chars(matches[0]);
                 len_found = strlen(chosen_match);
                 if (chosen_match[len_found-1] != '/') {
                         chosen_match[len_found] = ' ';
@@ -1155,7 +1180,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 }
         }
 
-#if !ENABLE_UNICODE_SUPPORT
+# if !ENABLE_UNICODE_SUPPORT
         /* Have space to place the match? */
         /* The result consists of three parts with these lengths: */
         /* cursor + (len_found - match_pfx_len) + (command_len - cursor) */
@@ -1172,7 +1197,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 /* write out the matched command */
                 redraw(cmdedit_y, command_len - pos);
         }
-#else
+# else
         {
                 /* Use 2nd half of match_buf as scratch space - see (**) */
                 char *command = match_buf + MAX_LINELEN;
@@ -1196,7 +1221,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                         redraw(cmdedit_y, pos >= 0 ? pos : 0);
                 }
         }
-#endif
+# endif
  ret:
         free(chosen_match);
         free(match_buf);
@@ -1342,7 +1367,7 @@ static void save_history(char *str)
         int fd;
         int len, len2;
 
-        fd = open(state->hist_file, O_WRONLY | O_CREAT | O_APPEND, 0666);
+        fd = open(state->hist_file, O_WRONLY | O_CREAT | O_APPEND, 0600);
         if (fd < 0)
                 return;
         xlseek(fd, 0, SEEK_END); /* paranoia */
@@ -1357,10 +1382,8 @@ static void save_history(char *str)
         /* did we write so much that history file needs trimming? */
         state->cnt_history_in_file++;
         if (state->cnt_history_in_file > MAX_HISTORY * 4) {
-                FILE *fp;
                 char *new_name;
                 line_input_t *st_temp;
-                int i;
 
                 /* we may have concurrently written entries from others.
                  * load them */
@@ -1370,8 +1393,12 @@ static void save_history(char *str)
 
                 /* write out temp file and replace hist_file atomically */
                 new_name = xasprintf("%s.%u.new", state->hist_file, (int) getpid());
-                fp = fopen_for_write(new_name);
-                if (fp) {
+                fd = open(state->hist_file, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+                if (fd >= 0) {
+                        FILE *fp;
+                        int i;
+
+                        fp = xfdopen_for_write(fd);
                         for (i = 0; i < st_temp->cnt_history; i++)
                                 fprintf(fp, "%s\n", st_temp->history[i]);
                         fclose(fp);
@@ -1634,7 +1661,7 @@ static void ask_terminal(void)
         pfd.events = POLLIN;
         if (safe_poll(&pfd, 1, 0) == 0) {
                 S.sent_ESC_br6n = 1;
-                fputs("\033" "[6n", stdout);
+                fputs(ESC"[6n", stdout);
                 fflush_all(); /* make terminal see it ASAP! */
         }
 }
@@ -2089,7 +2116,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
                 case CTRL('L'):
                 vi_case(CTRL('L')|VI_CMDMODE_BIT:)
                         /* Control-l -- clear screen */
-                        printf("\033[H"); /* cursor to top,left */
+                        printf(ESC"[H"); /* cursor to top,left */
                         redraw(0, command_len - cursor);
                         break;
 #if MAX_HISTORY > 0
diff --git a/libbb/procps.c b/libbb/procps.c
index ec43b221e..fcf86d9bb 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -303,6 +303,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                                 goto got_entry;
                         closedir(sp->task_dir);
                         sp->task_dir = NULL;
+                        sp->main_thread_pid = 0;
                 }
 #endif
                 entry = readdir(sp->dir);
@@ -322,6 +323,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                         char task_dir[sizeof("/proc/%u/task") + sizeof(int)*3];
                         sprintf(task_dir, "/proc/%u/task", pid);
                         sp->task_dir = xopendir(task_dir);
+                        sp->main_thread_pid = pid;
                         continue;
                 }
 #endif
diff --git a/libbb/pw_encrypt_sha.c b/libbb/pw_encrypt_sha.c
index 070e0d442..8aeaacad6 100644
--- a/libbb/pw_encrypt_sha.c
+++ b/libbb/pw_encrypt_sha.c
@@ -3,7 +3,7 @@
  */
 
 /* Prefix for optional rounds specification.  */
-static const char str_rounds[] = "rounds=%u$";
+static const char str_rounds[] ALIGN1 = "rounds=%u$";
 
 /* Maximum salt string length.  */
 #define SALT_LEN_MAX 16
@@ -19,8 +19,8 @@ NOINLINE
 sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
 {
         void (*sha_begin)(void *ctx) FAST_FUNC;
-        void (*sha_hash)(const void *buffer, size_t len, void *ctx) FAST_FUNC;
-        void (*sha_end)(void *resbuf, void *ctx) FAST_FUNC;
+        void (*sha_hash)(void *ctx, const void *buffer, size_t len) FAST_FUNC;
+        void (*sha_end)(void *ctx, void *resbuf) FAST_FUNC;
         int _32or64;
 
         char *result, *resptr;
@@ -103,40 +103,40 @@ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
 
         /* Add KEY, SALT.  */
         sha_begin(&ctx);
-        sha_hash(key_data, key_len, &ctx);
-        sha_hash(salt_data, salt_len, &ctx);
+        sha_hash(&ctx, key_data, key_len);
+        sha_hash(&ctx, salt_data, salt_len);
 
         /* Compute alternate SHA sum with input KEY, SALT, and KEY.
            The final result will be added to the first context.  */
         sha_begin(&alt_ctx);
-        sha_hash(key_data, key_len, &alt_ctx);
-        sha_hash(salt_data, salt_len, &alt_ctx);
-        sha_hash(key_data, key_len, &alt_ctx);
-        sha_end(alt_result, &alt_ctx);
+        sha_hash(&alt_ctx, key_data, key_len);
+        sha_hash(&alt_ctx, salt_data, salt_len);
+        sha_hash(&alt_ctx, key_data, key_len);
+        sha_end(&alt_ctx, alt_result);
 
         /* Add result of this to the other context.  */
         /* Add for any character in the key one byte of the alternate sum.  */
         for (cnt = key_len; cnt > _32or64; cnt -= _32or64)
-                sha_hash(alt_result, _32or64, &ctx);
-        sha_hash(alt_result, cnt, &ctx);
+                sha_hash(&ctx, alt_result, _32or64);
+        sha_hash(&ctx, alt_result, cnt);
 
         /* Take the binary representation of the length of the key and for every
            1 add the alternate sum, for every 0 the key.  */
         for (cnt = key_len; cnt != 0; cnt >>= 1)
                 if ((cnt & 1) != 0)
-                        sha_hash(alt_result, _32or64, &ctx);
+                        sha_hash(&ctx, alt_result, _32or64);
                 else
-                        sha_hash(key_data, key_len, &ctx);
+                        sha_hash(&ctx, key_data, key_len);
 
         /* Create intermediate result.  */
-        sha_end(alt_result, &ctx);
+        sha_end(&ctx, alt_result);
 
         /* Start computation of P byte sequence.  */
         /* For every character in the password add the entire password.  */
         sha_begin(&alt_ctx);
         for (cnt = 0; cnt < key_len; ++cnt)
-                sha_hash(key_data, key_len, &alt_ctx);
-        sha_end(temp_result, &alt_ctx);
+                sha_hash(&alt_ctx, key_data, key_len);
+        sha_end(&alt_ctx, temp_result);
 
         /* NB: past this point, raw key_data is not used anymore */
 
@@ -153,8 +153,8 @@ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
         /* For every character in the password add the entire password.  */
         sha_begin(&alt_ctx);
         for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
-                sha_hash(salt_data, salt_len, &alt_ctx);
-        sha_end(temp_result, &alt_ctx);
+                sha_hash(&alt_ctx, salt_data, salt_len);
+        sha_end(&alt_ctx, temp_result);
 
         /* NB: past this point, raw salt_data is not used anymore */
 
@@ -174,31 +174,31 @@ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
 
                 /* Add key or last result.  */
                 if ((cnt & 1) != 0)
-                        sha_hash(p_bytes, key_len, &ctx);
+                        sha_hash(&ctx, p_bytes, key_len);
                 else
-                        sha_hash(alt_result, _32or64, &ctx);
+                        sha_hash(&ctx, alt_result, _32or64);
                 /* Add salt for numbers not divisible by 3.  */
                 if (cnt % 3 != 0)
-                        sha_hash(s_bytes, salt_len, &ctx);
+                        sha_hash(&ctx, s_bytes, salt_len);
                 /* Add key for numbers not divisible by 7.  */
                 if (cnt % 7 != 0)
-                        sha_hash(p_bytes, key_len, &ctx);
+                        sha_hash(&ctx, p_bytes, key_len);
                 /* Add key or last result.  */
                 if ((cnt & 1) != 0)
-                        sha_hash(alt_result, _32or64, &ctx);
+                        sha_hash(&ctx, alt_result, _32or64);
                 else
-                        sha_hash(p_bytes, key_len, &ctx);
+                        sha_hash(&ctx, p_bytes, key_len);
 
-                sha_end(alt_result, &ctx);
+                sha_end(&ctx, alt_result);
         }
 
         /* Append encrypted password to result buffer */
 //TODO: replace with something like
 //      bb_uuencode(cp, src, length, bb_uuenc_tbl_XXXbase64);
 #define b64_from_24bit(B2, B1, B0, N) \
-do {                                                    \
-        unsigned w = ((B2) << 16) | ((B1) << 8) | (B0); \
-        resptr = to64(resptr, w, N);                    \
+do { \
+        unsigned w = ((B2) << 16) | ((B1) << 8) | (B0); \
+        resptr = to64(resptr, w, N); \
 } while (0)
         if (is_sha512 == '5') {
                 unsigned i = 0;
diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index 7ca3d68c3..8664bc625 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -15,7 +15,7 @@
 )
 
 #if ZIPPED
-# include "unarchive.h"
+# include "archive.h"
 #endif
 
 
diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c
index 3818d32be..89dc5bdf2 100644
--- a/libbb/simplify_path.c
+++ b/libbb/simplify_path.c
@@ -15,17 +15,17 @@ char* FAST_FUNC bb_simplify_abs_path_inplace(char *start)
         p = s = start;
         do {
                 if (*p == '/') {
-                        if (*s == '/') {        /* skip duplicate (or initial) slash */
+                        if (*s == '/') {  /* skip duplicate (or initial) slash */
                                 continue;
                         }
                         if (*s == '.') {
-                                if (s[1] == '/' || !s[1]) {     /* remove extra '.' */
+                                if (s[1] == '/' || !s[1]) {  /* remove extra '.' */
                                         continue;
                                 }
                                 if ((s[1] == '.') && (s[2] == '/' || !s[2])) {
                                         ++s;
                                         if (p > start) {
-                                                while (*--p != '/')     /* omit previous dir */
+                                                while (*--p != '/')  /* omit previous dir */
                                                         continue;
                                         }
                                         continue;
@@ -35,8 +35,8 @@ char* FAST_FUNC bb_simplify_abs_path_inplace(char *start)
                 *++p = *s;
         } while (*++s);
 
-        if ((p == start) || (*p != '/')) {      /* not a trailing slash */
-                ++p;                                    /* so keep last character */
+        if ((p == start) || (*p != '/')) {  /* not a trailing slash */
+                ++p;  /* so keep last character */
         }
         *p = '\0';
         return p;
diff --git a/libbb/time.c b/libbb/time.c
index 2a74d34c2..1eb2d75c2 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -93,6 +93,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                  *
                  * This coincides with the format of "touch -t TIME"
                  */
+                unsigned cur_year = ptm->tm_year;
                 int len = strchrnul(date_str, '.') - date_str;
 
                 /* MM[.SS] */
@@ -133,6 +134,17 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                                         &end) >= 5) {
                         /* Adjust month from 1-12 to 0-11 */
                         ptm->tm_mon -= 1;
+                        if ((int)cur_year >= 50) { /* >= 1950 */
+                                /* Adjust year: */
+                                /* 1. Put it in the current century */
+                                ptm->tm_year += (cur_year / 100) * 100;
+                                /* 2. If too far in the past, +100 years */
+                                if (ptm->tm_year < cur_year - 50)
+                                        ptm->tm_year += 100;
+                                /* 3. If too far in the future, -100 years */
+                                if (ptm->tm_year > cur_year + 50)
+                                        ptm->tm_year -= 100;
+                        }
                 } else
                 /* ccyymmddHHMM[.SS] */
                 if (len == 12 && sscanf(date_str, "%4u%2u%2u%2u%2u%c",
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index 9263859f5..8c78f5e20 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -7,6 +7,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//config:config FEATURE_RTMINMAX
+//config:       bool "Support RTMIN[+n] and RTMAX[-n] signal names"
+//config:       default y
+//config:       help
+//config:         Support RTMIN[+n] and RTMAX[-n] signal names
+//config:         in kill, killall etc. This costs ~250 bytes.
+
 #include "libbb.h"
 
 /* Believe it or not, but some arches have more than 32 SIGs!
@@ -117,6 +124,16 @@ static const char signals[][7] = {
 #ifdef SIGSYS
         [SIGSYS   ] = "SYS",
 #endif
+#if ENABLE_FEATURE_RTMINMAX
+# ifdef __SIGRTMIN
+        [__SIGRTMIN] = "RTMIN",
+# endif
+// This makes array about x2 bigger.
+// More compact approach is to special-case SIGRTMAX in print_signames()
+//# ifdef __SIGRTMAX
+//      [__SIGRTMAX] = "RTMAX",
+//# endif
+#endif
 };
 
 // Convert signal name to number.
@@ -134,20 +151,54 @@ int FAST_FUNC get_signum(const char *name)
                 if (strcasecmp(name, signals[i]) == 0)
                         return i;
 
-#if ENABLE_DESKTOP && (defined(SIGIOT) || defined(SIGIO))
+#if ENABLE_DESKTOP
+# if defined(SIGIOT) || defined(SIGIO)
         /* SIGIO[T] are aliased to other names,
          * thus cannot be stored in the signals[] array.
          * Need special code to recognize them */
         if ((name[0] | 0x20) == 'i' && (name[1] | 0x20) == 'o') {
-#ifdef SIGIO
+#  ifdef SIGIO
                 if (!name[2])
                         return SIGIO;
-#endif
-#ifdef SIGIOT
+#  endif
+#  ifdef SIGIOT
                 if ((name[2] | 0x20) == 't' && !name[3])
                         return SIGIOT;
-#endif
+#  endif
         }
+# endif
+#endif
+
+#if ENABLE_FEATURE_RTMINMAX
+# if defined(SIGRTMIN) && defined(SIGRTMAX)
+/* libc may use some rt sigs for pthreads and therefore "remap" SIGRTMIN/MAX,
+ * but we want to use "raw" SIGRTMIN/MAX. Underscored names, if exist, provide
+ * them. If they don't exist, fall back to non-underscored ones: */
+#  if !defined(__SIGRTMIN)
+#   define __SIGRTMIN SIGRTMIN
+#  endif
+#  if !defined(__SIGRTMAX)
+#   define __SIGRTMAX SIGRTMAX
+#  endif
+        if (strncasecmp(name, "RTMIN", 5) == 0) {
+                if (!name[5])
+                        return __SIGRTMIN;
+                if (name[5] == '+') {
+                        i = bb_strtou(name + 6, NULL, 10);
+                        if (!errno && i <= __SIGRTMAX - __SIGRTMIN)
+                                return __SIGRTMIN + i;
+                }
+        }
+        else if (strncasecmp(name, "RTMAX", 5) == 0) {
+                if (!name[5])
+                        return __SIGRTMAX;
+                if (name[5] == '-') {
+                        i = bb_strtou(name + 6, NULL, 10);
+                        if (!errno && i <= __SIGRTMAX - __SIGRTMIN)
+                                return __SIGRTMAX - i;
+                }
+        }
+# endif
 #endif
 
         return -1;
@@ -175,6 +226,11 @@ void FAST_FUNC print_signames(void)
         for (signo = 1; signo < ARRAY_SIZE(signals); signo++) {
                 const char *name = signals[signo];
                 if (name[0])
-                        puts(name);
+                        printf("%2u) %s\n", signo, name);
         }
+#if ENABLE_FEATURE_RTMINMAX
+# ifdef __SIGRTMAX
+        printf("%2u) %s\n", __SIGRTMAX, "RTMAX");
+# endif
+#endif
 }
diff --git a/libbb/unicode.c b/libbb/unicode.c
index 70c6abe00..cf0c6bed9 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -1005,8 +1005,11 @@ static char* FAST_FUNC unicode_conv_to_printable2(uni_stat_t *stats, const char
                                 d++;
                         }
                 }
-                if (stats)
-                        stats->byte_count = stats->unicode_count = (d - dst);
+                if (stats) {
+                        stats->byte_count = (d - dst);
+                        stats->unicode_count = (d - dst);
+                        stats->unicode_width = (d - dst);
+                }
                 return dst;
         }
 
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c
index dc5029223..a30af6f72 100644
--- a/libbb/update_passwd.c
+++ b/libbb/update_passwd.c
@@ -58,7 +58,7 @@ static void check_selinux_update_passwd(const char *username)
  6) delete a user from a group: update_passwd(FILE, GROUP, NULL, MEMBER)
     only if CONFIG_FEATURE_DEL_USER_FROM_GROUP=y and member != NULL
 
- 7) change user's passord: update_passwd(FILE, USER, NEW_PASSWD, NULL)
+ 7) change user's password: update_passwd(FILE, USER, NEW_PASSWD, NULL)
     only if CONFIG_PASSWD=y and applet_name[0] == 'p' like in passwd
     or if CONFIG_CHPASSWD=y and applet_name[0] == 'c' like in chpasswd
 
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 07504b75b..a02a504b0 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -234,7 +234,7 @@ static int wh_helper(int value, int def_val, const char *env_name, int *err)
                 char *s = getenv(env_name);
                 if (s) {
                         value = atoi(s);
-                        /* If LINES/COLUMNS are set, pretent that there is
+                        /* If LINES/COLUMNS are set, pretend that there is
                          * no error getting w/h, this prevents some ugly
                          * cursor tricks by our callers */
                         *err = 0;
diff --git a/libpwdgrp/pwd_grp_internal.c b/libpwdgrp/pwd_grp_internal.c
index 04e436fae..d6483be84 100644
--- a/libpwdgrp/pwd_grp_internal.c
+++ b/libpwdgrp/pwd_grp_internal.c
@@ -37,12 +37,12 @@ int GETXXKEY_R_FUNC(GETXXKEY_R_KEYTYPE key,
         while (1) {
                 rv = bb__pgsreader(GETXXKEY_R_PARSER, resultbuf, buffer, buflen, stream);
                 if (!rv) {
-                        if (GETXXKEY_R_TEST(resultbuf)) { /* Found key? */
+                        if (GETXXKEY_R_TEST(resultbuf)) { /* found key? */
                                 *result = resultbuf;
                                 break;
                         }
                 } else {
-                        if (rv == ENOENT) {     /* end-of-file encountered. */
+                        if (rv == ENOENT) {  /* EOF encountered */
                                 rv = 0;
                         }
                         break;
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index 08ca266d0..47a10fe14 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -14,41 +14,90 @@
 int deluser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int deluser_main(int argc, char **argv)
 {
-        if (argc != 2
-         && (!ENABLE_FEATURE_DEL_USER_FROM_GROUP
-            || applet_name[3] != 'g'
-            || argc != 3)
-        ) {
-                bb_show_usage();
-        }
+        /* User or group name */
+        char *name;
+        /* Username (non-NULL only in "delgroup USER GROUP" case) */
+        char *member;
+        /* Name of passwd or group file */
+        const char *pfile;
+        /* Name of shadow or gshadow file */
+        const char *sfile;
+        /* Are we deluser or delgroup? */
+        int do_deluser = (ENABLE_DELUSER && (!ENABLE_DELGROUP || applet_name[3] == 'u'));
 
-        if (geteuid())
+        if (geteuid() != 0)
                 bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
 
-        if (ENABLE_DELUSER && applet_name[3] == 'u') {
-                /* deluser USER */
-                if (update_passwd(bb_path_passwd_file, argv[1], NULL, NULL) < 0)
-                        return EXIT_FAILURE;
-                if (ENABLE_FEATURE_SHADOWPASSWDS)
-                        if (update_passwd(bb_path_shadow_file, argv[1], NULL, NULL) < 0)
-                                return EXIT_FAILURE;
-        } else if (ENABLE_DELGROUP) {
-                /* delgroup ... */
-                if (!ENABLE_FEATURE_DEL_USER_FROM_GROUP || argc != 3) {
-                        /* delgroup GROUP */
-                        if (update_passwd(bb_path_group_file, argv[1], NULL, NULL) < 0)
-                                return EXIT_FAILURE;
+        name = argv[1];
+        member = NULL;
+
+        switch (argc) {
+        case 3:
+                if (!ENABLE_FEATURE_DEL_USER_FROM_GROUP || do_deluser)
+                        break;
+                /* It's "delgroup USER GROUP" */
+                member = name;
+                name = argv[2];
+                /* Fallthrough */
+
+        case 2:
+                if (do_deluser) {
+                        /* "deluser USER" */
+                        xgetpwnam(name); /* bail out if USER is wrong */
+                        pfile = bb_path_passwd_file;
                         if (ENABLE_FEATURE_SHADOWPASSWDS)
-                                if (update_passwd(bb_path_gshadow_file, argv[1], NULL, NULL) < 0)
-                                        return EXIT_FAILURE;
+                                sfile = bb_path_shadow_file;
                 } else {
-                        /* delgroup USER GROUP */
-                        if (update_passwd(bb_path_group_file, argv[2], NULL, argv[1]) < 0)
-                                return EXIT_FAILURE;
+                        struct group *gr;
+ do_delgroup:
+                        /* "delgroup GROUP" or "delgroup USER GROUP" */
+                        if (do_deluser < 0) { /* delgroup after deluser? */
+                                gr = getgrnam(name);
+                                if (!gr)
+                                        return EXIT_SUCCESS;
+                        } else {
+                                gr = xgetgrnam(name); /* bail out if GROUP is wrong */
+                        }
+                        if (!member) {
+                                /* "delgroup GROUP" */
+                                struct passwd *pw;
+                                struct passwd pwent;
+                                /* Check if the group is in use */
+#define passwd_buf bb_common_bufsiz1
+                                while (!getpwent_r(&pwent, passwd_buf, sizeof(passwd_buf), &pw)) {
+                                        if (pwent.pw_gid == gr->gr_gid)
+                                                bb_error_msg_and_die("'%s' still has '%s' as their primary group!", pwent.pw_name, name);
+                                }
+                                //endpwent();
+                        }
+                        pfile = bb_path_group_file;
                         if (ENABLE_FEATURE_SHADOWPASSWDS)
-                                if (update_passwd(bb_path_gshadow_file, argv[2], NULL, argv[1]) < 0)
-                                        return EXIT_FAILURE;
+                                sfile = bb_path_gshadow_file;
+                }
+
+                /* Modify pfile, then sfile */
+                do {
+                        if (update_passwd(pfile, name, NULL, member) == -1)
+                                return EXIT_FAILURE;
+                        if (ENABLE_FEATURE_SHADOWPASSWDS) {
+                                pfile = sfile;
+                                sfile = NULL;
+                        }
+                } while (ENABLE_FEATURE_SHADOWPASSWDS && pfile);
+
+                if (ENABLE_DELGROUP && do_deluser > 0) {
+                        /* "deluser USER" also should try to delete
+                         * same-named group. IOW: do "delgroup USER"
+                         */
+// On debian deluser is a perl script that calls userdel.
+// From man userdel:
+//  If USERGROUPS_ENAB is defined to yes in /etc/login.defs, userdel will
+//  delete the group with the same name as the user.
+                        do_deluser = -1;
+                        goto do_delgroup;
                 }
+                return EXIT_SUCCESS;
         }
-        return EXIT_SUCCESS;
+        /* Reached only if number of command line args is wrong */
+        bb_show_usage();
 }
diff --git a/loginutils/login.c b/loginutils/login.c
index 9a624df9a..c285b45a1 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -217,6 +217,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
         const char *failed_msg;
         struct passwd pwdstruct;
         char pwdbuf[256];
+        char **pamenv;
 #endif
 
         username[0] = '\0';
@@ -400,6 +401,16 @@ int login_main(int argc UNUSED_PARAM, char **argv)
                         (!(opt & LOGIN_OPT_p) * SETUP_ENV_CLEARENV) + SETUP_ENV_CHANGEENV,
                         pw);
 
+#if ENABLE_PAM
+        /* Modules such as pam_env will setup the PAM environment,
+         * which should be copied into the new environment. */
+        pamenv = pam_getenvlist(pamh);
+        if (pamenv) while (*pamenv) {
+                putenv(*pamenv);
+                pamenv++;
+        }
+#endif
+
         motd();
 
         if (pw->pw_uid == 0)
diff --git a/loginutils/su.c b/loginutils/su.c
index 5bec4bc8b..db303af6d 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -8,6 +8,16 @@
 #include "libbb.h"
 #include <syslog.h>
 
+//usage:#define su_trivial_usage
+//usage:       "[OPTIONS] [-] [USER]"
+//usage:#define su_full_usage "\n\n"
+//usage:       "Run shell under USER (by default, root)\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -,-l    Clear environment, run shell as login shell"
+//usage:     "\n        -p,-m   Do not set new $HOME, $SHELL, $USER, $LOGNAME"
+//usage:     "\n        -c CMD  Command to pass to 'sh -c'"
+//usage:     "\n        -s SH   Shell to use instead of user's default"
+
 #if ENABLE_FEATURE_SU_CHECKS_SHELLS
 /* Return 1 if SHELL is a restricted shell (one not returned by
  * getusershell), else 0, meaning it is a standard shell.  */
@@ -42,7 +52,9 @@ int su_main(int argc UNUSED_PARAM, char **argv)
         struct passwd *pw;
         uid_t cur_uid = getuid();
         const char *tty;
+#if ENABLE_FEATURE_UTMP
         char user_buf[64];
+#endif
         const char *old_user;
 
         flags = getopt32(argv, "mplc:s:", &opt_command, &opt_shell);
diff --git a/mailutils/mail.c b/mailutils/mail.c
index 9b4bebce5..44957016f 100644
--- a/mailutils/mail.c
+++ b/mailutils/mail.c
@@ -75,13 +75,16 @@ void FAST_FUNC launch_helper(const char **argv)
         atexit(kill_helper);
 }
 
-const FAST_FUNC char *command(const char *fmt, const char *param)
+char* FAST_FUNC send_mail_command(const char *fmt, const char *param)
 {
-        const char *msg = fmt;
+        char *msg;
         if (timeout)
                 alarm(timeout);
-        if (msg) {
+        msg = (char*)fmt;
+        if (fmt) {
                 msg = xasprintf(fmt, param);
+                if (verbose)
+                        bb_error_msg("send:'%s'", msg);
                 printf("%s\r\n", msg);
         }
         fflush_all();
@@ -90,7 +93,7 @@ const FAST_FUNC char *command(const char *fmt, const char *param)
 
 // NB: parse_url can modify url[] (despite const), but only if '@' is there
 /*
-static char FAST_FUNC *parse_url(char *url, char **user, char **pass)
+static char* FAST_FUNC parse_url(char *url, char **user, char **pass)
 {
         // parse [user[:pass]@]host
         // return host
diff --git a/mailutils/mail.h b/mailutils/mail.h
index e0048fbfa..d1d783055 100644
--- a/mailutils/mail.h
+++ b/mailutils/mail.h
@@ -1,7 +1,16 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * helper routines
+ *
+ * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
 
 struct globals {
         pid_t helper_pid;
         unsigned timeout;
+        unsigned verbose;
         unsigned opts;
         char *user;
         char *pass;
@@ -12,6 +21,7 @@ struct globals {
 
 #define G (*ptr_to_globals)
 #define timeout         (G.timeout  )
+#define verbose         (G.verbose  )
 #define opts            (G.opts     )
 //#define user            (G.user     )
 //#define pass            (G.pass     )
@@ -26,9 +36,9 @@ struct globals {
 
 //char FAST_FUNC *parse_url(char *url, char **user, char **pass);
 
-void FAST_FUNC launch_helper(const char **argv);
-void FAST_FUNC get_cred_or_die(int fd);
+void launch_helper(const char **argv) FAST_FUNC;
+void get_cred_or_die(int fd) FAST_FUNC;
 
-const FAST_FUNC char *command(const char *fmt, const char *param);
+char *send_mail_command(const char *fmt, const char *param) FAST_FUNC;
 
-void FAST_FUNC encode_base64(char *fname, const char *text, const char *eol);
+void encode_base64(char *fname, const char *text, const char *eol) FAST_FUNC;
diff --git a/mailutils/mime.c b/mailutils/mime.c
index 682cf4536..1e393ed31 100644
--- a/mailutils/mime.c
+++ b/mailutils/mime.c
@@ -99,6 +99,28 @@ Content-Transfer-Encoding: 7bit
 ...random junk added by mailing list robots and such...
 */
 
+/* man makemime:
+
+ * -c TYPE: create a (non-multipart) MIME section with Content-Type: TYPE
+ * makemime -c TYPE [-e ENCODING] [-o OUTFILE] [-C CHARSET] [-N NAME] [-a HEADER...] FILE
+ * The -C option sets the MIME charset attribute for text/plain content.
+ * The -N option sets the name attribute for Content-Type:
+ * Encoding must be one of the following: 7bit, 8bit, quoted-printable, or base64.
+
+ * -m multipart/TYPE: create a multipart MIME collection with Content-Type: multipart/TYPE
+ * makemime -m multipart/TYPE [-e ENCODING] [-o OUTFILE] [-a HEADER...] FILE
+ * Type must be either "multipart/mixed", "multipart/alternative", or some other MIME multipart content type.
+ * Additionally, encoding can only be "7bit" or "8bit", and will default to "8bit" if not specified.
+ * Finally, filename must be a MIME-formatted section, NOT a regular file.
+ * The -m option creates an initial multipart MIME collection, that contains only one MIME section, taken from filename.
+ * The collection is written to standard output, or the pipe or to outputfile.
+
+ * -j FILE1: add a section to a multipart MIME collection
+ * makemime -j FILE1 [-o OUTFILE] FILE2
+ * FILE1 must be a MIME collection that was previously created by the -m option.
+ * FILE2 must be a MIME section that was previously created by the -c option.
+ * The -j options adds the MIME section in FILE2 to the MIME collection in FILE1.
+ */
 int makemime_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int makemime_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -107,14 +129,14 @@ int makemime_main(int argc UNUSED_PARAM, char **argv)
 #define boundary opt_output
 
         enum {
-                OPT_c = 1 << 0,         // Content-Type:
+                OPT_c = 1 << 0,         // create (non-multipart) section
                 OPT_e = 1 << 1,         // Content-Transfer-Encoding. Ignored. Assumed base64
                 OPT_o = 1 << 2,         // output to
                 OPT_C = 1 << 3,         // charset
                 OPT_N = 1 << 4,         // COMPAT
                 OPT_a = 1 << 5,         // additional headers
-                OPT_m = 1 << 6,         // COMPAT
-                OPT_j = 1 << 7,         // COMPAT
+                //OPT_m = 1 << 6,         // create mutipart section
+                //OPT_j = 1 << 7,         // join section to multipart section
         };
 
         INIT_G();
@@ -122,8 +144,8 @@ int makemime_main(int argc UNUSED_PARAM, char **argv)
         // parse options
         opt_complementary = "a::";
         opts = getopt32(argv,
-                "c:e:o:C:N:a:m:j:",
-                &G.content_type, NULL, &opt_output, &G.opt_charset, NULL, &opt_headers, NULL, NULL
+                "c:e:o:C:N:a", //:m:j:",
+                &G.content_type, NULL, &opt_output, &G.opt_charset, NULL, &opt_headers //, NULL, NULL
         );
         //argc -= optind;
         argv += optind;
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c
index 77ec71129..6b733441f 100644
--- a/mailutils/popmaildir.c
+++ b/mailutils/popmaildir.c
@@ -14,9 +14,10 @@
 
 static void pop3_checkr(const char *fmt, const char *param, char **ret)
 {
-        const char *msg = command(fmt, param);
+        char *msg = send_mail_command(fmt, param);
         char *answer = xmalloc_fgetline(stdin);
         if (answer && '+' == answer[0]) {
+                free(msg);
                 if (timeout)
                         alarm(0);
                 if (ret) {
@@ -27,7 +28,7 @@ static void pop3_checkr(const char *fmt, const char *param, char **ret)
                         free(answer);
                 return;
         }
-        bb_error_msg_and_die("%s failed: %s", msg, answer);
+        bb_error_msg_and_die("%s failed, reply was: %s", msg, answer);
 }
 
 static void pop3_check(const char *fmt, const char *param)
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index ec97cf8af..8096288ef 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -6,6 +6,38 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//usage:#define sendmail_trivial_usage
+//usage:       "[OPTIONS] [RECIPIENT_EMAIL]..."
+//usage:#define sendmail_full_usage "\n\n"
+//usage:       "Read email from stdin and send it\n"
+//usage:     "\nStandard options:"
+//usage:     "\n        -t              Read additional recipients from message body"
+//usage:     "\n        -f SENDER       Sender (required)"
+//usage:     "\n        -o OPTIONS      Various options. -oi implied, others are ignored"
+//usage:     "\n        -i              -oi synonym. implied and ignored"
+//usage:     "\n"
+//usage:     "\nBusybox specific options:"
+//usage:     "\n        -v              Verbose"
+//usage:     "\n        -w SECS         Network timeout"
+//usage:     "\n        -H 'PROG ARGS'  Run connection helper"
+//usage:     "\n                        Examples:"
+//usage:     "\n                        -H 'exec openssl s_client -quiet -tls1 -starttls smtp"
+//usage:     "\n                                -connect smtp.gmail.com:25' <email.txt"
+//usage:     "\n                                [4<username_and_passwd.txt | -au<username> -ap<password>]"
+//usage:     "\n                        -H 'exec openssl s_client -quiet -tls1"
+//usage:     "\n                                -connect smtp.gmail.com:465' <email.txt"
+//usage:     "\n                                [4<username_and_passwd.txt | -au<username> -ap<password>]"
+//usage:     "\n        -S HOST[:PORT]  Server"
+//usage:     "\n        -au<username>   Username for AUTH LOGIN"
+//usage:     "\n        -ap<password>   Password for AUTH LOGIN"
+//usage:     "\n        -am<method>     Authentication method. Ignored. LOGIN is implied"
+//usage:     "\n"
+//usage:     "\nOther options are silently ignored; -oi -t is implied"
+//usage:        IF_MAKEMIME(
+//usage:     "\nUse makemime applet to create message with attachments"
+//usage:        )
+
 #include "libbb.h"
 #include "mail.h"
 
@@ -13,23 +45,35 @@
 // 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;
-        const char *msg = command(fmt, param);
+        char *msg = send_mail_command(fmt, param);
         // read stdin
-        // if the string has a form \d\d\d- -- read next string. E.g. EHLO response
+        // if the string has a form NNN- -- read next string. E.g. EHLO response
         // parse first bytes to a number
         // 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
-        while ((answer = xmalloc_fgetline(stdin)) != NULL)
+        while ((answer = xmalloc_fgetline(stdin)) != NULL) {
+                if (verbose)
+                        bb_error_msg("recv:'%.*s' %d", (int)(strchrnul(answer, '\r') - answer), answer, verbose);
                 if (strlen(answer) <= 3 || '-' != answer[3])
                         break;
+                free(answer);
+        }
         if (answer) {
                 int n = atoi(answer);
                 if (timeout)
                         alarm(0);
+                free(msg);
                 free(answer);
                 if (-1 == code || n == code)
                         return n;
@@ -86,6 +130,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
                 OPT_H = 1 << 5,         // use external connection helper
                 OPT_S = 1 << 6,         // specify connection string
                 OPT_a = 1 << 7,         // authentication tokens
+                OPT_v = 1 << 8,         // verbosity
         };
 
         // init global variables
@@ -96,12 +141,13 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
         G.fp0 = xfdopen_for_read(3);
 
         // parse options
-        // -f is required. -H and -S are mutually exclusive
-        opt_complementary = "f:w+:H--S:S--H:a::";
+        // -v is a counter, -f is required. -H and -S are mutually exclusive, -a is a list
+        opt_complementary = "vv:f:w+:H--S:S--H:a::";
         // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect
         // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility,
         // it is still under development.
-        opts = getopt32(argv, "tf:o:iw:H:S:a::", &opt_from, NULL, &timeout, &opt_connect, &opt_connect, &list);
+        opts = getopt32(argv, "tf:o:iw:H:S:a::v", &opt_from, NULL,
+                        &timeout, &opt_connect, &opt_connect, &list, &verbose);
         //argc -= optind;
         argv += optind;
 
@@ -214,7 +260,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
                         if ('.' == s[0] /*&& '\0' == s[1] */)
                                 printf(".");
                         // dump read line
-                        printf("%s\r\n", s);
+                        send_r_n(s);
                         free(s);
                         continue;
                 }
@@ -261,14 +307,14 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
                                 goto bail;
                         // dump the headers
                         while (list) {
-                                printf("%s\r\n", (char *) llist_pop(&list));
+                                send_r_n((char *) llist_pop(&list));
                         }
                         // stop analyzing headers
                         code++;
                         // N.B. !s means: we read nothing, and nothing to be read in the future.
                         // just dump empty line and break the loop
                         if (!s) {
-                                puts("\r");
+                                send_r_n("");
                                 break;
                         }
                         // go dump message body
diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c
index 286077168..7c30669a3 100644
--- a/miscutils/bbconfig.c
+++ b/miscutils/bbconfig.c
@@ -4,7 +4,7 @@
 #include "libbb.h"
 #include "bbconfigopts.h"
 #if ENABLE_FEATURE_COMPRESS_BBCONFIG
-# include "unarchive.h"
+# include "archive.h"
 # include "bbconfigopts_bz2.h"
 #endif
 
@@ -15,7 +15,7 @@ int bbconfig_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         bunzip_data *bd;
         int i = start_bunzip(&bd,
                         /* src_fd: */ -1,
-                        /* inbuf:  */ (void *)bbconfig_config_bz2,
+                        /* inbuf:  */ bbconfig_config_bz2,
                         /* len:    */ sizeof(bbconfig_config_bz2));
         /* read_bunzip can longjmp to start_bunzip, and ultimately
          * end up here with i != 0 on read data errors! Not trivial */
diff --git a/miscutils/chat.c b/miscutils/chat.c
index 8b151fda4..d8370a963 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -175,23 +175,24 @@ int chat_main(int argc UNUSED_PARAM, char **argv)
                                 llist_add_to_end(&aborts, arg);
 #if ENABLE_FEATURE_CHAT_CLR_ABORT
                         } else if (DIR_CLR_ABORT == key) {
+                                llist_t *l;
                                 // remove the string from abort conditions
                                 // N.B. gotta refresh maximum length too...
-#if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
+# if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
                                 max_abort_len = 0;
-#endif
-                                for (llist_t *l = aborts; l; l = l->link) {
-#if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
+# endif
+                                for (l = aborts; l; l = l->link) {
+# if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
                                         size_t len = strlen(l->data);
-#endif
-                                        if (!strcmp(arg, l->data)) {
+# endif
+                                        if (strcmp(arg, l->data) == 0) {
                                                 llist_unlink(&aborts, l);
                                                 continue;
                                         }
-#if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
+# if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
                                         if (len > max_abort_len)
                                                 max_abort_len = len;
-#endif
+# endif
                                 }
 #endif
                         } else if (DIR_TIMEOUT == key) {
diff --git a/miscutils/chrt.c b/miscutils/chrt.c
index c40277b39..1c6737a3c 100644
--- a/miscutils/chrt.c
+++ b/miscutils/chrt.c
@@ -53,23 +53,25 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
         const char *current_new;
         int policy = SCHED_RR;
 
-        /* at least 1 arg; only one policy accepted */
-        opt_complementary = "-1:r--fo:f--ro:r--fo";
+        /* only one policy accepted */
+        opt_complementary = "r--fo:f--ro:o--rf";
         opt = getopt32(argv, "+mprfo");
+        if (opt & OPT_m) { /* print min/max and exit */
+                show_min_max(SCHED_FIFO);
+                show_min_max(SCHED_RR);
+                show_min_max(SCHED_OTHER);
+                fflush_stdout_and_exit(EXIT_SUCCESS);
+        }
         if (opt & OPT_r)
                 policy = SCHED_RR;
         if (opt & OPT_f)
                 policy = SCHED_FIFO;
         if (opt & OPT_o)
                 policy = SCHED_OTHER;
-        if (opt & OPT_m) { /* print min/max */
-                show_min_max(SCHED_FIFO);
-                show_min_max(SCHED_RR);
-                show_min_max(SCHED_OTHER);
-                fflush_stdout_and_exit(EXIT_SUCCESS);
-        }
 
         argv += optind;
+        if (!argv[0])
+                bb_show_usage();
         if (opt & OPT_p) {
                 pid_str = *argv++;
                 if (*argv) { /* "-p <priority> <pid> [...]" */
@@ -90,13 +92,13 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
  print_rt_info:
                 pol = sched_getscheduler(pid);
                 if (pol < 0)
-                        bb_perror_msg_and_die("can't %cet pid %d's policy", 'g', pid);
+                        bb_perror_msg_and_die("can't %cet pid %d's policy", 'g', (int)pid);
                 printf("pid %d's %s scheduling policy: %s\n",
                                 pid, current_new, policies[pol].name);
                 if (sched_getparam(pid, &sp))
-                        bb_perror_msg_and_die("can't get pid %d's attributes", pid);
+                        bb_perror_msg_and_die("can't get pid %d's attributes", (int)pid);
                 printf("pid %d's %s scheduling priority: %d\n",
-                                pid, current_new, sp.sched_priority);
+                                (int)pid, current_new, sp.sched_priority);
                 if (!*argv) {
                         /* Either it was just "-p <pid>",
                          * or it was "-p <priority> <pid>" and we came here
@@ -115,7 +117,7 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
         sp.sched_priority = xstrtou_range(priority, 0, policy != SCHED_OTHER ? 1 : 0, 99);
 
         if (sched_setscheduler(pid, policy, &sp) < 0)
-                bb_perror_msg_and_die("can't %cet pid %d's policy", 's', pid);
+                bb_perror_msg_and_die("can't %cet pid %d's policy", 's', (int)pid);
 
         if (!argv[0]) /* "-p <priority> <pid> [...]" */
                 goto print_rt_info;
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index 01928b35f..723b4208a 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -43,6 +43,9 @@
 #include "libbb.h"
 #include <sys/kd.h>
 
+
+#define ESC "\033"
+
 struct screen_info {
         unsigned char lines, cols, cursor_x, cursor_y;
 };
@@ -70,7 +73,7 @@ struct globals {
         unsigned col;
         unsigned line;
         smallint curoff; // unknown:0 cursor on:-1 cursor off:1
-        char attrbuf[sizeof("\033[0;1;5;30;40m")];
+        char attrbuf[sizeof(ESC"[0;1;5;30;40m")];
         // remote console
         struct screen_info remote;
         // saved local tty terminfo
@@ -101,7 +104,7 @@ enum {
 static void clrscr(void)
 {
         // Home, clear till end of screen
-        fputs("\033[1;1H" "\033[J", stdout);
+        fputs(ESC"[1;1H" ESC"[J", stdout);
         G.col = G.line = 0;
 }
 
@@ -109,7 +112,7 @@ static void set_cursor(int state)
 {
         if (G.curoff != state) {
                 G.curoff = state;
-                fputs("\033[?25", stdout);
+                fputs(ESC"[?25", stdout);
                 bb_putchar("h?l"[1 + state]);
         }
 }
@@ -119,7 +122,7 @@ static void gotoxy(int col, int line)
         if (G.col != col || G.line != line) {
                 G.col = col;
                 G.line = line;
-                printf("\033[%u;%uH", line + 1, col + 1);
+                printf(ESC"[%u;%uH", line + 1, col + 1);
         }
 }
 
@@ -132,7 +135,7 @@ static void cleanup(int code)
         }
         // Reset attributes
         if (!BW)
-                fputs("\033[0m", stdout);
+                fputs(ESC"[0m", stdout);
         bb_putchar('\n');
         if (code > 1)
                 kill_myself_with_sig(code);
@@ -417,19 +420,19 @@ int conspy_main(int argc UNUSED_PARAM, char **argv)
 
                         if (G.remote.cursor_x < G.x) {
                                 G.x = G.remote.cursor_x;
-                                i = 0;  // force refresh
+                                i = 0; // force refresh
                         }
                         if (nx > G.x) {
                                 G.x = nx;
-                                i = 0;  // force refresh
+                                i = 0; // force refresh
                         }
                         if (G.remote.cursor_y < G.y) {
                                 G.y = G.remote.cursor_y;
-                                i = 0;  // force refresh
+                                i = 0; // force refresh
                         }
                         if (ny > G.y) {
                                 G.y = ny;
-                                i = 0;  // force refresh
+                                i = 0; // force refresh
                         }
                 }
 
diff --git a/miscutils/less.c b/miscutils/less.c
index 500059d2a..9e12c11a7 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -28,13 +28,15 @@
 #include "xregex.h"
 #endif
 
+
+#define ESC "\033"
 /* The escape codes for highlighted and normal text */
-#define HIGHLIGHT   "\033[7m"
-#define NORMAL      "\033[0m"
+#define HIGHLIGHT   ESC"[7m"
+#define NORMAL      ESC"[0m"
 /* The escape code to home and clear to the end of screen */
-#define CLEAR       "\033[H\033[J"
+#define CLEAR       ESC"[H\033[J"
 /* The escape code to clear to the end of line */
-#define CLEAR_2_EOL "\033[K"
+#define CLEAR_2_EOL ESC"[K"
 
 enum {
 /* Absolute max of lines eaten */
@@ -165,12 +167,12 @@ static void set_tty_cooked(void)
    top-left corner of the console */
 static void move_cursor(int line, int row)
 {
-        printf("\033[%u;%uH", line, row);
+        printf(ESC"[%u;%uH", line, row);
 }
 
 static void clear_line(void)
 {
-        printf("\033[%u;0H" CLEAR_2_EOL, max_displayed_line + 2);
+        printf(ESC"[%u;0H" CLEAR_2_EOL, max_displayed_line + 2);
 }
 
 static void print_hilite(const char *str)
diff --git a/miscutils/ubi_attach_detach.c b/miscutils/ubi_attach_detach.c
index 18ffd4df2..b74d97b68 100644
--- a/miscutils/ubi_attach_detach.c
+++ b/miscutils/ubi_attach_detach.c
@@ -26,8 +26,8 @@
 #include "libbb.h"
 #include <mtd/ubi-user.h>
 
-#define OPTION_M        (1 << 0)
-#define OPTION_D        (1 << 1)
+#define OPTION_M  (1 << 0)
+#define OPTION_D  (1 << 1)
 
 #define do_attach (ENABLE_UBIATTACH && \
                 (!ENABLE_UBIDETACH || (applet_name[3] == 'a')))
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 36902a214..630782660 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -24,7 +24,7 @@ static void watchdog_shutdown(int sig UNUSED_PARAM)
         write(3, &V, 1);  /* Magic, see watchdog-api.txt in kernel */
         if (ENABLE_FEATURE_CLEAN_UP)
                 close(3);
-        exit(EXIT_SUCCESS);
+        _exit(EXIT_SUCCESS);
 }
 
 int watchdog_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index a5cf4babf..73df39c6c 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -10,6 +10,20 @@
 
 //applet:IF_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
 
+#include "libbb.h"
+#include "modutils.h"
+#include <sys/utsname.h>
+#include <fnmatch.h>
+
+//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
+#define DBG(...) ((void)0)
+
+/* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
+ * we expect the full dependency list to be specified in modules.dep.
+ * Older versions would only export the direct dependency list.
+ */
+
+
 //usage:#if !ENABLE_MODPROBE_SMALL
 //usage:#define modprobe_notes_usage
 //usage:        "modprobe can (un)load a stack of modules, passing each module options (when\n"
@@ -72,9 +86,8 @@
 //usage:       "   from the command line\n"
 //usage:
 //usage:#define modprobe_trivial_usage
-//usage:        "[-alrqvs"
-//usage:        IF_FEATURE_MODPROBE_BLACKLIST("b")
-//usage:        "] MODULE [symbol=value]..."
+//usage:        "[-alrqvsD" IF_FEATURE_MODPROBE_BLACKLIST("b") "]"
+//usage:        " MODULE [symbol=value]..."
 //usage:#define modprobe_full_usage "\n\n"
 //usage:       "Options:"
 //usage:     "\n        -a      Load multiple MODULEs"
@@ -83,43 +96,50 @@
 //usage:     "\n        -q      Quiet"
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -s      Log to syslog"
+//usage:     "\n        -D      Show dependencies"
 //usage:        IF_FEATURE_MODPROBE_BLACKLIST(
 //usage:     "\n        -b      Apply blacklist to module names too"
 //usage:        )
 //usage:#endif /* !ENABLE_MODPROBE_SMALL */
 
-#include "libbb.h"
-#include "modutils.h"
-#include <sys/utsname.h>
-#include <fnmatch.h>
-
-//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
-#define DBG(...) ((void)0)
-
-/* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
- * we expect the full dependency list to be specified in modules.dep.
- * Older versions would only export the direct dependency list.
- */
-
 /* Note that usage text doesn't document various 2.4 options
  * we pull in through INSMOD_OPTS define */
-
-#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--ar:a--lr:r--al"
-#define MODPROBE_OPTS  "alr" IF_FEATURE_MODPROBE_BLACKLIST("b")
-//#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al"
+#define MODPROBE_OPTS  "alrD" IF_FEATURE_MODPROBE_BLACKLIST("b")
+/* -a and -D _are_ in fact compatible */
+#define MODPROBE_COMPLEMENTARY ("q-v:v-q:l--arD:r--alD:a--lr:D--rl")
 //#define MODPROBE_OPTS  "acd:lnrt:C:" IF_FEATURE_MODPROBE_BLACKLIST("b")
+//#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al"
 enum {
-        MODPROBE_OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */
-        //MODPROBE_OPT_DUMP_ONLY= (INSMOD_OPT_UNUSED << x), /* c */
-        //MODPROBE_OPT_DIRNAME  = (INSMOD_OPT_UNUSED << x), /* d */
-        MODPROBE_OPT_LIST_ONLY  = (INSMOD_OPT_UNUSED << 1), /* l */
-        //MODPROBE_OPT_SHOW_ONLY= (INSMOD_OPT_UNUSED << x), /* n */
-        MODPROBE_OPT_REMOVE     = (INSMOD_OPT_UNUSED << 2), /* r */
-        //MODPROBE_OPT_RESTRICT = (INSMOD_OPT_UNUSED << x), /* t */
-        //MODPROBE_OPT_VERONLY  = (INSMOD_OPT_UNUSED << x), /* V */
-        //MODPROBE_OPT_CONFIGFILE=(INSMOD_OPT_UNUSED << x), /* C */
-        MODPROBE_OPT_BLACKLIST  = (INSMOD_OPT_UNUSED << 3) * ENABLE_FEATURE_MODPROBE_BLACKLIST,
+        OPT_INSERT_ALL   = (INSMOD_OPT_UNUSED << 0), /* a */
+        //OPT_DUMP_ONLY  = (INSMOD_OPT_UNUSED << x), /* c */
+        //OPT_DIRNAME    = (INSMOD_OPT_UNUSED << x), /* d */
+        OPT_LIST_ONLY    = (INSMOD_OPT_UNUSED << 1), /* l */
+        //OPT_SHOW_ONLY  = (INSMOD_OPT_UNUSED << x), /* n */
+        OPT_REMOVE       = (INSMOD_OPT_UNUSED << 2), /* r */
+        //OPT_RESTRICT   = (INSMOD_OPT_UNUSED << x), /* t */
+        //OPT_VERONLY    = (INSMOD_OPT_UNUSED << x), /* V */
+        //OPT_CONFIGFILE = (INSMOD_OPT_UNUSED << x), /* C */
+        OPT_SHOW_DEPS    = (INSMOD_OPT_UNUSED << 3), /* D */
+        OPT_BLACKLIST    = (INSMOD_OPT_UNUSED << 4) * ENABLE_FEATURE_MODPROBE_BLACKLIST,
 };
+#if ENABLE_LONG_OPTS
+static const char modprobe_longopts[] ALIGN1 =
+        /* nobody asked for long opts (yet) */
+        // "all\0"          No_argument "a"
+        // "list\0"         No_argument "l"
+        // "remove\0"       No_argument "r"
+        // "quiet\0"        No_argument "q"
+        // "verbose\0"      No_argument "v"
+        // "syslog\0"       No_argument "s"
+        /* module-init-tools 3.11.1 has only long opt --show-depends
+         * but no short -D, we provide long opt for scripts which
+         * were written for 3.11.1: */
+        "show-depends\0" No_argument "D"
+        // IF_FEATURE_MODPROBE_BLACKLIST(
+        // "use-blacklist\0" No_argument "b"
+        // )
+        ;
+#endif
 
 #define MODULE_FLAG_LOADED              0x0001
 #define MODULE_FLAG_NEED_DEPS           0x0002
@@ -145,9 +165,13 @@ struct globals {
         int num_unresolved_deps;
         /* bool. "Did we have 'symbol:FOO' requested on cmdline?" */
         smallint need_symbols;
+        struct utsname uts;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define INIT_G() do { } while (0)
+struct BUG_G_too_big {
+        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+};
 
 
 static int read_config(const char *path);
@@ -202,7 +226,7 @@ static void add_probe(const char *name)
         struct module_entry *m;
 
         m = get_or_add_modentry(name);
-        if (!(option_mask32 & MODPROBE_OPT_REMOVE)
+        if (!(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS))
          && (m->flags & MODULE_FLAG_LOADED)
         ) {
                 DBG("skipping %s, it is already loaded", name);
@@ -353,8 +377,6 @@ static char *parse_and_add_kcmdline_module_options(char *options, const char *mo
  */
 static int do_modprobe(struct module_entry *m)
 {
-        struct module_entry *m2 = m2; /* for compiler */
-        char *fn, *options;
         int rc, first;
         llist_t *l;
 
@@ -366,7 +388,7 @@ static int do_modprobe(struct module_entry *m)
         }
         DBG("do_modprob'ing %s", m->modname);
 
-        if (!(option_mask32 & MODPROBE_OPT_REMOVE))
+        if (!(option_mask32 & OPT_REMOVE))
                 m->deps = llist_rev(m->deps);
 
         for (l = m->deps; l != NULL; l = l->link)
@@ -375,11 +397,14 @@ static int do_modprobe(struct module_entry *m)
         first = 1;
         rc = 0;
         while (m->deps) {
+                struct module_entry *m2;
+                char *fn, *options;
+
                 rc = 0;
                 fn = llist_pop(&m->deps); /* we leak it */
                 m2 = get_or_add_modentry(fn);
 
-                if (option_mask32 & MODPROBE_OPT_REMOVE) {
+                if (option_mask32 & OPT_REMOVE) {
                         /* modprobe -r */
                         if (m2->flags & MODULE_FLAG_LOADED) {
                                 rc = bb_delete_module(m2->modname, O_EXCL);
@@ -399,16 +424,27 @@ static int do_modprobe(struct module_entry *m)
                         continue;
                 }
 
-                if (m2->flags & MODULE_FLAG_LOADED) {
-                        DBG("%s is already loaded, skipping", fn);
-                        continue;
-                }
-
                 options = m2->options;
                 m2->options = NULL;
                 options = parse_and_add_kcmdline_module_options(options, m2->modname);
                 if (m == m2)
                         options = gather_options_str(options, G.cmdline_mopts);
+
+                if (option_mask32 & OPT_SHOW_DEPS) {
+                        printf(options ? "insmod %s/%s/%s %s\n"
+                                        : "insmod %s/%s/%s\n",
+                                CONFIG_DEFAULT_MODULES_DIR, G.uts.release, fn,
+                                options);
+                        free(options);
+                        continue;
+                }
+
+                if (m2->flags & MODULE_FLAG_LOADED) {
+                        DBG("%s is already loaded, skipping", fn);
+                        free(options);
+                        continue;
+                }
+
                 rc = bb_init_module(fn, options);
                 DBG("loaded %s '%s', rc:%d", fn, options, rc);
                 if (rc == EEXIST)
@@ -456,7 +492,7 @@ static void load_modules_dep(void)
 
                 /* Optimization... */
                 if ((m->flags & MODULE_FLAG_LOADED)
-                 && !(option_mask32 & MODPROBE_OPT_REMOVE)
+                 && !(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS))
                 ) {
                         DBG("skip deps of %s, it's already loaded", tokens[0]);
                         continue;
@@ -477,21 +513,23 @@ static void load_modules_dep(void)
 int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int modprobe_main(int argc UNUSED_PARAM, char **argv)
 {
-        struct utsname uts;
         int rc;
         unsigned opt;
         struct module_entry *me;
 
+        INIT_G();
+
+        IF_LONG_OPTS(applet_long_options = modprobe_longopts;)
         opt_complementary = MODPROBE_COMPLEMENTARY;
         opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS);
         argv += optind;
 
         /* Goto modules location */
         xchdir(CONFIG_DEFAULT_MODULES_DIR);
-        uname(&uts);
-        xchdir(uts.release);
+        uname(&G.uts);
+        xchdir(G.uts.release);
 
-        if (opt & MODPROBE_OPT_LIST_ONLY) {
+        if (opt & OPT_LIST_ONLY) {
                 char name[MODULE_NAME_LEN];
                 char *colon, *tokens[2];
                 parser_t *p = config_open2(CONFIG_DEFAULT_DEPMOD_FILE, xfopen_for_read);
@@ -521,7 +559,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 logmode = LOGMODE_SYSLOG;
 
         if (!argv[0]) {
-                if (opt & MODPROBE_OPT_REMOVE) {
+                if (opt & OPT_REMOVE) {
                         /* "modprobe -r" (w/o params).
                          * "If name is NULL, all unused modules marked
                          * autoclean will be removed".
@@ -541,7 +579,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 config_close(parser);
         }
 
-        if (opt & (MODPROBE_OPT_INSERT_ALL | MODPROBE_OPT_REMOVE)) {
+        if (opt & (OPT_INSERT_ALL | OPT_REMOVE)) {
                 /* Each argument is a module name */
                 do {
                         DBG("adding module %s", *argv);
@@ -575,7 +613,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                         /* This is not an alias. Literal names are blacklisted
                          * only if '-b' is given.
                          */
-                        if (!(opt & MODPROBE_OPT_BLACKLIST)
+                        if (!(opt & OPT_BLACKLIST)
                          || !(me->flags & MODULE_FLAG_BLACKLISTED)
                         ) {
                                 rc |= do_modprobe(me);
@@ -592,7 +630,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                         m2 = get_or_add_modentry(realname);
                         if (!(m2->flags & MODULE_FLAG_BLACKLISTED)
                          && (!(m2->flags & MODULE_FLAG_LOADED)
-                            || (opt & MODPROBE_OPT_REMOVE))
+                            || (opt & (OPT_REMOVE | OPT_SHOW_DEPS)))
                         ) {
 //TODO: we can pass "me" as 2nd param to do_modprobe,
 //and make do_modprobe emit more meaningful error messages
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index dde77731f..2486511d7 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -35,9 +35,9 @@ int rmmod_main(int argc UNUSED_PARAM, char **argv)
         /* Parse command line. */
         n = getopt32(argv, "wfas"); // -s ignored
         argv += optind;
-        if (n & 1)      // --wait
+        if (n & 1)  // --wait
                 flags &= ~O_NONBLOCK;
-        if (n & 2)      // --force
+        if (n & 2)  // --force
                 flags |= O_TRUNC;
         if (n & 4) {
                 /* Unload _all_ unused modules via NULL delete_module() call */
diff --git a/networking/Config.src b/networking/Config.src
index 6dd7df754..274fcae3a 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -684,29 +684,6 @@ config FEATURE_NTPD_SERVER
           Make ntpd usable as a NTP server. If you disable this option
           ntpd will be usable only as a NTP client.
 
-config PING
-        bool "ping"
-        default y
-        depends on PLATFORM_LINUX
-        help
-          ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
-          elicit an ICMP ECHO_RESPONSE from a host or gateway.
-
-config PING6
-        bool "ping6"
-        default y
-        depends on FEATURE_IPV6 && PING
-        help
-          This will give you a ping that can talk IPv6.
-
-config FEATURE_FANCY_PING
-        bool "Enable fancy ping output"
-        default y
-        depends on PING
-        help
-          Make the output from the ping applet include statistics, and at the
-          same time provide full support for ICMP packets.
-
 config PSCAN
         bool "pscan"
         default y
diff --git a/networking/Kbuild.src b/networking/Kbuild.src
index f41a2df70..944f27be1 100644
--- a/networking/Kbuild.src
+++ b/networking/Kbuild.src
@@ -30,8 +30,6 @@ lib-$(CONFIG_NC)           += nc.o
 lib-$(CONFIG_NETSTAT)      += netstat.o
 lib-$(CONFIG_NSLOOKUP)     += nslookup.o
 lib-$(CONFIG_NTPD)         += ntpd.o
-lib-$(CONFIG_PING)         += ping.o
-lib-$(CONFIG_PING6)        += ping.o
 lib-$(CONFIG_PSCAN)        += pscan.o
 lib-$(CONFIG_ROUTE)        += route.o
 lib-$(CONFIG_SLATTACH)     += slattach.o
diff --git a/networking/arping.c b/networking/arping.c
index f2b12ed04..6f6b59cfb 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -1,10 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- * arping.c - Ping hosts by ARP requests/replies
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Author:      Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
+ * Author: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
  * Busybox port: Nick Fedchik <nick@fedchik.org.ua>
  */
 
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 92d4867aa..8ed31cea2 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -388,7 +388,7 @@ static int process_packet(struct dns_entry *conf_data,
         query_len = strlen(query_string) + 1;
         /* may be unaligned! */
         unaligned_type_class = (void *)(query_string + query_len);
-        query_len += sizeof(unaligned_type_class);
+        query_len += sizeof(*unaligned_type_class);
         /* where to append answer block */
         answb = (void *)(unaligned_type_class + 1);
 
diff --git a/networking/httpd.c b/networking/httpd.c
index c174958e2..fa42d9850 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -231,7 +231,7 @@ struct globals {
         int verbose;            /* must be int (used by getopt32) */
         smallint flg_deny_all;
 
-        unsigned rmt_ip;        /* used for IP-based allow/deny rules */
+        unsigned rmt_ip;        /* used for IP-based allow/deny rules */
         time_t last_mod;
         char *rmt_ip_str;       /* for $REMOTE_ADDR and $REMOTE_PORT */
         const char *bind_addr_or_port;
@@ -267,7 +267,7 @@ struct globals {
 #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
         Htaccess *script_i;     /* config script interpreters */
 #endif
-        char *iobuf;            /* [IOBUF_SIZE] */
+        char *iobuf;            /* [IOBUF_SIZE] */
 #define hdr_buf bb_common_bufsiz1
         char *hdr_ptr;
         int hdr_cnt;
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 3cb1ec858..59df4e80f 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -164,7 +164,7 @@ static char *get_var(const char *id, size_t idlen, struct interface_defn_t *ifd)
         return NULL;
 }
 
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
 static int count_netmask_bits(const char *dotted_quad)
 {
 //      int result;
@@ -195,7 +195,7 @@ static int count_netmask_bits(const char *dotted_quad)
         }
         return result;
 }
-#endif
+# endif
 
 static char *parse(const char *command, struct interface_defn_t *ifd)
 {
@@ -258,17 +258,17 @@ static char *parse(const char *command, struct interface_defn_t *ifd)
                                 varvalue = get_var(command, nextpercent - command, ifd);
 
                                 if (varvalue) {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
                                         /* "hwaddress <class> <address>":
                                          * unlike ifconfig, ip doesnt want <class>
                                          * (usually "ether" keyword). Skip it. */
                                         if (strncmp(command, "hwaddress", 9) == 0) {
                                                 varvalue = skip_whitespace(skip_non_whitespace(varvalue));
                                         }
-#endif
+# endif
                                         addstr(&result, varvalue, strlen(varvalue));
                                 } else {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
                                         /* Sigh...  Add a special case for 'ip' to convert from
                                          * dotted quad to bit count style netmasks.  */
                                         if (strncmp(command, "bnmask", 6) == 0) {
@@ -284,7 +284,7 @@ static char *parse(const char *command, struct interface_defn_t *ifd)
                                                         }
                                                 }
                                         }
-#endif
+# endif
                                         okay[opt_depth - 1] = 0;
                                 }
 
@@ -329,56 +329,64 @@ static int execute(const char *command, struct interface_defn_t *ifd, execfn *ex
         }
         return 1;
 }
-#endif
+
+#endif /* FEATURE_IFUPDOWN_IPV4 || FEATURE_IFUPDOWN_IPV6 */
+
 
 #if ENABLE_FEATURE_IFUPDOWN_IPV6
+
 static int FAST_FUNC loopback_up6(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         int result;
         result = execute("ip addr add ::1 dev %iface%", ifd, exec);
         result += execute("ip link set %iface% up", ifd, exec);
         return ((result == 2) ? 2 : 0);
-#else
+# else
         return execute("ifconfig %iface% add ::1", ifd, exec);
-#endif
+# endif
 }
 
 static int FAST_FUNC loopback_down6(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         return execute("ip link set %iface% down", ifd, exec);
-#else
+# else
         return execute("ifconfig %iface% del ::1", ifd, exec);
-#endif
+# endif
+}
+
+static int FAST_FUNC manual_up_down6(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM)
+{
+        return 1;
 }
 
 static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec);
         result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
         /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
         result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec);
-#else
+# else
         result = execute("ifconfig %iface%[[ media %media%]][[ hw %hwaddress%]][[ mtu %mtu%]] up", ifd, exec);
         result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec);
         result += execute("[[route -A inet6 add ::/0 gw %gateway%]]", ifd, exec);
-#endif
+# endif
         return ((result == 3) ? 3 : 0);
 }
 
 static int FAST_FUNC static_down6(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         return execute("ip link set %iface% down", ifd, exec);
-#else
+# else
         return execute("ifconfig %iface% down", ifd, exec);
-#endif
+# endif
 }
 
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
 static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
@@ -394,14 +402,15 @@ static int FAST_FUNC v4tunnel_down(struct interface_defn_t * ifd, execfn * exec)
 {
         return execute("ip tunnel del %iface%", ifd, exec);
 }
-#endif
+# endif
 
 static const struct method_t methods6[] = {
-#if ENABLE_FEATURE_IFUPDOWN_IP
-        { "v4tunnel", v4tunnel_up, v4tunnel_down, },
-#endif
-        { "static", static_up6, static_down6, },
-        { "loopback", loopback_up6, loopback_down6, },
+# if ENABLE_FEATURE_IFUPDOWN_IP
+        { "v4tunnel" , v4tunnel_up     , v4tunnel_down   , },
+# endif
+        { "static"   , static_up6      , static_down6    , },
+        { "manual"   , manual_up_down6 , manual_up_down6 , },
+        { "loopback" , loopback_up6    , loopback_down6  , },
 };
 
 static const struct address_family_t addr_inet6 = {
@@ -409,43 +418,46 @@ static const struct address_family_t addr_inet6 = {
         ARRAY_SIZE(methods6),
         methods6
 };
+
 #endif /* FEATURE_IFUPDOWN_IPV6 */
 
+
 #if ENABLE_FEATURE_IFUPDOWN_IPV4
+
 static int FAST_FUNC loopback_up(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         int result;
         result = execute("ip addr add 127.0.0.1/8 dev %iface%", ifd, exec);
         result += execute("ip link set %iface% up", ifd, exec);
         return ((result == 2) ? 2 : 0);
-#else
+# else
         return execute("ifconfig %iface% 127.0.0.1 up", ifd, exec);
-#endif
+# endif
 }
 
 static int FAST_FUNC loopback_down(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         int result;
         result = execute("ip addr flush dev %iface%", ifd, exec);
         result += execute("ip link set %iface% down", ifd, exec);
         return ((result == 2) ? 2 : 0);
-#else
+# else
         return execute("ifconfig %iface% 127.0.0.1 down", ifd, exec);
-#endif
+# endif
 }
 
 static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         result = execute("ip addr add %address%/%bnmask%[[ broadcast %broadcast%]] "
                         "dev %iface%[[ peer %pointopoint%]][[ label %label%]]", ifd, exec);
         result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
         result += execute("[[ip route add default via %gateway% dev %iface%]]", ifd, exec);
         return ((result == 3) ? 3 : 0);
-#else
+# else
         /* ifconfig said to set iface up before it processes hw %hwaddress%,
          * which then of course fails. Thus we run two separate ifconfig */
         result = execute("ifconfig %iface%[[ hw %hwaddress%]][[ media %media%]][[ mtu %mtu%]] up",
@@ -455,26 +467,26 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec)
                                 ifd, exec);
         result += execute("[[route add default gw %gateway% %iface%]]", ifd, exec);
         return ((result == 3) ? 3 : 0);
-#endif
+# endif
 }
 
 static int FAST_FUNC static_down(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         result = execute("ip addr flush dev %iface%", ifd, exec);
         result += execute("ip link set %iface% down", ifd, exec);
-#else
+# else
         /* result = execute("[[route del default gw %gateway% %iface%]]", ifd, exec); */
         /* Bringing the interface down deletes the routes in itself.
            Otherwise this fails if we reference 'gateway' when using this from dhcp_down */
         result = 1;
         result += execute("ifconfig %iface% down", ifd, exec);
-#endif
+# endif
         return ((result == 2) ? 2 : 0);
 }
 
-#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+# if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
 struct dhcp_client_t {
         const char *name;
         const char *startcmd;
@@ -500,21 +512,21 @@ static const struct dhcp_client_t ext_dhcp_clients[] = {
                 "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
         },
 };
-#endif /* ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCPC */
+# endif /* FEATURE_IFUPDOWN_EXTERNAL_DHCPC */
 
-#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+# if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
 static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
 {
         unsigned i;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+#  if ENABLE_FEATURE_IFUPDOWN_IP
         /* ip doesn't up iface when it configures it (unlike ifconfig) */
         if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec))
                 return 0;
-#else
+#  else
         /* needed if we have hwaddress on dhcp iface */
         if (!execute("ifconfig %iface%[[ hw %hwaddress%]] up", ifd, exec))
                 return 0;
-#endif
+#  endif
         for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
                 if (exists_execable(ext_dhcp_clients[i].name))
                         return execute(ext_dhcp_clients[i].startcmd, ifd, exec);
@@ -522,31 +534,31 @@ static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
         bb_error_msg("no dhcp clients found");
         return 0;
 }
-#elif ENABLE_UDHCPC
+# elif ENABLE_UDHCPC
 static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+#  if ENABLE_FEATURE_IFUPDOWN_IP
         /* ip doesn't up iface when it configures it (unlike ifconfig) */
         if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec))
                 return 0;
-#else
+#  else
         /* needed if we have hwaddress on dhcp iface */
         if (!execute("ifconfig %iface%[[ hw %hwaddress%]] up", ifd, exec))
                 return 0;
-#endif
+#  endif
         return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid "
                         "-i %iface%[[ -H %hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]",
                         ifd, exec);
 }
-#else
+# else
 static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd UNUSED_PARAM,
                 execfn *exec UNUSED_PARAM)
 {
         return 0; /* no dhcp support */
 }
-#endif
+# endif
 
-#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+# if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
 static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
 {
         int result = 0;
@@ -569,7 +581,7 @@ static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
         result += static_down(ifd, exec);
         return ((result == 3) ? 3 : 0);
 }
-#elif ENABLE_UDHCPC
+# elif ENABLE_UDHCPC
 static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
@@ -586,13 +598,13 @@ static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
         result += static_down(ifd, exec);
         return ((result == 3) ? 3 : 0);
 }
-#else
+# else
 static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd UNUSED_PARAM,
                 execfn *exec UNUSED_PARAM)
 {
         return 0; /* no dhcp support */
 }
-#endif
+# endif
 
 static int FAST_FUNC manual_up_down(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM)
 {
@@ -644,7 +656,8 @@ static const struct address_family_t addr_inet = {
         methods
 };
 
-#endif  /* if ENABLE_FEATURE_IFUPDOWN_IPV4 */
+#endif  /* FEATURE_IFUPDOWN_IPV4 */
+
 
 /* Returns pointer to the next word, or NULL.
  * In 1st case, advances *buf to the word after this one.
diff --git a/networking/inetd.c b/networking/inetd.c
index 7030062b6..fb00c6cd7 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -295,7 +295,7 @@ struct globals {
         struct rlimit rlim_ofile;
         servtab_t *serv_list;
         int global_queuelen;
-        int maxsock;            /* max fd# in allsock, -1: unknown */
+        int maxsock;         /* max fd# in allsock, -1: unknown */
         /* whenever maxsock grows, prev_maxsock is set to new maxsock,
          * but if maxsock is set to -1, prev_maxsock is not changed */
         int prev_maxsock;
@@ -778,6 +778,12 @@ static servtab_t *parse_one_line(void)
         argc = 0;
         while ((arg = token[6+argc]) != NULL && argc < MAXARGV)
                 sep->se_argv[argc++] = xstrdup(arg);
+        /* Some inetd.conf files have no argv's, not even argv[0].
+         * Fix them up.
+         * (Technically, programs can be execed with argv[0] = NULL,
+         * but many programs do not like that at all) */
+        if (argc == 0)
+                sep->se_argv[0] = xstrdup(sep->se_program);
 
         /* catch mixups. "<service> stream udp ..." == wtf */
         if (sep->se_socktype == SOCK_STREAM) {
diff --git a/networking/ip.c b/networking/ip.c
index 7b1e2eb6a..350656cef 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * "ip" utility frontend.
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
 
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index d4aa885c6..acbaa4ac5 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -15,9 +15,9 @@
 /* After libbb.h, because on some systems it needs other includes */
 #include <arpa/inet.h>
 
-#define CLASS_A_NETMASK ntohl(0xFF000000)
-#define CLASS_B_NETMASK ntohl(0xFFFF0000)
-#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
+#define CLASS_A_NETMASK ntohl(0xFF000000)
+#define CLASS_B_NETMASK ntohl(0xFFFF0000)
+#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
 
 static unsigned long get_netmask(unsigned long ipaddr)
 {
diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c
index bf01528c4..59c759b23 100644
--- a/networking/libiproute/ip_parse_common_args.c
+++ b/networking/libiproute/ip_parse_common_args.c
@@ -1,18 +1,15 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ip.c         "ip" utility frontend.
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  */
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 1be03a6c3..397a8ee34 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ipaddress.c          "ip address".
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
- *      Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated
+ * Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated
  */
 
 #include <fnmatch.h>
@@ -20,7 +18,7 @@
 
 #ifndef IFF_LOWER_UP
 /* from linux/if.h */
-#define IFF_LOWER_UP    0x10000         /* driver signals L1 up*/
+#define IFF_LOWER_UP  0x10000  /* driver signals L1 up */
 #endif
 
 struct filter_t {
@@ -365,7 +363,7 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
 
 struct nlmsg_list {
         struct nlmsg_list *next;
-        struct nlmsghdr   h;
+        struct nlmsghdr   h;
 };
 
 static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo)
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index c5ba294aa..82ab979a5 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -1,7 +1,5 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iplink.c "ip link".
- *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
@@ -296,9 +294,9 @@ static int do_change(char **argv, const unsigned rtm)
         };
         struct rtnl_handle rth;
         struct {
-                struct nlmsghdr         n;
-                struct ifinfomsg        i;
-                char                    buf[1024];
+                struct nlmsghdr  n;
+                struct ifinfomsg i;
+                char             buf[1024];
         } req;
         smalluint arg;
         char *name_str = NULL, *link_str = NULL, *type_str = NULL, *dev_str = NULL;
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 1696e6a34..f6071b463 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -1,19 +1,16 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iproute.c            "ip route".
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized
  */
 
-#include "ip_common.h"  /* #include "libbb.h" is inside */
+#include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
 
@@ -327,9 +324,9 @@ IF_FEATURE_IP_RULE(ARG_table,)
         };
         struct rtnl_handle rth;
         struct {
-                struct nlmsghdr         n;
-                struct rtmsg            r;
-                char                    buf[1024];
+                struct nlmsghdr n;
+                struct rtmsg    r;
+                char            buf[1024];
         } req;
         char mxbuf[256];
         struct rtattr * mxrta = (void*)mxbuf;
@@ -791,8 +788,8 @@ static int iproute_get(char **argv)
                                 }
                                 req.r.rtm_dst_len = addr.bitlen;
                         }
-                        argv++;
                 }
+                argv++;
         }
 
         if (req.r.rtm_dst_len == 0) {
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 3af6a83a8..dd3265c7c 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -1,18 +1,15 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iprule.c             "ip rule".
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  * initially integrated into busybox by Bernhard Reutner-Fischer
  */
 
@@ -191,9 +188,9 @@ static int iprule_modify(int cmd, char **argv)
         bool table_ok = 0;
         struct rtnl_handle rth;
         struct {
-                struct nlmsghdr n;
-                struct rtmsg    r;
-                char            buf[1024];
+                struct nlmsghdr n;
+                struct rtmsg    r;
+                char            buf[1024];
         } req;
         smalluint key;
 
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index bce373d05..5942feafc 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -1,16 +1,14 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iptunnel.c          "ip tunnel"
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
- * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit
- * Phil Karn <karn@ka9q.ampr.org>       990408: "pmtudisc" flag
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit
+ * Phil Karn <karn@ka9q.ampr.org>       990408: "pmtudisc" flag
  */
 
 #include <netinet/ip.h>
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index 8da80b2fc..7291ee2f1 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -1,7 +1,5 @@
 /* vi: set sw=4 ts=4: */
 /*
- * RTnetlink service routines.
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version
@@ -74,8 +72,8 @@ int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, in
         struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } };
         struct msghdr msg = {
                 (void*)&nladdr, sizeof(nladdr),
-                iov,    2,
-                NULL,   0,
+                iov,  2,
+                NULL, 0,
                 0
         };
 
@@ -108,8 +106,8 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
 
                 struct msghdr msg = {
                         (void*)&nladdr, sizeof(nladdr),
-                        &iov,   1,
-                        NULL,   0,
+                        &iov, 1,
+                        NULL, 0,
                         0
                 };
 
@@ -214,8 +212,8 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
         char   *buf = xmalloc(8*1024); /* avoid big stack buffer */
         struct msghdr msg = {
                 (void*)&nladdr, sizeof(nladdr),
-                &iov,   1,
-                NULL,   0,
+                &iov, 1,
+                NULL, 0,
                 0
         };
 
diff --git a/networking/libiproute/libnetlink.h b/networking/libiproute/libnetlink.h
index 4e4d5b7b9..51bee2d67 100644
--- a/networking/libiproute/libnetlink.h
+++ b/networking/libiproute/libnetlink.h
@@ -11,11 +11,11 @@
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
 struct rtnl_handle {
-        int                     fd;
-        struct sockaddr_nl      local;
-        struct sockaddr_nl      peer;
-        uint32_t                seq;
-        uint32_t                dump;
+        int                fd;
+        struct sockaddr_nl local;
+        struct sockaddr_nl peer;
+        uint32_t           seq;
+        uint32_t           dump;
 };
 
 extern void xrtnl_open(struct rtnl_handle *rth) FAST_FUNC;
diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index c2c01305d..33a54ea6c 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_addr.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
 #include <net/if_arp.h>
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index 246b9e33a..27cd90f34 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -1,17 +1,14 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_map.c
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
-#include <net/if.h>     /* struct ifreq and co. */
+#include <net/if.h>  /* struct ifreq and co. */
 
 #include "libbb.h"
 #include "libnetlink.h"
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index 1cd576f1d..04925ecf6 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_proto.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
 #include "libbb.h"
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c
index 3861c2870..38b6c0516 100644
--- a/networking/libiproute/ll_types.c
+++ b/networking/libiproute/ll_types.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_types.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 #include <arpa/inet.h>
 #include <linux/if_arp.h>
diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c
index 8dd16e3d3..c474ab903 100644
--- a/networking/libiproute/rt_names.c
+++ b/networking/libiproute/rt_names.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * rt_names.c           rtnetlink names DB.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 #include "libbb.h"
 #include "rt_names.h"
diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c
index 5e358e105..3bab53baf 100644
--- a/networking/libiproute/rtm_map.c
+++ b/networking/libiproute/rtm_map.c
@@ -1,14 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * rtm_map.c
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
 #include "libbb.h"
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c
index 2b646f0ea..d32db8de5 100644
--- a/networking/libiproute/utils.c
+++ b/networking/libiproute/utils.c
@@ -1,14 +1,12 @@
 /* vi: set sw=4 ts=4: */
 /*
- * utils.c
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  */
 
 #include "libbb.h"
diff --git a/networking/libiproute/utils.h b/networking/libiproute/utils.h
index ed03e785a..93c9d25d6 100644
--- a/networking/libiproute/utils.h
+++ b/networking/libiproute/utils.h
@@ -17,14 +17,14 @@ extern smallint oneline;
 extern char _SL_;
 
 #ifndef IPPROTO_ESP
-#define IPPROTO_ESP     50
+#define IPPROTO_ESP  50
 #endif
 #ifndef IPPROTO_AH
-#define IPPROTO_AH      51
+#define IPPROTO_AH  51
 #endif
 
 #define SPRINT_BSIZE 64
-#define SPRINT_BUF(x)   char x[SPRINT_BSIZE]
+#define SPRINT_BUF(x)  char x[SPRINT_BSIZE]
 
 extern void incomplete_command(void) NORETURN;
 
diff --git a/networking/nameif.c b/networking/nameif.c
index 45a3229f4..d02c2c11b 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -21,10 +21,10 @@
 #endif
 
 /* Taken from linux/sockios.h */
-#define SIOCSIFNAME     0x8923  /* set interface name */
+#define SIOCSIFNAME  0x8923  /* set interface name */
 
 /* Octets in one Ethernet addr, from <linux/if_ether.h> */
-#define ETH_ALEN        6
+#define ETH_ALEN     6
 
 #ifndef ifr_newname
 #define ifr_newname ifr_ifru.ifru_slave
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 8594a67a6..e98a5dd5b 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -268,8 +268,7 @@ static int doexec(char **proggie)
         dup2(0, 1);
         /* dup2(0, 2); - do we *really* want this? NO!
          * exec'ed prog can do it yourself, if needed */
-        execvp(proggie[0], proggie);
-        bb_perror_msg_and_die("can't execute '%s'", proggie[0]);
+        BB_EXECVP_or_die(proggie);
 }
 
 /* connect_w_timeout:
@@ -766,7 +765,7 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
         getopt32(argv, "hnp:s:uvw:" IF_NC_SERVER("l")
                         IF_NC_EXTRA("i:o:z"),
                         &str_p, &str_s, &o_wait
-                        IF_NC_EXTRA(, &str_i, &str_o, &o_verbose));
+                        IF_NC_EXTRA(, &str_i, &str_o), &o_verbose);
         argv += optind;
 #if ENABLE_NC_EXTRA
         if (option_mask32 & OPT_i) /* line-interval time */
diff --git a/networking/netstat.c b/networking/netstat.c
index 2a83af3ac..356fb53cb 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -699,7 +699,7 @@ int netstat_main(int argc UNUSED_PARAM, char **argv)
                 flags |= opt;
         }
         if (flags & (NETSTAT_TCP|NETSTAT_UDP|NETSTAT_RAW)) {
-                printf("Active Internet connections "); /* xxx */
+                printf("Active Internet connections "); /* xxx */
 
                 if ((flags & (NETSTAT_LISTENING|NETSTAT_CONNECTED)) == (NETSTAT_LISTENING|NETSTAT_CONNECTED))
                         printf("(servers and established)");
diff --git a/networking/ntpd.c b/networking/ntpd.c
index b7bd239b5..8fe529edb 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -89,7 +89,7 @@
 //UNUSED: #define PANIC_THRESHOLD 1000    /* panic threshold (sec) */
 
 #define FREQ_TOLERANCE  0.000015 /* frequency tolerance (15 PPM) */
-#define BURSTPOLL       0       /* initial poll */
+#define BURSTPOLL       0       /* initial poll */
 #define MINPOLL         5       /* minimum poll interval. std ntpd uses 6 (6: 64 sec) */
 #define BIGPOLL         10      /* drop to lower poll at any trouble (10: 17 min) */
 #define MAXPOLL         12      /* maximum poll interval (12: 1.1h, 17: 36.4h). std ntpd uses 17 */
@@ -865,7 +865,7 @@ fit(peer_t *p, double rd)
                 VERB3 bb_error_msg("peer %s unfit for selection: unreachable", p->p_dotted);
                 return 0;
         }
-#if 0   /* we filter out such packets earlier */
+#if 0 /* we filter out such packets earlier */
         if ((p->lastpkt_status & LI_ALARM) == LI_ALARM
          || p->lastpkt_stratum >= MAXSTRAT
         ) {
@@ -2110,7 +2110,7 @@ direct_freq(double fp_offset)
 }
 
 static void
-set_freq(double freq) /* frequency update */
+set_freq(double freq) /* frequency update */
 {
         char tbuf[80];
 
diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
index 5905e54e9..4ad44e4f3 100644
--- a/networking/ntpd_simple.c
+++ b/networking/ntpd_simple.c
@@ -870,7 +870,7 @@ static NOINLINE void ntp_init(char **argv)
                 int prec = 0;
                 int b;
 # if 0
-                struct timespec tp;
+                struct timespec tp;
                 /* We can use sys_clock_getres but assuming 10ms tick should be fine */
                 clock_getres(CLOCK_REALTIME, &tp);
                 tp.tv_sec = 0;
diff --git a/networking/ping.c b/networking/ping.c
index 3aba4906e..366a98668 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -29,6 +29,93 @@
 #include <netinet/ip_icmp.h>
 #include "libbb.h"
 
+//config:config PING
+//config:       bool "ping"
+//config:       default y
+//config:       depends on PLATFORM_LINUX
+//config:       help
+//config:         ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
+//config:         elicit an ICMP ECHO_RESPONSE from a host or gateway.
+//config:
+//config:config PING6
+//config:       bool "ping6"
+//config:       default y
+//config:       depends on FEATURE_IPV6 && PING
+//config:       help
+//config:         This will give you a ping that can talk IPv6.
+//config:
+//config:config FEATURE_FANCY_PING
+//config:       bool "Enable fancy ping output"
+//config:       default y
+//config:       depends on PING
+//config:       help
+//config:         Make the output from the ping applet include statistics, and at the
+//config:         same time provide full support for ICMP packets.
+
+/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore _BB_SUID_MAYBE: */
+//applet:IF_PING(APPLET(ping, _BB_DIR_BIN, _BB_SUID_MAYBE))
+//applet:IF_PING6(APPLET(ping6, _BB_DIR_BIN, _BB_SUID_MAYBE))
+
+//kbuild:lib-$(CONFIG_PING)  += ping.o
+//kbuild:lib-$(CONFIG_PING6) += ping.o
+
+//usage:#if !ENABLE_FEATURE_FANCY_PING
+//usage:# define ping_trivial_usage
+//usage:       "HOST"
+//usage:# define ping_full_usage "\n\n"
+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts"
+//usage:# define ping6_trivial_usage
+//usage:       "HOST"
+//usage:# define ping6_full_usage "\n\n"
+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts"
+//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:     "\nOptions:"
+//usage:     "\n        -4,-6           Force IP or IPv6 name resolution"
+//usage:     "\n        -c CNT          Send only CNT pings"
+//usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)"
+//usage:     "\n        -t TTL          Set TTL"
+//usage:     "\n        -I IFACE/IP     Use interface or IP address as source"
+//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 displays output at start"
+//usage:     "\n                        and when finished"
+//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:     "\nOptions:"
+//usage:     "\n        -c CNT          Send only CNT pings"
+//usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)"
+//usage:     "\n        -I IFACE/IP     Use interface or IP address as source"
+//usage:     "\n        -q              Quiet, only displays output at start"
+//usage:     "\n                        and when finished"
+//usage:
+//usage:#endif
+//usage:
+//usage:#define ping_example_usage
+//usage:       "$ ping localhost\n"
+//usage:       "PING slag (127.0.0.1): 56 data bytes\n"
+//usage:       "64 bytes from 127.0.0.1: icmp_seq=0 ttl=255 time=20.1 ms\n"
+//usage:       "\n"
+//usage:       "--- debian ping statistics ---\n"
+//usage:       "1 packets transmitted, 1 packets received, 0% packet loss\n"
+//usage:       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
+//usage:#define ping6_example_usage
+//usage:       "$ ping6 ip6-localhost\n"
+//usage:       "PING ip6-localhost (::1): 56 data bytes\n"
+//usage:       "64 bytes from ::1: icmp6_seq=0 ttl=64 time=20.1 ms\n"
+//usage:       "\n"
+//usage:       "--- ip6-localhost ping statistics ---\n"
+//usage:       "1 packets transmitted, 1 packets received, 0% packet loss\n"
+//usage:       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
+
 #if ENABLE_PING6
 # include <netinet/icmp6.h>
 /* I see RENUMBERED constants in bits/in.h - !!?
@@ -223,17 +310,18 @@ static int common_ping_main(sa_family_t af, char **argv)
 
 /* Full(er) version */
 
-#define OPT_STRING ("qvc:s:w:W:I:4" IF_PING6("6"))
+#define OPT_STRING ("qvc:s:t:w:W:I:4" IF_PING6("6"))
 enum {
         OPT_QUIET = 1 << 0,
         OPT_VERBOSE = 1 << 1,
         OPT_c = 1 << 2,
         OPT_s = 1 << 3,
-        OPT_w = 1 << 4,
-        OPT_W = 1 << 5,
-        OPT_I = 1 << 6,
-        OPT_IPV4 = 1 << 7,
-        OPT_IPV6 = (1 << 8) * ENABLE_PING6,
+        OPT_t = 1 << 4,
+        OPT_w = 1 << 5,
+        OPT_W = 1 << 6,
+        OPT_I = 1 << 7,
+        OPT_IPV4 = 1 << 8,
+        OPT_IPV6 = (1 << 9) * ENABLE_PING6,
 };
 
 
@@ -244,6 +332,7 @@ struct globals {
         len_and_sockaddr *source_lsa;
         unsigned datalen;
         unsigned pingcount; /* must be int-sized */
+        unsigned opt_ttl;
         unsigned long ntransmitted, nreceived, nrepeats;
         uint16_t myid;
         unsigned tmin, tmax; /* in us */
@@ -275,6 +364,7 @@ struct globals {
 #define nreceived    (G.nreceived   )
 #define nrepeats     (G.nrepeats    )
 #define pingcount    (G.pingcount   )
+#define opt_ttl      (G.opt_ttl     )
 #define myid         (G.myid        )
 #define tmin         (G.tmin        )
 #define tmax         (G.tmax        )
@@ -586,6 +676,12 @@ static void ping4(len_and_sockaddr *lsa)
         sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */
         setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt));
 
+        if (opt_ttl != 0) {
+                setsockopt(pingsock, IPPROTO_IP, IP_TTL, &opt_ttl, sizeof(opt_ttl));
+                /* above doesnt affect packets sent to bcast IP, so... */
+                setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, &opt_ttl, sizeof(opt_ttl));
+        }
+
         signal(SIGINT, print_stats_and_exit);
 
         /* start the ping's going ... */
@@ -735,9 +831,9 @@ static int common_ping_main(int opt, char **argv)
 
         INIT_G();
 
-        /* exactly one argument needed; -v and -q don't mix; -c NUM, -w NUM, -W NUM */
-        opt_complementary = "=1:q--v:v--q:c+:w+:W+";
-        opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &deadline, &timeout, &str_I);
+        /* exactly one argument needed; -v and -q don't mix; -c NUM, -t NUM, -w NUM, -W NUM */
+        opt_complementary = "=1:q--v:v--q:c+:t+:w+:W+";
+        opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I);
         if (opt & OPT_s)
                 datalen = xatou16(str_s); // -s
         if (opt & OPT_I) { // -I
diff --git a/networking/slattach.c b/networking/slattach.c
index 921ec552d..71edd2f27 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -134,9 +134,9 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
         int i, encap, opt;
         struct termios state;
         const char *proto = "cslip";
-        const char *extcmd;                             /* Command to execute after hangup */
+        const char *extcmd;   /* Command to execute after hangup */
         const char *baud_str;
-        int baud_code = -1;                             /* Line baud rate (system code) */
+        int baud_code = -1;   /* Line baud rate (system code) */
 
         enum {
                 OPT_p_proto  = 1 << 0,
diff --git a/networking/tc.c b/networking/tc.c
index 9242741e4..2e2473a70 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -1,7 +1,5 @@
 /* vi: set sw=4 ts=4: */
 /*
- * "tc" utility frontend.
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
diff --git a/networking/telnet.c b/networking/telnet.c
index 12d1970fa..f6fad684c 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -42,11 +42,13 @@ enum {
         UF_ECHO = 0x01,
         UF_SGA = 0x02,
 
-        TS_0 = 1,
+        TS_NORMAL = 0,
+        TS_COPY = 1,
         TS_IAC = 2,
         TS_OPT = 3,
         TS_SUB1 = 4,
         TS_SUB2 = 5,
+        TS_CR = 6,
 };
 
 typedef unsigned char byte;
@@ -83,13 +85,13 @@ struct globals {
         }; \
 } while (0)
 
-/* Function prototypes */
+
 static void rawmode(void);
 static void cookmode(void);
 static void do_linemode(void);
 static void will_charmode(void);
 static void telopt(byte c);
-static int subneg(byte c);
+static void subneg(byte c);
 
 static void iac_flush(void)
 {
@@ -170,24 +172,24 @@ static void handle_net_output(int len)
          * So I implemented it. It's really useful for me. I hope that
          * other people will find it interesting too.
          */
-
-        int i, j;
+        byte outbuf[2 * DATABUFSIZE];
         byte *p = (byte*)G.buf;
-        byte outbuf[4*DATABUFSIZE];
+        int j = 0;
 
-        for (i = len, j = 0; i > 0; i--, p++) {
-                if (*p == 0x1d) {
+        for (; len > 0; len--, p++) {
+                byte c = *p;
+                if (c == 0x1d) {
                         con_escape();
                         return;
                 }
-                outbuf[j++] = *p;
-                if (*p == 0xff)
-                        outbuf[j++] = 0xff;
-                else if (*p == 0x0d)
-                        outbuf[j++] = 0x00;
+                outbuf[j++] = c;
+                if (c == IAC)
+                        outbuf[j++] = c; /* IAC -> IAC IAC */
+                else if (c == '\r')
+                        outbuf[j++] = '\0'; /* CR -> CR NUL */
         }
         if (j > 0)
-                write(netfd, outbuf, j);
+                full_write(netfd, outbuf, j);
 }
 
 static void handle_net_input(int len)
@@ -198,25 +200,44 @@ static void handle_net_input(int len)
         for (i = 0; i < len; i++) {
                 byte c = G.buf[i];
 
-                if (G.telstate == 0) { /* most of the time state == 0 */
+                if (G.telstate == TS_NORMAL) { /* most typical state */
                         if (c == IAC) {
                                 cstart = i;
                                 G.telstate = TS_IAC;
                         }
+                        else if (c == '\r') {
+                                cstart = i + 1;
+                                G.telstate = TS_CR;
+                        }
+                        /* No IACs were seen so far, no need to copy
+                         * bytes within G.buf: */
                         continue;
                 }
+
                 switch (G.telstate) {
-                case TS_0:
+                case TS_CR:
+                        /* Prev char was CR. If cur one is NUL, ignore it.
+                         * See RFC 1123 section 3.3.1 for discussion of telnet EOL handling.
+                         */
+                        G.telstate = TS_COPY;
+                        if (c == '\0')
+                                break;
+                        /* else: fall through - need to handle CR IAC ... properly */
+
+                case TS_COPY: /* Prev char was ordinary */
+                        /* Similar to NORMAL, but in TS_COPY we need to copy bytes */
                         if (c == IAC)
                                 G.telstate = TS_IAC;
                         else
                                 G.buf[cstart++] = c;
+                        if (c == '\r')
+                                G.telstate = TS_CR;
                         break;
 
-                case TS_IAC:
-                        if (c == IAC) { /* IAC IAC -> 0xFF */
+                case TS_IAC: /* Prev char was IAC */
+                        if (c == IAC) { /* IAC IAC -> one IAC */
                                 G.buf[cstart++] = c;
-                                G.telstate = TS_0;
+                                G.telstate = TS_COPY;
                                 break;
                         }
                         /* else */
@@ -228,34 +249,38 @@ static void handle_net_input(int len)
                         case DONT:
                         case WILL:
                         case WONT:
-                                G.telwish =  c;
+                                G.telwish = c;
                                 G.telstate = TS_OPT;
                                 break;
+                        /* DATA MARK must be added later */
                         default:
-                                G.telstate = TS_0;      /* DATA MARK must be added later */
+                                G.telstate = TS_COPY;
                         }
                         break;
-                case TS_OPT: /* WILL, WONT, DO, DONT */
+
+                case TS_OPT: /* Prev chars were IAC WILL/WONT/DO/DONT */
                         telopt(c);
-                        G.telstate = TS_0;
+                        G.telstate = TS_COPY;
                         break;
+
                 case TS_SUB1: /* Subnegotiation */
                 case TS_SUB2: /* Subnegotiation */
-                        if (subneg(c))
-                                G.telstate = TS_0;
+                        subneg(c); /* can change G.telstate */
                         break;
                 }
         }
-        if (G.telstate) {
+
+        if (G.telstate != TS_NORMAL) {
+                /* We had some IACs, or CR */
                 if (G.iaclen)
                         iac_flush();
-                if (G.telstate == TS_0)
-                        G.telstate = 0;
+                if (G.telstate == TS_COPY) /* we aren't in the middle of IAC */
+                        G.telstate = TS_NORMAL;
                 len = cstart;
         }
 
         if (len)
-                write(STDOUT_FILENO, G.buf, len);
+                full_write(STDOUT_FILENO, G.buf, len);
 }
 
 static void put_iac(int c)
@@ -495,7 +520,7 @@ static void telopt(byte c)
 }
 
 /* subnegotiation -- ignore all (except TTYPE,NAWS) */
-static int subneg(byte c)
+static void subneg(byte c)
 {
         switch (G.telstate) {
         case TS_SUB1:
@@ -513,12 +538,13 @@ static int subneg(byte c)
 #endif
                 break;
         case TS_SUB2:
-                if (c == SE)
-                        return TRUE;
+                if (c == SE) {
+                        G.telstate = TS_COPY;
+                        return;
+                }
                 G.telstate = TS_SUB1;
-                /* break; */
+                break;
         }
-        return FALSE;
 }
 
 static void rawmode(void)
@@ -533,21 +559,13 @@ static void cookmode(void)
                 tcsetattr(0, TCSADRAIN, &G.termios_def);
 }
 
-/* poll gives smaller (-70 bytes) code */
-#define USE_POLL 1
-
 int telnet_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int telnet_main(int argc UNUSED_PARAM, char **argv)
 {
         char *host;
         int port;
         int len;
-#ifdef USE_POLL
         struct pollfd ufds[2];
-#else
-        fd_set readfds;
-        int maxfd;
-#endif
 
         INIT_G();
 
@@ -585,63 +603,39 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
 
         signal(SIGINT, record_signo);
 
-#ifdef USE_POLL
-        ufds[0].fd = 0; ufds[1].fd = netfd;
-        ufds[0].events = ufds[1].events = POLLIN;
-#else
-        FD_ZERO(&readfds);
-        FD_SET(STDIN_FILENO, &readfds);
-        FD_SET(netfd, &readfds);
-        maxfd = netfd + 1;
-#endif
+        ufds[0].fd = STDIN_FILENO;
+        ufds[0].events = POLLIN;
+        ufds[1].fd = netfd;
+        ufds[1].events = POLLIN;
 
         while (1) {
-#ifndef USE_POLL
-                fd_set rfds = readfds;
-
-                switch (select(maxfd, &rfds, NULL, NULL, NULL))
-#else
-                switch (poll(ufds, 2, -1))
-#endif
-                {
-                case 0:
-                        /* timeout */
-                case -1:
+                if (poll(ufds, 2, -1) < 0) {
                         /* error, ignore and/or log something, bay go to loop */
                         if (bb_got_signal)
                                 con_escape();
                         else
                                 sleep(1);
-                        break;
-                default:
+                        continue;
+                }
 
-#ifdef USE_POLL
-                        if (ufds[0].revents)
-#else
-                        if (FD_ISSET(STDIN_FILENO, &rfds))
-#endif
-                        {
-                                len = safe_read(STDIN_FILENO, G.buf, DATABUFSIZE);
-                                if (len <= 0)
-                                        doexit(EXIT_SUCCESS);
-                                TRACE(0, ("Read con: %d\n", len));
-                                handle_net_output(len);
-                        }
+// FIXME: reads can block. Need full bidirectional buffering.
 
-#ifdef USE_POLL
-                        if (ufds[1].revents)
-#else
-                        if (FD_ISSET(netfd, &rfds))
-#endif
-                        {
-                                len = safe_read(netfd, G.buf, DATABUFSIZE);
-                                if (len <= 0) {
-                                        full_write1_str("Connection closed by foreign host\r\n");
-                                        doexit(EXIT_FAILURE);
-                                }
-                                TRACE(0, ("Read netfd (%d): %d\n", netfd, len));
-                                handle_net_input(len);
+                if (ufds[0].revents) {
+                        len = safe_read(STDIN_FILENO, G.buf, DATABUFSIZE);
+                        if (len <= 0)
+                                doexit(EXIT_SUCCESS);
+                        TRACE(0, ("Read con: %d\n", len));
+                        handle_net_output(len);
+                }
+
+                if (ufds[1].revents) {
+                        len = safe_read(netfd, G.buf, DATABUFSIZE);
+                        if (len <= 0) {
+                                full_write1_str("Connection closed by foreign host\r\n");
+                                doexit(EXIT_FAILURE);
                         }
+                        TRACE(0, ("Read netfd (%d): %d\n", netfd, len));
+                        handle_net_input(len);
                 }
         } /* while (1) */
 }
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 5c011e15d..07c6a6a73 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -141,7 +141,7 @@ remove_iacs(struct tsession *ts, int *pnum_totty)
                 if (ptr[1] == SB && ptr[2] == TELOPT_NAWS) {
                         struct winsize ws;
                         if ((ptr+8) >= end)
-                                break;  /* incomplete, can't process */
+                                break;  /* incomplete, can't process */
                         ws.ws_col = (ptr[3] << 8) | ptr[4];
                         ws.ws_row = (ptr[5] << 8) | ptr[6];
                         ioctl(ts->ptyfd, TIOCSWINSZ, (char *)&ws);
@@ -273,8 +273,8 @@ make_new_session(
                 static const char iacs_to_send[] ALIGN1 = {
                         IAC, DO, TELOPT_ECHO,
                         IAC, DO, TELOPT_NAWS,
-                /* This requires telnetd.ctrlSQ.patch (incomplete) */
-                /*      IAC, DO, TELOPT_LFLOW, */
+                        /* This requires telnetd.ctrlSQ.patch (incomplete) */
+                        /*IAC, DO, TELOPT_LFLOW,*/
                         IAC, WILL, TELOPT_ECHO,
                         IAC, WILL, TELOPT_SGA
                 };
@@ -314,6 +314,8 @@ make_new_session(
         /* Restore default signal handling ASAP */
         bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL);
 
+        pid = getpid();
+
         if (ENABLE_FEATURE_UTMP) {
                 len_and_sockaddr *lsa = get_peer_lsa(sock);
                 char *hostname = NULL;
@@ -335,7 +337,6 @@ make_new_session(
         xopen(tty_name, O_RDWR); /* becomes our ctty */
         xdup2(0, 1);
         xdup2(0, 2);
-        pid = getpid();
         tcsetpgrp(0, pid); /* switch this tty's process group to us */
 
         /* The pseudo-terminal allocated to the client is configured to operate
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 78aabedf2..7e5ab61fd 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -926,6 +926,10 @@ static void client_background(void)
 //usage:     "\n        -v              Verbose"
 //usage:        )
 //usage:        )
+//usage:     "\nSignals:"
+//usage:     "\n        USR1    Renew current lease"
+//usage:     "\n        USR2    Release current lease"
+
 
 int udhcpc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int udhcpc_main(int argc UNUSED_PARAM, char **argv)
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index a015cf038..6fb48a19a 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -133,7 +133,10 @@ static uint32_t select_lease_time(struct dhcp_packet *packet)
 
 /* We got a DHCP DISCOVER. Send an OFFER. */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE void send_offer(struct dhcp_packet *oldpacket, uint32_t static_lease_nip, struct dyn_lease *lease)
+static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
+                uint32_t static_lease_nip,
+                struct dyn_lease *lease,
+                uint8_t *requested_ip_opt)
 {
         struct dhcp_packet packet;
         uint32_t lease_time_sec;
@@ -147,7 +150,6 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket, uint32_t static_l
         if (!static_lease_nip) {
                 /* We have no static lease for client's chaddr */
                 uint32_t req_nip;
-                uint8_t *req_ip_opt;
                 const char *p_host_name;
 
                 if (lease) {
@@ -158,9 +160,9 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket, uint32_t static_l
                         packet.yiaddr = lease->lease_nip;
                 }
                 /* Or: if client has requested an IP */
-                else if ((req_ip_opt = udhcp_get_option(oldpacket, DHCP_REQUESTED_IP)) != NULL
+                else if (requested_ip_opt != NULL
                  /* (read IP) */
-                 && (move_from_unaligned32(req_nip, req_ip_opt), 1)
+                 && (move_from_unaligned32(req_nip, requested_ip_opt), 1)
                  /* and the IP is in the lease range */
                  && ntohl(req_nip) >= server_config.start_ip
                  && ntohl(req_nip) <= server_config.end_ip
@@ -283,16 +285,12 @@ struct dyn_lease *g_leases;
 int udhcpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 {
-        fd_set rfds;
         int server_socket = -1, retval, max_sock;
-        struct dhcp_packet packet;
         uint8_t *state;
-        uint32_t static_lease_nip;
         unsigned timeout_end;
         unsigned num_ips;
         unsigned opt;
         struct option_set *option;
-        struct dyn_lease *lease, fake_lease;
         IF_FEATURE_UDHCP_PORT(char *str_P;)
 
 #if ENABLE_FEATURE_UDHCP_PORT
@@ -372,11 +370,15 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 
         timeout_end = monotonic_sec() + server_config.auto_time;
         while (1) { /* loop until universe collapses */
+                fd_set rfds;
+                struct dhcp_packet packet;
                 int bytes;
                 struct timeval tv;
                 uint8_t *server_id_opt;
-                uint8_t *requested_opt;
+                uint8_t *requested_ip_opt;
                 uint32_t requested_nip = requested_nip; /* for compiler */
+                uint32_t static_lease_nip;
+                struct dyn_lease *lease, fake_lease;
 
                 if (server_socket < 0) {
                         server_socket = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT,
@@ -443,6 +445,18 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         continue;
                 }
 
+                /* Get SERVER_ID if present */
+                server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID);
+                if (server_id_opt) {
+                        uint32_t server_id_network_order;
+                        move_from_unaligned32(server_id_network_order, server_id_opt);
+                        if (server_id_network_order != server_config.server_nip) {
+                                /* client talks to somebody else */
+                                log1("server ID doesn't match, ignoring");
+                                continue;
+                        }
+                }
+
                 /* Look for a static/dynamic lease */
                 static_lease_nip = get_static_nip_by_mac(server_config.static_leases, &packet.chaddr);
                 if (static_lease_nip) {
@@ -455,20 +469,10 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         lease = find_lease_by_mac(packet.chaddr);
                 }
 
-                /* Get REQUESTED_IP and SERVER_ID if present */
-                server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID);
-                if (server_id_opt) {
-                        uint32_t server_id_net;
-                        move_from_unaligned32(server_id_net, server_id_opt);
-                        if (server_id_net != server_config.server_nip) {
-                                /* client talks to somebody else */
-                                log1("server ID doesn't match, ignoring");
-                                continue;
-                        }
-                }
-                requested_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP);
-                if (requested_opt) {
-                        move_from_unaligned32(requested_nip, requested_opt);
+                /* Get REQUESTED_IP if present */
+                requested_ip_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP);
+                if (requested_ip_opt) {
+                        move_from_unaligned32(requested_nip, requested_ip_opt);
                 }
 
                 switch (state[0]) {
@@ -476,7 +480,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 case DHCPDISCOVER:
                         log1("Received DISCOVER");
 
-                        send_offer(&packet, static_lease_nip, lease);
+                        send_offer(&packet, static_lease_nip, lease, requested_ip_opt);
                         break;
 
                 case DHCPREQUEST:
@@ -567,7 +571,7 @@ o DHCPREQUEST generated during REBINDING state:
    A DHCP server MAY extend a client's lease only if it has local
    administrative authority to do so.
 */
-                        if (!requested_opt) {
+                        if (!requested_ip_opt) {
                                 requested_nip = packet.ciaddr;
                                 if (requested_nip == 0) {
                                         log1("no requested IP and no ciaddr, ignoring");
@@ -580,11 +584,15 @@ o DHCPREQUEST generated during REBINDING state:
                                 send_ACK(&packet, lease->lease_nip);
                                 break;
                         }
-                        if (server_id_opt) {
-                                /* client was talking specifically to us.
-                                 * "No, we don't have this IP for you". */
+                        /* No lease for this MAC, or lease IP != requested IP */
+
+                        if (server_id_opt    /* client is in SELECTING state */
+                         || requested_ip_opt /* client is in INIT-REBOOT state */
+                        ) {
+                                /* "No, we don't have this IP for you" */
                                 send_NAK(&packet);
-                        }
+                        } /* else: client is in RENEWING or REBINDING, do not answer */
+
                         break;
 
                 case DHCPDECLINE:
@@ -603,7 +611,7 @@ o DHCPREQUEST generated during REBINDING state:
                          */
                         log1("Received DECLINE");
                         if (server_id_opt
-                         && requested_opt
+                         && requested_ip_opt
                          && lease  /* chaddr matches this lease */
                          && requested_nip == lease->lease_nip
                         ) {
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 1f574d2ad..13c65ad78 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -47,8 +47,8 @@ struct vlan_ioctl_args {
         short vlan_qos;
 };
 
-#define VLAN_GROUP_ARRAY_LEN 4096
-#define SIOCSIFVLAN     0x8983          /* Set 802.1Q VLAN options */
+#define VLAN_GROUP_ARRAY_LEN  4096
+#define SIOCSIFVLAN           0x8983  /* Set 802.1Q VLAN options */
 
 /* On entry, table points to the length of the current string
  * plus NUL terminator plus data length for the subsequent entry.
diff --git a/networking/wget.c b/networking/wget.c
index 5b0907e11..16594c9bf 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  *
  * Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org>
- *   Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
+ * Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
  */
 #include "libbb.h"
 
@@ -48,7 +48,7 @@ struct BUG_G_too_big {
 /* Must match option string! */
 enum {
         WGET_OPT_CONTINUE   = (1 << 0),
-        WGET_OPT_SPIDER     = (1 << 1),
+        WGET_OPT_SPIDER     = (1 << 1),
         WGET_OPT_QUIET      = (1 << 2),
         WGET_OPT_OUTNAME    = (1 << 3),
         WGET_OPT_PREFIX     = (1 << 4),
@@ -786,7 +786,7 @@ However, in real world it was observed that some web servers
 */
                 case 204:
                         break;
-                case 300:       /* redirection */
+                case 300:  /* redirection */
                 case 301:
                 case 302:
                 case 303:
diff --git a/procps/Config.src b/procps/Config.src
index 1ff6dfd30..cf664eeb2 100644
--- a/procps/Config.src
+++ b/procps/Config.src
@@ -46,12 +46,6 @@ config KILLALL5
         default y
         depends on KILL
 
-config NMETER
-        bool "nmeter"
-        default y
-        help
-          Prints selected system stats continuously, one line per update.
-
 config PGREP
         bool "pgrep"
         default y
@@ -192,11 +186,12 @@ config FEATURE_TOPMEM
           Enable 's' in top (gives lots of memory info).
 
 config FEATURE_SHOW_THREADS
-        bool "Support for showing threads in ps/top"
+        bool "Support for showing threads in ps/pstree/top"
         default y
-        depends on PS || TOP
+        depends on PS || TOP || PSTREE
         help
-          Enables ps -T option and 'h' command in top
+          Enables the ps -T option, showing of threads in pstree,
+          and 'h' command in top.
 
 config UPTIME
         bool "uptime"
diff --git a/procps/Kbuild.src b/procps/Kbuild.src
index 791d65670..89b1cc094 100644
--- a/procps/Kbuild.src
+++ b/procps/Kbuild.src
@@ -11,7 +11,6 @@ lib-$(CONFIG_FREE)	+= free.o
 lib-$(CONFIG_FUSER)     += fuser.o
 lib-$(CONFIG_KILL)      += kill.o
 lib-$(CONFIG_ASH)       += kill.o  # used for built-in kill by ash
-lib-$(CONFIG_NMETER)    += nmeter.o
 lib-$(CONFIG_PGREP)     += pgrep.o
 lib-$(CONFIG_PKILL)     += pgrep.o
 lib-$(CONFIG_PIDOF)     += pidof.o
diff --git a/procps/iostat.c b/procps/iostat.c
index 5d829861e..a9ff13a05 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -18,14 +18,14 @@
 //config:         Report CPU and I/O statistics
 
 #include "libbb.h"
-#include <sys/utsname.h>        /* Need struct utsname */
+#include <sys/utsname.h>  /* Need struct utsname */
 
 //#define debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
 #define debug(fmt, ...) ((void)0)
 
-#define MAX_DEVICE_NAME         12
-#define CURRENT                         0
-#define LAST                            1
+#define MAX_DEVICE_NAME 12
+#define CURRENT          0
+#define LAST             1
 
 #if 1
 typedef unsigned long long cputime_t;
@@ -327,7 +327,7 @@ static void do_disk_statistics(cputime_t itv)
         int i = 0;
         char buf[128];
         unsigned major, minor;
-        unsigned long wr_ops, dummy;    /* %*lu for suppres the conversion wouldn't work */
+        unsigned long wr_ops, dummy; /* %*lu for suppress the conversion wouldn't work */
         unsigned long long rd_sec_or_wr_ops;
         unsigned long long rd_sec_or_dummy, wr_sec_or_dummy, wr_sec;
         struct stats_dev sd;
diff --git a/procps/mpstat.c b/procps/mpstat.c
index f1a0b00b8..25efedf62 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -18,7 +18,7 @@
 //config:         Per-processor statistics
 
 #include "libbb.h"
-#include <sys/utsname.h>        /* struct utsname */
+#include <sys/utsname.h>  /* struct utsname */
 
 //#define debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
 #define debug(fmt, ...) ((void)0)
@@ -634,7 +634,7 @@ static void get_irqs_from_interrupts(const char *fname,
         while (irq < irqs_per_cpu) {
                 /* Number of interrupts per CPU has changed */
                 ic = &per_cpu_stats[current][irq];
-                ic->irq_name[0] = '\0'; /* False interrupt */
+                ic->irq_name[0] = '\0'; /* False interrupt */
                 irq++;
         }
 }
@@ -820,7 +820,7 @@ static int get_irqcpu_nr(const char *f, int max_irqs)
         unsigned irq;
 
         fp = fopen_for_read(f);
-        if (!fp)                /* No interrupts file */
+        if (!fp)  /* No interrupts file */
                 return 0;
 
         linelen = INTERRUPTS_LINE + 16 * G.cpu_nr;
@@ -858,10 +858,10 @@ int mpstat_main(int UNUSED_PARAM argc, char **argv)
         char *opt_set_cpu;
         int i, opt;
         enum {
-                OPT_ALL    = 1 << 0,    /* -A */
-                OPT_INTS   = 1 << 1,    /* -I */
-                OPT_SETCPU = 1 << 2,    /* -P */
-                OPT_UTIL   = 1 << 3,    /* -u */
+                OPT_ALL    = 1 << 0, /* -A */
+                OPT_INTS   = 1 << 1, /* -I */
+                OPT_SETCPU = 1 << 2, /* -P */
+                OPT_UTIL   = 1 << 3, /* -u */
         };
 
         /* Dont buffer data if redirected to a pipe */
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 7836a90d5..ac019eb53 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -6,6 +6,40 @@
  * Contact me: vda.linux@googlemail.com
  */
 
+//config:config NMETER
+//config:       bool "nmeter"
+//config:       default y
+//config:       help
+//config:         Prints selected system stats continuously, one line per update.
+
+//applet:IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_NMETER) += nmeter.o
+
+//usage:#define nmeter_trivial_usage
+//usage:       "[-d MSEC] FORMAT_STRING"
+//usage:#define nmeter_full_usage "\n\n"
+//usage:       "Monitor system in real time"
+//usage:     "\n"
+//usage:     "\n -d MSEC        Milliseconds between updates (default:1000)"
+//usage:     "\n"
+//usage:     "\nFormat specifiers:"
+//usage:     "\n %Nc or %[cN]   Monitor CPU. N - bar size (default:10)"
+//usage:     "\n                (displays: S:system U:user N:niced D:iowait I:irq i:softirq)"
+//usage:     "\n %[niface]      Monitor network interface 'iface'"
+//usage:     "\n %m             Monitor allocated memory"
+//usage:     "\n %[mf]          Monitor free memory"
+//usage:     "\n %[mt]          Monitor total memory"
+//usage:     "\n %s             Monitor allocated swap"
+//usage:     "\n %f             Monitor number of used file descriptors"
+//usage:     "\n %Ni            Monitor total/specific IRQ rate"
+//usage:     "\n %x             Monitor context switch rate"
+//usage:     "\n %p             Monitor forks"
+//usage:     "\n %[pn]          Monitor # of processes"
+//usage:     "\n %b             Monitor block io"
+//usage:     "\n %Nt            Show time (with N decimal points)"
+//usage:     "\n %r             Print <cr> instead of <lf> at EOL"
+
 //TODO:
 // simplify code
 // /proc/locks
@@ -769,6 +803,7 @@ static void FAST_FUNC collect_info(s_stat *s)
 
 typedef s_stat* init_func(const char *param);
 
+// Deprecated %NNNd is to be removed, -d MSEC supersedes it
 static const char options[] ALIGN1 = "ncmsfixptbdr";
 static init_func *const init_functions[] = {
         init_if,
@@ -792,23 +827,28 @@ int nmeter_main(int argc UNUSED_PARAM, char **argv)
         s_stat *first = NULL;
         s_stat *last = NULL;
         s_stat *s;
+        char *opt_d;
         char *cur, *prev;
 
         INIT_G();
 
         xchdir("/proc");
 
-        if (!argv[1])
-                bb_show_usage();
-
         if (open_read_close("version", buf, sizeof(buf)-1) > 0) {
                 buf[sizeof(buf)-1] = '\0';
                 is26 = (strstr(buf, " 2.4.") == NULL);
         }
 
-        // Can use argv[1] directly, but this will mess up
+        if (getopt32(argv, "d:", &opt_d))
+                init_delay(opt_d);
+        argv += optind;
+
+        if (!argv[0])
+                bb_show_usage();
+
+        // Can use argv[0] directly, but this will mess up
         // parameters as seen by e.g. ps. Making a copy...
-        cur = xstrdup(argv[1]);
+        cur = xstrdup(argv[0]);
         while (1) {
                 char *param, *p;
                 prev = cur;
diff --git a/procps/powertop.c b/procps/powertop.c
index 250da817b..2f977a03b 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -169,7 +169,7 @@ static void read_cstate_counts(ullong *usage, ullong *duration)
                 if (len < 3 || len > BIG_SYSNAME_LEN)
                         continue;
 
-                sprintf(buf, "/proc/acpi/processor/%s/power", d->d_name);
+                sprintf(buf, "%s/%s/power", "/proc/acpi/processor", d->d_name);
                 fp = fopen_for_read(buf);
                 if (!fp)
                         continue;
@@ -321,31 +321,18 @@ static void process_irq_counts(void)
                 /*  0:  143646045  153901007   IO-APIC-edge      timer
                  *   ^
                  */
+                *p = '\0';
                 /* Deal with non-maskable interrupts -- make up fake numbers */
-                nr = -1;
-                if (buf[0] != ' ' && !isdigit(buf[0])) {
-//TODO: optimize
-                        if (strncmp(buf, "NMI:", 4) == 0)
-                                nr = 20000;
-                        if (strncmp(buf, "RES:", 4) == 0)
-                                nr = 20001;
-                        if (strncmp(buf, "CAL:", 4) == 0)
-                                nr = 20002;
-                        if (strncmp(buf, "TLB:", 4) == 0)
-                                nr = 20003;
-                        if (strncmp(buf, "TRM:", 4) == 0)
-                                nr = 20004;
-                        if (strncmp(buf, "THR:", 4) == 0)
-                                nr = 20005;
-                        if (strncmp(buf, "SPU:", 4) == 0)
-                                nr = 20006;
+                nr = index_in_strings("NMI\0RES\0CAL\0TLB\0TRM\0THR\0SPU\0", buf);
+                if (nr >= 0) {
+                        nr += 20000;
                 } else {
                         /* bb_strtou doesn't eat leading spaces, using strtoul */
+                        errno = 0;
                         nr = strtoul(buf, NULL, 10);
+                        if (errno)
+                                continue;
                 }
-                if (nr == -1)
-                        continue;
-
                 p++;
                 /*  0:  143646045  153901007   IO-APIC-edge      timer
                  *    ^
@@ -412,6 +399,7 @@ static NOINLINE int process_timer_stats(void)
         buf[0] = '\0';
         totalticks = 0;
 
+        n = 0;
         fp = NULL;
         if (!G.cant_enable_timer_stats)
                 fp = fopen_for_read("/proc/timer_stats");
@@ -430,33 +418,41 @@ static NOINLINE int process_timer_stats(void)
                 while (fgets(buf, sizeof(buf), fp)) {
                         const char *count, *process, *func;
                         char *p;
-                        int cnt;
+                        int idx;
+                        unsigned cnt;
 
                         count = skip_whitespace(buf);
                         p = strchr(count, ',');
                         if (!p)
                                 continue;
                         *p++ = '\0';
-                        if (strcmp(strchrnul(count, ' '), " total events") == 0)
+                        cnt = bb_strtou(count, NULL, 10);
+                        if (strcmp(skip_non_whitespace(count), " total events") == 0) {
+#if ENABLE_FEATURE_POWERTOP_PROCIRQ
+                                n = cnt / G.total_cpus;
+                                if (n > 0 && n < G.interrupt_0) {
+                                        sprintf(line, "    <interrupt> : %s", "extra timer interrupt");
+                                        save_line(line, G.interrupt_0 - n);
+                                }
+#endif
                                 break;
-                        p = skip_whitespace(p); /* points to pid */
-
-/* Find char ' ', then eat remaining spaces */
-#define ADVANCE(p) do {           \
-        (p) = strchr((p), ' ');   \
-        if (!(p))                 \
-                continue;         \
-        *(p) = '\0';              \
-        (p)++;                    \
-        (p) = skip_whitespace(p); \
-} while (0)
-                        /* Get process name */
-                        ADVANCE(p);
-                        process = p;
-                        /* Get function */
-                        ADVANCE(p);
+                        }
+                        if (strchr(count, 'D'))
+                                continue; /* deferred */
+                        p = skip_whitespace(p); /* points to pid now */
+                        process = NULL;
+ get_func_name:
+                        p = strchr(p, ' ');
+                        if (!p)
+                                continue;
+                        *p++ = '\0';
+                        p = skip_whitespace(p);
+                        if (process == NULL) {
+                                process = p;
+                                goto get_func_name;
+                        }
                         func = p;
-#undef ADVANCE
+
                         //if (strcmp(process, "swapper") == 0
                         // && strcmp(func, "hrtimer_start_range_ns (tick_sched_timer)\n") == 0
                         //) {
@@ -471,45 +467,26 @@ static NOINLINE int process_timer_stats(void)
                         //if (strcmp(process, "powertop") == 0)
                         //      continue;
 
-                        if (strcmp(process, "insmod") == 0)
-                                process = "[kernel module]";
-                        if (strcmp(process, "modprobe") == 0)
-                                process = "[kernel module]";
-                        if (strcmp(process, "swapper") == 0)
-                                process = "<kernel core>";
+                        idx = index_in_strings("insmod\0modprobe\0swapper\0", process);
+                        if (idx != -1) {
+                                process = idx < 2 ? "[kernel module]" : "<kernel core>";
+                        }
 
                         strchrnul(p, '\n')[0] = '\0';
 
-                        {
-                                char *tmp;
-                                cnt = bb_strtoull(count, &tmp, 10);
-                                p = tmp;
-                        }
-                        while (*p != '\0') {
-                                if (*p++ == 'D') /* deferred */
-                                        goto skip;
-                        }
+                        // 46D\01136\0kondemand/1\0do_dbs_timer (delayed_work_timer_fn)
+                        // ^          ^            ^
+                        // count      process      func
 
                         //if (strchr(process, '['))
                                 sprintf(line, "%15.15s : %s", process, func);
                         //else
                         //      sprintf(line, "%s", process);
                         save_line(line, cnt);
- skip: ;
                 }
                 fclose(fp);
         }
 
-        n = 0;
-#if ENABLE_FEATURE_POWERTOP_PROCIRQ
-        if (strstr(buf, "total events")) {
-                n = bb_strtoull(buf, NULL, 10) / G.total_cpus;
-                if (n > 0 && n < G.interrupt_0) {
-                        sprintf(line, "    <interrupt> : %s", "extra timer interrupt");
-                        save_line(line, G.interrupt_0 - n);
-                }
-        }
-#endif
         return n;
 }
 
@@ -566,7 +543,7 @@ static NOINLINE void print_intel_cstates(void)
                 if (!isdigit(d->d_name[3]))
                         continue;
 
-                len = sprintf(fname, "/sys/devices/system/cpu/%s/cpuidle", d->d_name);
+                len = sprintf(fname, "%s/%s/cpuidle", "/sys/devices/system/cpu", d->d_name);
                 dir = opendir(fname);
                 if (!dir)
                         continue;
@@ -635,7 +612,7 @@ static NOINLINE void print_intel_cstates(void)
         bb_putchar('\n');
 }
 #else
-# define print_intel_cstates(void) ((void)0)
+# define print_intel_cstates() ((void)0)
 #endif
 
 static void show_timerstats(void)
diff --git a/procps/pstree.c b/procps/pstree.c
new file mode 100644
index 000000000..180d0939a
--- /dev/null
+++ b/procps/pstree.c
@@ -0,0 +1,406 @@
+/*
+ * pstree.c - display process tree
+ *
+ * Copyright (C) 1993-2002 Werner Almesberger
+ * Copyright (C) 2002-2009 Craig Small
+ * Copyright (C) 2010 Lauri Kasanen
+ *
+ * Based on pstree (PSmisc) 22.13.
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+
+//config:config PSTREE
+//config:       bool "pstree"
+//config:       default y
+//config:       help
+//config:         Display a tree of processes.
+
+//applet:IF_PSTREE(APPLET(pstree, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_PSTREE) += pstree.o
+
+//usage:#define pstree_trivial_usage
+//usage:        "[-p] [PID|USER]"
+//usage:#define pstree_full_usage "\n\n"
+//usage:       "Display process tree, optionally start from USER or PID\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -p      Show pids"
+
+#include "libbb.h"
+
+#define PROC_BASE "/proc"
+
+#define OPT_PID  (1 << 0)
+
+struct child;
+
+typedef struct proc {
+        char comm[COMM_LEN + 1];
+//      char flags; - unused, delete?
+        pid_t pid;
+        uid_t uid;
+        struct child *children;
+        struct proc *parent;
+        struct proc *next;
+} PROC;
+
+/* For flags above */
+//#define PFLAG_THREAD  0x01
+
+typedef struct child {
+        PROC *child;
+        struct child *next;
+} CHILD;
+
+#define empty_2  "  "
+#define branch_2 "|-"
+#define vert_2   "| "
+#define last_2   "`-"
+#define single_3 "---"
+#define first_3  "-+-"
+
+struct globals {
+        /* 0-based. IOW: the number of chars we printed on current line */
+        unsigned cur_x;
+        unsigned output_width;
+
+        /* The buffers will be dynamically increased in size as needed */
+        unsigned capacity;
+        unsigned *width;
+        uint8_t *more;
+
+        PROC *list;
+
+        smallint dumped; /* used by dump_by_user */
+};
+#define G (*ptr_to_globals)
+#define INIT_G() do { \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
+
+
+/*
+ * Allocates additional buffer space for width and more as needed.
+ * The first call will allocate the first buffer.
+ *
+ * bufindex  the index that will be used after the call to this function.
+ */
+static void ensure_buffer_capacity(int bufindex)
+{
+        if (bufindex >= G.capacity) {
+                G.capacity += 0x100;
+                G.width = xrealloc(G.width, G.capacity * sizeof(G.width[0]));
+                G.more = xrealloc(G.more, G.capacity * sizeof(G.more[0]));
+        }
+}
+
+/* NB: this function is never called with "bad" chars
+ * (control chars or chars >= 0x7f)
+ */
+static void out_char(char c)
+{
+        G.cur_x++;
+        if (G.cur_x > G.output_width)
+                return;
+        if (G.cur_x == G.output_width)
+                c = '+';
+        putchar(c);
+}
+
+/* NB: this function is never called with "bad" chars
+ * (control chars or chars >= 0x7f)
+ */
+static void out_string(const char *str)
+{
+        while (*str)
+                out_char(*str++);
+}
+
+static void out_newline(void)
+{
+        putchar('\n');
+        G.cur_x = 0;
+}
+
+static PROC *find_proc(pid_t pid)
+{
+        PROC *walk;
+
+        for (walk = G.list; walk; walk = walk->next)
+                if (walk->pid == pid)
+                        break;
+
+        return walk;
+}
+
+static PROC *new_proc(const char *comm, pid_t pid, uid_t uid)
+{
+        PROC *new = xzalloc(sizeof(*new));
+
+        strcpy(new->comm, comm);
+        new->pid = pid;
+        new->uid = uid;
+        new->next = G.list;
+
+        G.list = new;
+        return G.list;
+}
+
+static void add_child(PROC *parent, PROC *child)
+{
+        CHILD *new, **walk;
+        int cmp;
+
+        new = xmalloc(sizeof(*new));
+
+        new->child = child;
+        for (walk = &parent->children; *walk; walk = &(*walk)->next) {
+                cmp = strcmp((*walk)->child->comm, child->comm);
+                if (cmp > 0)
+                        break;
+                if (cmp == 0 && (*walk)->child->uid > child->uid)
+                        break;
+        }
+        new->next = *walk;
+        *walk = new;
+}
+
+static void add_proc(const char *comm, pid_t pid, pid_t ppid,
+                        uid_t uid /*, char isthread*/)
+{
+        PROC *this, *parent;
+
+        this = find_proc(pid);
+        if (!this)
+                this = new_proc(comm, pid, uid);
+        else {
+                strcpy(this->comm, comm);
+                this->uid = uid;
+        }
+
+        if (pid == ppid)
+                ppid = 0;
+//      if (isthread)
+//              this->flags |= PFLAG_THREAD;
+
+        parent = find_proc(ppid);
+        if (!parent)
+                parent = new_proc("?", ppid, 0);
+
+        add_child(parent, this);
+        this->parent = parent;
+}
+
+static int tree_equal(const PROC *a, const PROC *b)
+{
+        const CHILD *walk_a, *walk_b;
+
+        if (strcmp(a->comm, b->comm) != 0)
+                return 0;
+        if ((option_mask32 /*& OPT_PID*/) && a->pid != b->pid)
+                return 0;
+
+        for (walk_a = a->children, walk_b = b->children;
+          walk_a && walk_b;
+          walk_a = walk_a->next, walk_b = walk_b->next
+        ) {
+                if (!tree_equal(walk_a->child, walk_b->child))
+                        return 0;
+        }
+
+        return !(walk_a || walk_b);
+}
+
+static int out_args(const char *mystr)
+{
+        const char *here;
+        int strcount = 0;
+        char tmpstr[5];
+
+        for (here = mystr; *here; here++) {
+                if (*here == '\\') {
+                        out_string("\\\\");
+                        strcount += 2;
+                } else if (*here >= ' ' && *here < 0x7f) {
+                        out_char(*here);
+                        strcount++;
+                } else {
+                        sprintf(tmpstr, "\\%03o", (unsigned char) *here);
+                        out_string(tmpstr);
+                        strcount += 4;
+                }
+        }
+
+        return strcount;
+}
+
+static void
+dump_tree(PROC *current, int level, int rep, int leaf, int last, int closing)
+{
+        CHILD *walk, *next, **scan;
+        int lvl, i, add, offset, count, comm_len, first;
+        char tmp[sizeof(int)*3 + 4];
+
+        if (!current)
+                return;
+
+        if (!leaf) {
+                for (lvl = 0; lvl < level; lvl++) {
+                        i = G.width[lvl] + 1;
+                        while (--i >= 0)
+                                out_char(' ');
+
+                        if (lvl == level - 1) {
+                                if (last) {
+                                        out_string(last_2);
+                                } else {
+                                        out_string(branch_2);
+                                }
+                        } else {
+                                if (G.more[lvl + 1]) {
+                                        out_string(vert_2);
+                                } else {
+                                        out_string(empty_2);
+                                }
+                        }
+                }
+        }
+
+        add = 0;
+        if (rep > 1) {
+                add += sprintf(tmp, "%d*[", rep);
+                out_string(tmp);
+        }
+        comm_len = out_args(current->comm);
+        if (option_mask32 /*& OPT_PID*/) {
+                comm_len += sprintf(tmp, "(%d)", (int)current->pid);
+                out_string(tmp);
+        }
+        offset = G.cur_x;
+
+        if (!current->children) {
+                while (closing--)
+                        out_char(']');
+                out_newline();
+        }
+        ensure_buffer_capacity(level);
+        G.more[level] = !last;
+
+        G.width[level] = comm_len + G.cur_x - offset + add;
+        if (G.cur_x >= G.output_width) {
+                //out_string(first_3); - why? it won't print anything
+                //out_char('+');
+                out_newline();
+                return;
+        }
+
+        first = 1;
+        for (walk = current->children; walk; walk = next) {
+                count = 0;
+                next = walk->next;
+                scan = &walk->next;
+                while (*scan) {
+                        if (!tree_equal(walk->child, (*scan)->child))
+                                scan = &(*scan)->next;
+                        else {
+                                if (next == *scan)
+                                        next = (*scan)->next;
+                                count++;
+                                *scan = (*scan)->next;
+                        }
+                }
+                if (first) {
+                        out_string(next ? first_3 : single_3);
+                        first = 0;
+                }
+
+                dump_tree(walk->child, level + 1, count + 1,
+                                walk == current->children, !next,
+                                closing + (count ? 1 : 0));
+        }
+}
+
+static void dump_by_user(PROC *current, uid_t uid)
+{
+        const CHILD *walk;
+
+        if (!current)
+                return;
+
+        if (current->uid == uid) {
+                if (G.dumped)
+                        putchar('\n');
+                dump_tree(current, 0, 1, 1, 1, 0);
+                G.dumped = 1;
+                return;
+        }
+        for (walk = current->children; walk; walk = walk->next)
+                dump_by_user(walk->child, uid);
+}
+
+static void handle_thread(const char *comm, pid_t pid, pid_t ppid, uid_t uid)
+{
+        char threadname[COMM_LEN + 2];
+        sprintf(threadname, "{%.*s}", COMM_LEN - 2, comm);
+        add_proc(threadname, pid, ppid, uid/*, 1*/);
+}
+
+static void mread_proc(void)
+{
+        procps_status_t *p = NULL;
+        pid_t parent = 0;
+        int flags = PSSCAN_COMM | PSSCAN_PID | PSSCAN_PPID | PSSCAN_UIDGID | PSSCAN_TASKS;
+
+        while ((p = procps_scan(p, flags)) != NULL) {
+#if ENABLE_FEATURE_SHOW_THREADS
+                if (p->pid != p->main_thread_pid)
+                        handle_thread(p->comm, p->pid, parent, p->uid);
+                else
+#endif
+                {
+                        add_proc(p->comm, p->pid, p->ppid, p->uid/*, 0*/);
+                        parent = p->pid;
+                }
+        }
+}
+
+int pstree_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int pstree_main(int argc UNUSED_PARAM, char **argv)
+{
+        pid_t pid = 1;
+        long uid = 0;
+
+        INIT_G();
+
+        get_terminal_width_height(0, &G.output_width, NULL);
+
+        opt_complementary = "?1";
+        getopt32(argv, "p");
+        argv += optind;
+
+        if (argv[0]) {
+                if (argv[0][0] >= '0' && argv[0][0] <= '9') {
+                        pid = xatoi(argv[0]);
+                } else {
+                        uid = xuname2uid(argv[0]);
+                }
+        }
+
+        mread_proc();
+
+        if (!uid)
+                dump_tree(find_proc(pid), 0, 1, 1, 1, 0);
+        else {
+                dump_by_user(find_proc(1), uid);
+                if (!G.dumped) {
+                        bb_error_msg_and_die("no processes found");
+                }
+        }
+
+        if (ENABLE_FEATURE_CLEAN_UP) {
+                free(G.width);
+                free(G.more);
+        }
+        return 0;
+}
diff --git a/procps/smemcap.c b/procps/smemcap.c
index 196c91f54..200df6795 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -20,7 +20,7 @@
 //config:         a memory usage statistic tool.
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 struct fileblock {
         struct fileblock *next;
diff --git a/procps/sysctl.c b/procps/sysctl.c
index 20b372c54..aba966e7f 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -91,7 +91,7 @@ static int sysctl_act_on_setting(char *setting)
                         retval = EXIT_FAILURE;
                         goto end;
                 }
-                value = cptr + 1;       /* point to the value in name=value */
+                value = cptr + 1;  /* point to the value in name=value */
                 if (setting == cptr || !*value) {
                         bb_error_msg("error: malformed setting '%s'", outname);
                         retval = EXIT_FAILURE;
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index e77eeff04..166664237 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -312,8 +312,11 @@ int runsvdir_main(int argc UNUSED_PARAM, char **argv)
                                                 last_mtime = s.st_mtime;
                                                 last_dev = s.st_dev;
                                                 last_ino = s.st_ino;
-                                                //if (now <= mtime)
-                                                //      sleep(1);
+                                                /* if the svdir changed this very second, wait until the
+                                                 * next second, because we won't be able to detect more
+                                                 * changes within this second */
+                                                while (time(NULL) == last_mtime)
+                                                        usleep(100000);
                                                 need_rescan = do_rescan();
                                                 while (fchdir(curdir) == -1) {
                                                         warn2_cannot("change directory, pausing", "");
diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA
index 11ae39eae..a62618ae0 100644
--- a/scripts/Makefile.IMA
+++ b/scripts/Makefile.IMA
@@ -85,8 +85,8 @@ lib-y:=
 include archival/Kbuild
 lib-all-y += $(patsubst %,archival/%,$(sort $(lib-y)))
 lib-y:=
-include archival/libunarchive/Kbuild
-lib-all-y += $(patsubst %,archival/libunarchive/%,$(sort $(lib-y)))
+include archival/libarchive/Kbuild
+lib-all-y += $(patsubst %,archival/libarchive/%,$(sort $(lib-y)))
 lib-y:=
 include applets/Kbuild
 lib-all-y += $(patsubst %,applets/%,$(sort $(lib-y)))
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 1a5b10f84..f27a17984 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -329,7 +329,7 @@ void parse_dep_file(void *map, size_t len)
         clear_config();
 
         while (m < end) {
-                while (m < end && (*m == ' ' || *m == '\\' || *m == '\n'))
+                while (m < end && (*m == ' ' || *m == '\\' || *m == '\n' || *m == '\r'))
                         m++;
                 p = m;
                 while (p < end && *p != ' ') p++;
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 95cbbe6b8..91374c1ca 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -63,7 +63,7 @@ def getsizes(file):
         else:
             sym[name] = {"addr" : value, "size":  size}
             lut[(value, size)] = 0
-    for addr, sz in alias.iterkeys():
+    for addr, sz in iter(alias.keys()):
         # If the non-GLOBAL sym has an implementation elsewhere then
         # it's an alias, disregard it.
         if not (addr, sz) in lut:
@@ -92,7 +92,7 @@ if flag_timing:
 grow, shrink, add, remove, up, down = 0, 0, 0, 0, 0, 0
 delta, common = [], {}
 
-for name in old.iterkeys():
+for name in iter(old.keys()):
     if name in new:
         common[name] = 1
 
diff --git a/scripts/cleanup_printf2puts b/scripts/cleanup_printf2puts
index 446152e12..00193a842 100755
--- a/scripts/cleanup_printf2puts
+++ b/scripts/cleanup_printf2puts
@@ -3,7 +3,7 @@
 # Processes current directory recursively:
 # printf("abc\n") -> puts("abc"). Beware of fprintf etc...
 
-# BTW, gcc 4.1.2 already does tha same! Can't believe it...
+# BTW, gcc 4.1.2 already does the same! Can't believe it...
 
 grep -lr 'printf\([^%%]*\\n"\)' . | grep '.[ch]$' | xargs -n1 \
     sed -e 's/\([^A-Za-z0-9_]\)printf(\( *"[^%]*\)\\n")/\1puts(\2")/' -i
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index 09a95b507..03831f501 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -9,43 +9,58 @@ mkdir include 2>/dev/null
 
 srctree="$1"
 
+status() { printf '  %-8s%s\n' "$1" "$2"; }
+gen() { status "GEN" "$@"; }
+chk() { status "CHK" "$@"; }
+
+generate()
+{
+        local src="$1" dst="$2" header="$3" insert="$4"
+        #chk "${dst}"
+        (
+                # Need to use printf: different shells have inconsistent
+                # rules re handling of "\n" in echo params,
+                # and ${insert} definitely contains "\n".
+                # Therefore, echo "${header}" would not work:
+                printf "%s\n" "${header}"
+                if grep -qs '^INSERT$' "${src}"; then
+                        sed -n '1,/^INSERT$/p' "${src}"
+                        printf "%s\n" "${insert}"
+                        sed -n '/^INSERT$/,$p' "${src}"
+                else
+                        if [ -n "${insert}" ]; then
+                                printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
+                        fi
+                        cat "${src}"
+                fi
+        ) | sed '/^INSERT$/d' > "${dst}.tmp"
+        if ! cmp -s "${dst}" "${dst}.tmp"; then
+                gen "${dst}"
+                mv "${dst}.tmp" "${dst}"
+        else
+                rm -f "${dst}.tmp"
+        fi
+}
+
 # (Re)generate include/applets.h
-src="$srctree/include/applets.src.h"
-dst="include/applets.h"
 s=`sed -n 's@^//applet:@@p' -- "$srctree"/*/*.c "$srctree"/*/*/*.c`
-old=`cat "$dst" 2>/dev/null`
-# Why "IFS='' read -r REPLY"??
-# This atrocity is needed to read lines without mangling.
-# IFS='' prevents whitespace trimming,
-# -r suppresses backslash handling.
-new=`echo "/* DO NOT EDIT. This file is generated from applets.src.h */"
-while IFS='' read -r REPLY; do
-        test x"$REPLY" = x"INSERT" && REPLY="$s"
-        printf "%s\n" "$REPLY"
-done <"$src"`
-if test x"$new" != x"$old"; then
-        echo "  GEN     $dst"
-        printf "%s\n" "$new" >"$dst"
-fi
+generate \
+        "$srctree/include/applets.src.h" \
+        "include/applets.h" \
+        "/* DO NOT EDIT. This file is generated from applets.src.h */" \
+        "${s}"
 
 # (Re)generate include/usage.h
-src="$srctree/include/usage.src.h"
-dst="include/usage.h"
 # We add line continuation backslash after each line,
 # and insert empty line before each line which doesn't start
 # with space or tab
 # (note: we need to use \\\\ because of ``)
 s=`sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\\\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\\\@p' -- "$srctree"/*/*.c "$srctree"/*/*/*.c`
-old=`cat "$dst" 2>/dev/null`
-new=`echo "/* DO NOT EDIT. This file is generated from usage.src.h */"
-while IFS='' read -r REPLY; do
-        test x"$REPLY" = x"INSERT" && REPLY="$s"
-        printf "%s\n" "$REPLY"
-done <"$src"`
-if test x"$new" != x"$old"; then
-        echo "  GEN     $dst"
-        printf "%s\n" "$new" >"$dst"
-fi
+generate \
+        "$srctree/include/usage.src.h" \
+        "include/usage.h" \
+        "/* DO NOT EDIT. This file is generated from usage.src.h */" \
+        "${s}"
 
 # (Re)generate */Kbuild and */Config.in
 { cd -- "$srctree" && find . -type d; } | while read -r d; do
@@ -55,40 +70,24 @@ fi
         dst="$d/Kbuild"
         if test -f "$src"; then
                 mkdir -p -- "$d" 2>/dev/null
-                #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//kbuild:@@p' -- "$srctree/$d"/*.c`
-
-                old=`cat "$dst" 2>/dev/null`
-                new=`echo "# DO NOT EDIT. This file is generated from Kbuild.src"
-                while IFS='' read -r REPLY; do
-                        test x"$REPLY" = x"INSERT" && REPLY="$s"
-                        printf "%s\n" "$REPLY"
-                done <"$src"`
-                if test x"$new" != x"$old"; then
-                        echo "  GEN     $dst"
-                        printf "%s\n" "$new" >"$dst"
-                fi
+                generate \
+                        "${src}" "${dst}" \
+                        "# DO NOT EDIT. This file is generated from Kbuild.src" \
+                        "${s}"
         fi
 
         src="$srctree/$d/Config.src"
         dst="$d/Config.in"
         if test -f "$src"; then
                 mkdir -p -- "$d" 2>/dev/null
-                #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//config:@@p' -- "$srctree/$d"/*.c`
-
-                old=`cat "$dst" 2>/dev/null`
-                new=`echo "# DO NOT EDIT. This file is generated from Config.src"
-                while IFS='' read -r REPLY; do
-                        test x"$REPLY" = x"INSERT" && REPLY="$s"
-                        printf "%s\n" "$REPLY"
-                done <"$src"`
-                if test x"$new" != x"$old"; then
-                        echo "  GEN     $dst"
-                        printf "%s\n" "$new" >"$dst"
-                fi
+                generate \
+                        "${src}" "${dst}" \
+                        "# DO NOT EDIT. This file is generated from Config.src" \
+                        "${s}"
         fi
 done
 
diff --git a/scripts/individual b/scripts/individual
deleted file mode 100755
index e93ca5552..000000000
--- a/scripts/individual
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/sh
-
-# Compile individual versions of each busybox applet.
-
-if [ $# -eq 0 ]
-then
-
-# Clear out the build directory.  (Make clean should do this instead of here.)
-
-rm -rf build
-mkdir build
-
-# Make our prerequisites.
-
-make busybox.links include/bb_config.h $(pwd)/{libbb/libbb.a,archival/libunarchive/libunarchive.a,coreutils/libcoreutils/libcoreutils.a,networking/libiproute/libiproute.a}
-
-else
-# Could very well be that we want to build an individual applet but have no
-# 'build' dir yet..
-
-test -d ./build || mkdir build
-
-fi
-
-# About 3/5 of the applets build from one .c file (with the same name as the
-# corresponding applet), and all it needs to link against.  However, to build
-# them all we need more than that.
-
-# Figure out which applets need extra libraries added to their command line.
-
-function substithing()
-{
-  if [ "${1/ $3 //}" != "$1" ]
-  then
-    echo $2
-  fi
-}
-
-function extra_libraries()
-{
-  # gzip needs gunzip.c (when gunzip is enabled, anyway).
-  substithing " gzip " "archival/gunzip.c archival/uncompress.c" "$1"
-
-  # init needs init_shared.c
-  substithing " init " "init/init_shared.c" "$1"
-
-  # ifconfig needs interface.c
-  substithing " ifconfig " "networking/interface.c" "$1"
-
-  # Applets that need libunarchive.a
-  substithing " ar bunzip2 unlzma cpio dpkg gunzip rpm2cpio rpm tar uncompress unzip dpkg_deb gzip " "archival/libunarchive/libunarchive.a" "$1"
-
-  # Applets that need libcoreutils.a
-  substithing " cp mv " "coreutils/libcoreutils/libcoreutils.a" "$1"
-
-  # Applets that need libiproute.a
-  substithing " ip " "networking/libiproute/libiproute.a" "$1"
-
-  # What needs -libm?
-  substithing " awk dc " "-lm" "$1"
-
-  # What needs -lcrypt?
-  substithing " httpd vlock " "-lcrypt" "$1"
-}
-
-# Query applets.h to figure out which applets need special treatment
-
-strange_names=`sed -rn -e 's/\#.*//' -e 's/.*APPLET_NOUSAGE\(([^,]*),([^,]*),.*/\1 \2/p' -e 's/.*APPLET_ODDNAME\(([^,]*),([^,]*),.*, *([^)]*).*/\1 \2@\3/p' include/applets.h`
-
-function bonkname()
-{
-  while [ $# -gt 0 ]
-  do
-    if [ "$APPLET" == "$1" ]
-    then
-      APPFILT="${2/@*/}"
-      if [ "${APPFILT}" == "$2" ]
-      then
-        HELPNAME='"nousage\n"'   # These should be _fixed_.
-      else
-        HELPNAME="${2/*@/}"_full_usage
-      fi
-      break
-    fi
-    shift 2
-  done
-#echo APPLET=${APPLET} APPFILT=${APPFILT} HELPNAME=${HELPNAME} 2=${2}
-}
-
-# Iterate through every name in busybox.links
-
-function buildit ()
-{
-  export APPLET="$1"
-  export APPFILT=${APPLET}
-  export HELPNAME=${APPLET}_full_usage
-
-  bonkname $strange_names
-
-  j=`find archival console-tools coreutils debianutils editors findutils init loginutils miscutils modutils networking procps shell sysklogd util-linux -name "${APPFILT}.c"`
-  if [ -z "$j" ]
-  then
-    echo no file for $APPLET
-  else
-    echo "Building $APPLET"
-    gcc -Os -o build/$APPLET applets/individual.c $j \
-        `extra_libraries $APPFILT` libbb/libbb.a -Iinclude \
-        -DBUILD_INDIVIDUAL \
-        '-Drun_applet_and_exit(...)' '-Dfind_applet_by_name(...)=0' \
-        -DAPPLET_main=${APPFILT}_main -DAPPLET_full_usage=${HELPNAME}
-    if [ $? -ne 0 ];
-    then
-      echo "Failed $APPLET"
-    fi
-  fi
-}
-
-if [ $# -eq 0 ]
-then
-  for APPLET in `sed 's .*/  ' busybox.links`
-  do
-    buildit "$APPLET"
-  done
-else
-  buildit "$1"
-fi
-
-
-strip build/*
diff --git a/scripts/mkdiff_obj b/scripts/mkdiff_obj
index a6ec5e602..307474874 100755
--- a/scripts/mkdiff_obj
+++ b/scripts/mkdiff_obj
@@ -1,28 +1,35 @@
 #!/bin/sh
 
+usage() {
+        echo "Usage: ${0##*/} DIR1 DIR2"
+        echo
+        echo "Compares all object files recursivelty found in DIR1 and DIR2."
+        echo "Prints diff of their disassembly."
+        echo
+        exit $1
+}
+
 filter() {
         # sed removes " address: " prefixes which mess up diff
         sed $'s/^\\(\t*\\)[ ]*[0-9a-f][0-9a-f]*:[ \t]*/\\1/' \
         | sed 's/__GI_//g'
 }
 
-test -d "$1" || exit 1
-test -d "$2" || exit 1
+test -d "$1" || usage 1
+test -d "$2" || usage 1
 
 {
         (
                 cd "$1" || exit 1
-                find -name '*.o' -o -name '*.os' # -o -name '*.so'
+                find -name '*.o' # -o -name '*.os' # -o -name '*.so'
         )
         (
                 cd "$2" || exit 1
-                find -name '*.o' -o -name '*.os' # -o -name '*.so'
+                find -name '*.o' # -o -name '*.os' # -o -name '*.so'
         )
 } | sed 's:^\./::' | sort | uniq | \
-tee LST | \
 (
-IFS=''
-while read -r oname; do
+while IFS='' read -r oname; do
         if ! test -f "$1/$oname"; then
                 echo "Only $2/$oname"
                 continue
@@ -32,8 +39,8 @@ while read -r oname; do
                 continue
         fi
         diff -q -- "$1/$oname" "$2/$oname" >/dev/null && continue
-        (cd "$1"; objdump -dr "$oname" | filter >"$oname.disasm")
-        (cd "$2"; objdump -dr "$oname" | filter >"$oname.disasm")
-        diff -u "$1/$oname.disasm" "$2/$oname.disasm"
+        (cd "$1" && { size "$oname"; objdump -dr "$oname" | filter; } >"$oname.disasm")
+        (cd "$2" && { size "$oname"; objdump -dr "$oname" | filter; } >"$oname.disasm")
+        diff -u -- "$1/$oname.disasm" "$2/$oname.disasm"
 done
 )
diff --git a/scripts/randomtest.loop b/scripts/randomtest.loop
index 311536df8..2c8a9bd35 100755
--- a/scripts/randomtest.loop
+++ b/scripts/randomtest.loop
@@ -4,7 +4,7 @@ test -d "$1" || { echo "'$1' is not a directory"; exit 1; }
 test -x "$1/scripts/randomtest" || { echo "No scripts/randomtest in '$1'"; exit 1; }
 
 export LIBC="uclibc"
-export CROSS_COMPILER_PREFIX="i486-linux-uclibc-"
+export CROSS_COMPILER_PREFIX="i686-"
 export MAKEOPTS="-j9"
 
 cnt=0
diff --git a/selinux/runcon.c b/selinux/runcon.c
index b70a5e396..54349b25c 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -132,6 +132,5 @@ int runcon_main(int argc UNUSED_PARAM, char **argv)
                 bb_error_msg_and_die("can't set up security context '%s'",
                                      context_str(con));
 
-        execvp(argv[0], argv);
-        bb_perror_msg_and_die("can't execute '%s'", argv[0]);
+        BB_EXECVP_or_die(argv);
 }
diff --git a/selinux/sestatus.c b/selinux/sestatus.c
index 7fb2b470b..aa12e806c 100644
--- a/selinux/sestatus.c
+++ b/selinux/sestatus.c
@@ -12,10 +12,10 @@
 
 extern char *selinux_mnt;
 
-#define OPT_VERBOSE     (1 << 0)
-#define OPT_BOOLEAN     (1 << 1)
+#define OPT_VERBOSE  (1 << 0)
+#define OPT_BOOLEAN  (1 << 1)
 
-#define COL_FMT         "%-31s "
+#define COL_FMT  "%-31s "
 
 static void display_boolean(void)
 {
@@ -151,7 +151,7 @@ int sestatus_main(int argc UNUSED_PARAM, char **argv)
         const char *pol_path;
         int rc;
 
-        opt_complementary = "?0";       /* no arguments are required. */
+        opt_complementary = "?0";  /* no arguments are required. */
         opts = getopt32(argv, "vb");
 
         /* SELinux status: line */
diff --git a/shell/ash.c b/shell/ash.c
index ccf4288a9..f7baf2b3b 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -57,7 +57,9 @@
 #include <sys/times.h>
 
 #include "shell_common.h"
-#include "math.h"
+#if ENABLE_SH_MATH_SUPPORT
+# include "math.h"
+#endif
 #if ENABLE_ASH_RANDOM_SUPPORT
 # include "random.h"
 #else
@@ -5834,6 +5836,11 @@ static struct arglist exparg;
 /*
  * Our own itoa().
  */
+#if !ENABLE_SH_MATH_SUPPORT
+/* cvtnum() is used even if math support is off (to prepare $? values and such) */
+typedef long arith_t;
+# define ARITH_FMT "%ld"
+#endif
 static int
 cvtnum(arith_t num)
 {
@@ -13648,7 +13655,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 #endif
-        if (/* argv[0] && */ argv[0][0] == '-')
+        if (argv[0] && argv[0][0] == '-')
                 isloginsh = 1;
         if (isloginsh) {
                 state = 1;
diff --git a/shell/ash_test/recho.c b/shell/ash_test/recho.c
index fb48d9c48..42a5feafd 100644
--- a/shell/ash_test/recho.c
+++ b/shell/ash_test/recho.c
@@ -29,12 +29,9 @@
 
 void strprint();
 
-int
-main(argc, argv)
-int     argc;
-char    **argv;
+int main(int argc, char **argv)
 {
-        register int    i;
+        int i;
 
         for (i = 1; i < argc; i++) {
                 printf("argv[%d] = <", i);
@@ -44,11 +41,9 @@ char	**argv;
         exit(EXIT_SUCCESS);
 }
 
-void
-strprint(str)
-char    *str;
+void strprint(char *str)
 {
-        register unsigned char *s;
+        unsigned char *s;
 
         for (s = (unsigned char *)str; s && *s; s++) {
                 if (*s < ' ') {
diff --git a/shell/ash_test/zecho.c b/shell/ash_test/zecho.c
index bf876f641..cbaa59b81 100644
--- a/shell/ash_test/zecho.c
+++ b/shell/ash_test/zecho.c
@@ -21,10 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int
-main(argc, argv)
-int     argc;
-char    **argv;
+int main(int argc, char **argv)
 {
         argv++;
 
diff --git a/shell/hush.c b/shell/hush.c
index 9dd30c436..a771e9cd9 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -82,7 +82,11 @@
  *              aaa
  */
 #include "busybox.h"  /* for APPLET_IS_NOFORK/NOEXEC */
-#include <malloc.h>   /* for malloc_trim */
+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
+        || defined(__APPLE__) \
+    )
+# include <malloc.h>   /* for malloc_trim */
+#endif
 #include <glob.h>
 /* #include <dmalloc.h> */
 #if ENABLE_HUSH_CASE
@@ -245,9 +249,15 @@
 //config:         msh is deprecated and will be removed, please migrate to hush.
 //config:
 
-//usage:#define hush_trivial_usage NOUSAGE_STR
+/* -i (interactive) and -s (read stdin) are also accepted,
+ * but currently do nothing, therefore aren't shown in help.
+ * NOMMU-specific options are not meant to be used by users,
+ * therefore we don't show them either.
+ */
+//usage:#define hush_trivial_usage
+//usage:       "[-nx] [-c SCRIPT]"
 //usage:#define hush_full_usage ""
-//usage:#define msh_trivial_usage NOUSAGE_STR
+//usage:#define msh_trivial_usage hush_trivial_usage
 //usage:#define msh_full_usage ""
 //usage:#define sh_trivial_usage NOUSAGE_STR
 //usage:#define sh_full_usage ""
@@ -507,6 +517,7 @@ struct command {
 # define CMD_FUNCDEF 3
 #endif
 
+        smalluint cmd_exitcode;
         /* if non-NULL, this "command" is { list }, ( list ), or a compound statement */
         struct pipe *group;
 #if !BB_MMU
@@ -542,7 +553,6 @@ struct command {
 #define IS_NULL_CMD(cmd) \
         (!(cmd)->group && !(cmd)->argv && !(cmd)->redirects)
 
-
 struct pipe {
         struct pipe *next;
         int num_cmds;               /* total number of commands in pipe */
@@ -637,6 +647,53 @@ struct function {
 #endif
 
 
+/* set -/+o OPT support. (TODO: make it optional)
+ * bash supports the following opts:
+ * allexport       off
+ * braceexpand     on
+ * emacs           on
+ * errexit         off
+ * errtrace        off
+ * functrace       off
+ * hashall         on
+ * histexpand      off
+ * history         on
+ * ignoreeof       off
+ * interactive-comments    on
+ * keyword         off
+ * monitor         on
+ * noclobber       off
+ * noexec          off
+ * noglob          off
+ * nolog           off
+ * notify          off
+ * nounset         off
+ * onecmd          off
+ * physical        off
+ * pipefail        off
+ * posix           off
+ * privileged      off
+ * verbose         off
+ * vi              off
+ * xtrace          off
+ */
+static const char o_opt_strings[] ALIGN1 =
+        "pipefail\0"
+        "noexec\0"
+#if ENABLE_HUSH_MODE_X
+        "xtrace\0"
+#endif
+        ;
+enum {
+        OPT_O_PIPEFAIL,
+        OPT_O_NOEXEC,
+#if ENABLE_HUSH_MODE_X
+        OPT_O_XTRACE,
+#endif
+        NUM_OPT_O
+};
+
+
 /* "Globals" within this file */
 /* Sorted roughly by size (smaller offsets == smaller code) */
 struct globals {
@@ -679,6 +736,12 @@ struct globals {
 #else
 # define G_saved_tty_pgrp 0
 #endif
+        char o_opt[NUM_OPT_O];
+#if ENABLE_HUSH_MODE_X
+# define G_x_mode (G.o_opt[OPT_O_XTRACE])
+#else
+# define G_x_mode 0
+#endif
         smallint flag_SIGINT;
 #if ENABLE_HUSH_LOOPS
         smallint flag_break_continue;
@@ -690,13 +753,6 @@ struct globals {
          */
         smallint flag_return_in_progress;
 #endif
-        smallint n_mode;
-#if ENABLE_HUSH_MODE_X
-        smallint x_mode;
-# define G_x_mode (G.x_mode)
-#else
-# define G_x_mode 0
-#endif
         smallint exiting; /* used to prevent EXIT trap recursion */
         /* These four support $?, $#, and $1 */
         smalluint last_exitcode;
@@ -875,7 +931,7 @@ static const struct built_in_command bltins2[] = {
  */
 #if HUSH_DEBUG
 /* prevent disasters with G.debug_indent < 0 */
-# define indent() fprintf(stderr, "%*s", (G.debug_indent * 2) & 0xff, "")
+# define indent() fdprintf(2, "%*s", (G.debug_indent * 2) & 0xff, "")
 # define debug_enter() (G.debug_indent++)
 # define debug_leave() (G.debug_indent--)
 #else
@@ -885,56 +941,56 @@ static const struct built_in_command bltins2[] = {
 #endif
 
 #ifndef debug_printf
-# define debug_printf(...) (indent(), fprintf(stderr, __VA_ARGS__))
+# define debug_printf(...) (indent(), fdprintf(2, __VA_ARGS__))
 #endif
 
 #ifndef debug_printf_parse
-# define debug_printf_parse(...) (indent(), fprintf(stderr, __VA_ARGS__))
+# define debug_printf_parse(...) (indent(), fdprintf(2, __VA_ARGS__))
 #endif
 
 #ifndef debug_printf_exec
-#define debug_printf_exec(...) (indent(), fprintf(stderr, __VA_ARGS__))
+#define debug_printf_exec(...) (indent(), fdprintf(2, __VA_ARGS__))
 #endif
 
 #ifndef debug_printf_env
-# define debug_printf_env(...) (indent(), fprintf(stderr, __VA_ARGS__))
+# define debug_printf_env(...) (indent(), fdprintf(2, __VA_ARGS__))
 #endif
 
 #ifndef debug_printf_jobs
-# define debug_printf_jobs(...) (indent(), fprintf(stderr, __VA_ARGS__))
+# define debug_printf_jobs(...) (indent(), fdprintf(2, __VA_ARGS__))
 # define DEBUG_JOBS 1
 #else
 # define DEBUG_JOBS 0
 #endif
 
 #ifndef debug_printf_expand
-# define debug_printf_expand(...) (indent(), fprintf(stderr, __VA_ARGS__))
+# define debug_printf_expand(...) (indent(), fdprintf(2, __VA_ARGS__))
 # define DEBUG_EXPAND 1
 #else
 # define DEBUG_EXPAND 0
 #endif
 
 #ifndef debug_printf_varexp
-# define debug_printf_varexp(...) (indent(), fprintf(stderr, __VA_ARGS__))
+# define debug_printf_varexp(...) (indent(), fdprintf(2, __VA_ARGS__))
 #endif
 
 #ifndef debug_printf_glob
-# define debug_printf_glob(...) (indent(), fprintf(stderr, __VA_ARGS__))
+# define debug_printf_glob(...) (indent(), fdprintf(2, __VA_ARGS__))
 # define DEBUG_GLOB 1
 #else
 # define DEBUG_GLOB 0
 #endif
 
 #ifndef debug_printf_list
-# define debug_printf_list(...) (indent(), fprintf(stderr, __VA_ARGS__))
+# define debug_printf_list(...) (indent(), fdprintf(2, __VA_ARGS__))
 #endif
 
 #ifndef debug_printf_subst
-# define debug_printf_subst(...) (indent(), fprintf(stderr, __VA_ARGS__))
+# define debug_printf_subst(...) (indent(), fdprintf(2, __VA_ARGS__))
 #endif
 
 #ifndef debug_printf_clean
-# define debug_printf_clean(...) (indent(), fprintf(stderr, __VA_ARGS__))
+# define debug_printf_clean(...) (indent(), fdprintf(2, __VA_ARGS__))
 # define DEBUG_CLEAN 1
 #else
 # define DEBUG_CLEAN 0
@@ -944,9 +1000,9 @@ static const struct built_in_command bltins2[] = {
 static void debug_print_strings(const char *prefix, char **vv)
 {
         indent();
-        fprintf(stderr, "%s:\n", prefix);
+        fdprintf(2, "%s:\n", prefix);
         while (*vv)
-                fprintf(stderr, " '%s'\n", *vv++);
+                fdprintf(2, " '%s'\n", *vv++);
 }
 #else
 # define debug_print_strings(prefix, vv) ((void)0)
@@ -1378,6 +1434,22 @@ static void hush_exit(int exitcode)
                 builtin_eval(argv);
         }
 
+#if ENABLE_FEATURE_CLEAN_UP
+        {
+                struct variable *cur_var;
+                if (G.cwd != bb_msg_unknown)
+                        free((char*)G.cwd);
+                cur_var = G.top_var;
+                while (cur_var) {
+                        struct variable *tmp = cur_var;
+                        if (!cur_var->max_len)
+                                free(cur_var->varstr);
+                        cur_var = cur_var->next;
+                        free(tmp);
+                }
+        }
+#endif
+
 #if ENABLE_HUSH_JOB
         fflush_all();
         sigexit(- (exitcode & 0xff));
@@ -2120,22 +2192,22 @@ static void debug_print_list(const char *prefix, o_string *o, int n)
         int i = 0;
 
         indent();
-        fprintf(stderr, "%s: list:%p n:%d string_start:%d length:%d maxlen:%d glob:%d quoted:%d escape:%d\n",
+        fdprintf(2, "%s: list:%p n:%d string_start:%d length:%d maxlen:%d glob:%d quoted:%d escape:%d\n",
                         prefix, list, n, string_start, o->length, o->maxlen,
                         !!(o->o_expflags & EXP_FLAG_GLOB),
                         o->has_quoted_part,
                         !!(o->o_expflags & EXP_FLAG_ESC_GLOB_CHARS));
         while (i < n) {
                 indent();
-                fprintf(stderr, " list[%d]=%d '%s' %p\n", i, (int)list[i],
-                                o->data + (int)list[i] + string_start,
-                                o->data + (int)list[i] + string_start);
+                fdprintf(2, " list[%d]=%d '%s' %p\n", i, (int)(uintptr_t)list[i],
+                                o->data + (int)(uintptr_t)list[i] + string_start,
+                                o->data + (int)(uintptr_t)list[i] + string_start);
                 i++;
         }
         if (n) {
-                const char *p = o->data + (int)list[n - 1] + string_start;
+                const char *p = o->data + (int)(uintptr_t)list[n - 1] + string_start;
                 indent();
-                fprintf(stderr, " total_sz:%ld\n", (long)((p + strlen(p) + 1) - o->data));
+                fdprintf(2, " total_sz:%ld\n", (long)((p + strlen(p) + 1) - o->data));
         }
 }
 #else
@@ -2583,6 +2655,94 @@ static void free_pipe_list(struct pipe *pi)
 
 /*** Parsing routines ***/
 
+#ifndef debug_print_tree
+static void debug_print_tree(struct pipe *pi, int lvl)
+{
+        static const char *const PIPE[] = {
+                [PIPE_SEQ] = "SEQ",
+                [PIPE_AND] = "AND",
+                [PIPE_OR ] = "OR" ,
+                [PIPE_BG ] = "BG" ,
+        };
+        static const char *RES[] = {
+                [RES_NONE ] = "NONE" ,
+# if ENABLE_HUSH_IF
+                [RES_IF   ] = "IF"   ,
+                [RES_THEN ] = "THEN" ,
+                [RES_ELIF ] = "ELIF" ,
+                [RES_ELSE ] = "ELSE" ,
+                [RES_FI   ] = "FI"   ,
+# endif
+# if ENABLE_HUSH_LOOPS
+                [RES_FOR  ] = "FOR"  ,
+                [RES_WHILE] = "WHILE",
+                [RES_UNTIL] = "UNTIL",
+                [RES_DO   ] = "DO"   ,
+                [RES_DONE ] = "DONE" ,
+# endif
+# if ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE
+                [RES_IN   ] = "IN"   ,
+# endif
+# if ENABLE_HUSH_CASE
+                [RES_CASE ] = "CASE" ,
+                [RES_CASE_IN ] = "CASE_IN" ,
+                [RES_MATCH] = "MATCH",
+                [RES_CASE_BODY] = "CASE_BODY",
+                [RES_ESAC ] = "ESAC" ,
+# endif
+                [RES_XXXX ] = "XXXX" ,
+                [RES_SNTX ] = "SNTX" ,
+        };
+        static const char *const CMDTYPE[] = {
+                "{}",
+                "()",
+                "[noglob]",
+# if ENABLE_HUSH_FUNCTIONS
+                "func()",
+# endif
+        };
+
+        int pin, prn;
+
+        pin = 0;
+        while (pi) {
+                fdprintf(2, "%*spipe %d res_word=%s followup=%d %s\n", lvl*2, "",
+                                pin, RES[pi->res_word], pi->followup, PIPE[pi->followup]);
+                prn = 0;
+                while (prn < pi->num_cmds) {
+                        struct command *command = &pi->cmds[prn];
+                        char **argv = command->argv;
+
+                        fdprintf(2, "%*s cmd %d assignment_cnt:%d",
+                                        lvl*2, "", prn,
+                                        command->assignment_cnt);
+                        if (command->group) {
+                                fdprintf(2, " group %s: (argv=%p)%s%s\n",
+                                                CMDTYPE[command->cmd_type],
+                                                argv
+# if !BB_MMU
+                                                , " group_as_string:", command->group_as_string
+# else
+                                                , "", ""
+# endif
+                                );
+                                debug_print_tree(command->group, lvl+1);
+                                prn++;
+                                continue;
+                        }
+                        if (argv) while (*argv) {
+                                fdprintf(2, " '%s'", *argv);
+                                argv++;
+                        }
+                        fdprintf(2, "\n");
+                        prn++;
+                }
+                pi = pi->next;
+                pin++;
+        }
+}
+#endif /* debug_print_tree */
+
 static struct pipe *new_pipe(void)
 {
         struct pipe *pi;
@@ -3972,15 +4132,16 @@ static struct pipe *parse_stream(char **pstring,
                                 goto parse_error;
                         }
                         if (ch == '\n') {
-#if ENABLE_HUSH_CASE
-                                /* "case ... in <newline> word) ..." -
-                                 * newlines are ignored (but ';' wouldn't be) */
-                                if (ctx.command->argv == NULL
-                                 && ctx.ctx_res_w == RES_MATCH
+                                /* Is this a case when newline is simply ignored?
+                                 * Some examples:
+                                 * "cmd | <newline> cmd ..."
+                                 * "case ... in <newline> word) ..."
+                                 */
+                                if (IS_NULL_CMD(ctx.command)
+                                 && dest.length == 0 && !dest.has_quoted_part
                                 ) {
                                         continue;
                                 }
-#endif
                                 /* Treat newline as a command separator. */
                                 done_pipe(&ctx, PIPE_SEQ);
                                 debug_printf_parse("heredoc_cnt:%d\n", heredoc_cnt);
@@ -4112,6 +4273,31 @@ static struct pipe *parse_stream(char **pstring,
                         if (parse_redirect(&ctx, redir_fd, redir_style, input))
                                 goto parse_error;
                         continue; /* back to top of while (1) */
+                case '#':
+                        if (dest.length == 0 && !dest.has_quoted_part) {
+                                /* skip "#comment" */
+                                while (1) {
+                                        ch = i_peek(input);
+                                        if (ch == EOF || ch == '\n')
+                                                break;
+                                        i_getch(input);
+                                        /* note: we do not add it to &ctx.as_string */
+                                }
+                                nommu_addchr(&ctx.as_string, '\n');
+                                continue; /* back to top of while (1) */
+                        }
+                        break;
+                case '\\':
+                        if (next == '\n') {
+                                /* It's "\<newline>" */
+#if !BB_MMU
+                                /* Remove trailing '\' from ctx.as_string */
+                                ctx.as_string.data[--ctx.as_string.length] = '\0';
+#endif
+                                ch = i_getch(input); /* eat it */
+                                continue; /* back to top of while (1) */
+                        }
+                        break;
                 }
 
                 if (dest.o_assignment == MAYBE_ASSIGNMENT
@@ -4126,19 +4312,8 @@ static struct pipe *parse_stream(char **pstring,
                 /* Note: nommu_addchr(&ctx.as_string, ch) is already done */
 
                 switch (ch) {
-                case '#':
-                        if (dest.length == 0) {
-                                while (1) {
-                                        ch = i_peek(input);
-                                        if (ch == EOF || ch == '\n')
-                                                break;
-                                        i_getch(input);
-                                        /* note: we do not add it to &ctx.as_string */
-                                }
-                                nommu_addchr(&ctx.as_string, '\n');
-                        } else {
-                                o_addQchr(&dest, ch);
-                        }
+                case '#': /* non-comment #: "echo a#b" etc */
+                        o_addQchr(&dest, ch);
                         break;
                 case '\\':
                         if (next == EOF) {
@@ -4146,21 +4321,14 @@ static struct pipe *parse_stream(char **pstring,
                                 xfunc_die();
                         }
                         ch = i_getch(input);
-                        if (ch != '\n') {
-                                o_addchr(&dest, '\\');
-                                /*nommu_addchr(&ctx.as_string, '\\'); - already done */
-                                o_addchr(&dest, ch);
-                                nommu_addchr(&ctx.as_string, ch);
-                                /* Example: echo Hello \2>file
-                                 * we need to know that word 2 is quoted */
-                                dest.has_quoted_part = 1;
-                        }
-#if !BB_MMU
-                        else {
-                                /* It's "\<newline>". Remove trailing '\' from ctx.as_string */
-                                ctx.as_string.data[--ctx.as_string.length] = '\0';
-                        }
-#endif
+                        /* note: ch != '\n' (that case does not reach this place) */
+                        o_addchr(&dest, '\\');
+                        /*nommu_addchr(&ctx.as_string, '\\'); - already done */
+                        o_addchr(&dest, ch);
+                        nommu_addchr(&ctx.as_string, ch);
+                        /* Example: echo Hello \2>file
+                         * we need to know that word 2 is quoted */
+                        dest.has_quoted_part = 1;
                         break;
                 case '$':
                         if (parse_dollar(&ctx.as_string, &dest, input, /*quote_mask:*/ 0) != 0) {
@@ -4366,7 +4534,9 @@ static struct pipe *parse_stream(char **pstring,
         expand_string_to_string(str)
 #endif
 static char *expand_string_to_string(const char *str, int do_unbackslash);
+#if ENABLE_HUSH_TICK
 static int process_command_subs(o_string *dest, const char *s);
+#endif
 
 /* expand_strvec_to_strvec() takes a list of strings, expands
  * all variable references within and returns a pointer to
@@ -6309,48 +6479,57 @@ static int checkjobs(struct pipe *fg_pipe)
 #endif
                 /* Were we asked to wait for fg pipe? */
                 if (fg_pipe) {
-                        for (i = 0; i < fg_pipe->num_cmds; i++) {
+                        i = fg_pipe->num_cmds;
+                        while (--i >= 0) {
                                 debug_printf_jobs("check pid %d\n", fg_pipe->cmds[i].pid);
                                 if (fg_pipe->cmds[i].pid != childpid)
                                         continue;
                                 if (dead) {
+                                        int ex;
                                         fg_pipe->cmds[i].pid = 0;
                                         fg_pipe->alive_cmds--;
-                                        if (i == fg_pipe->num_cmds - 1) {
-                                                /* last process gives overall exitstatus */
-                                                rcode = WEXITSTATUS(status);
-                                                /* bash prints killer signal's name for *last*
-                                                 * process in pipe (prints just newline for SIGINT).
-                                                 * Mimic this. Example: "sleep 5" + (^\ or kill -QUIT)
-                                                 */
-                                                if (WIFSIGNALED(status)) {
-                                                        int sig = WTERMSIG(status);
+                                        ex = WEXITSTATUS(status);
+                                        /* bash prints killer signal's name for *last*
+                                         * process in pipe (prints just newline for SIGINT).
+                                         * Mimic this. Example: "sleep 5" + (^\ or kill -QUIT)
+                                         */
+                                        if (WIFSIGNALED(status)) {
+                                                int sig = WTERMSIG(status);
+                                                if (i == fg_pipe->num_cmds-1)
                                                         printf("%s\n", sig == SIGINT ? "" : get_signame(sig));
-                                                        /* TODO: MIPS has 128 sigs (1..128), what if sig==128 here?
-                                                         * Maybe we need to use sig | 128? */
-                                                        rcode = sig + 128;
-                                                }
-                                                IF_HAS_KEYWORDS(if (fg_pipe->pi_inverted) rcode = !rcode;)
+                                                /* TODO: MIPS has 128 sigs (1..128), what if sig==128 here?
+                                                 * Maybe we need to use sig | 128? */
+                                                ex = sig + 128;
                                         }
+                                        fg_pipe->cmds[i].cmd_exitcode = ex;
                                 } else {
                                         fg_pipe->cmds[i].is_stopped = 1;
                                         fg_pipe->stopped_cmds++;
                                 }
                                 debug_printf_jobs("fg_pipe: alive_cmds %d stopped_cmds %d\n",
                                                 fg_pipe->alive_cmds, fg_pipe->stopped_cmds);
-                                if (fg_pipe->alive_cmds - fg_pipe->stopped_cmds <= 0) {
+                                if (fg_pipe->alive_cmds == fg_pipe->stopped_cmds) {
                                         /* All processes in fg pipe have exited or stopped */
+                                        i = fg_pipe->num_cmds;
+                                        while (--i >= 0) {
+                                                rcode = fg_pipe->cmds[i].cmd_exitcode;
+                                                /* usually last process gives overall exitstatus,
+                                                 * but with "set -o pipefail", last *failed* process does */
+                                                if (G.o_opt[OPT_O_PIPEFAIL] == 0 || rcode != 0)
+                                                        break;
+                                        }
+                                        IF_HAS_KEYWORDS(if (fg_pipe->pi_inverted) rcode = !rcode;)
 /* Note: *non-interactive* bash does not continue if all processes in fg pipe
  * are stopped. Testcase: "cat | cat" in a script (not on command line!)
  * and "killall -STOP cat" */
                                         if (G_interactive_fd) {
 #if ENABLE_HUSH_JOB
-                                                if (fg_pipe->alive_cmds)
+                                                if (fg_pipe->alive_cmds != 0)
                                                         insert_bg_job(fg_pipe);
 #endif
                                                 return rcode;
                                         }
-                                        if (!fg_pipe->alive_cmds)
+                                        if (fg_pipe->alive_cmds == 0)
                                                 return rcode;
                                 }
                                 /* There are still running processes in the fg pipe */
@@ -6436,7 +6615,7 @@ static int checkjobs_and_fg_shell(struct pipe *fg_pipe)
  * subshell:     ( list ) [&]
  */
 #if !ENABLE_HUSH_MODE_X
-#define redirect_and_varexp_helper(new_env_p, old_vars_p, command, squirrel, char argv_expanded) \
+#define redirect_and_varexp_helper(new_env_p, old_vars_p, command, squirrel, argv_expanded) \
         redirect_and_varexp_helper(new_env_p, old_vars_p, command, squirrel)
 #endif
 static int redirect_and_varexp_helper(char ***new_env_p,
@@ -6821,94 +7000,6 @@ static NOINLINE int run_pipe(struct pipe *pi)
         return -1;
 }
 
-#ifndef debug_print_tree
-static void debug_print_tree(struct pipe *pi, int lvl)
-{
-        static const char *const PIPE[] = {
-                [PIPE_SEQ] = "SEQ",
-                [PIPE_AND] = "AND",
-                [PIPE_OR ] = "OR" ,
-                [PIPE_BG ] = "BG" ,
-        };
-        static const char *RES[] = {
-                [RES_NONE ] = "NONE" ,
-# if ENABLE_HUSH_IF
-                [RES_IF   ] = "IF"   ,
-                [RES_THEN ] = "THEN" ,
-                [RES_ELIF ] = "ELIF" ,
-                [RES_ELSE ] = "ELSE" ,
-                [RES_FI   ] = "FI"   ,
-# endif
-# if ENABLE_HUSH_LOOPS
-                [RES_FOR  ] = "FOR"  ,
-                [RES_WHILE] = "WHILE",
-                [RES_UNTIL] = "UNTIL",
-                [RES_DO   ] = "DO"   ,
-                [RES_DONE ] = "DONE" ,
-# endif
-# if ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE
-                [RES_IN   ] = "IN"   ,
-# endif
-# if ENABLE_HUSH_CASE
-                [RES_CASE ] = "CASE" ,
-                [RES_CASE_IN ] = "CASE_IN" ,
-                [RES_MATCH] = "MATCH",
-                [RES_CASE_BODY] = "CASE_BODY",
-                [RES_ESAC ] = "ESAC" ,
-# endif
-                [RES_XXXX ] = "XXXX" ,
-                [RES_SNTX ] = "SNTX" ,
-        };
-        static const char *const CMDTYPE[] = {
-                "{}",
-                "()",
-                "[noglob]",
-# if ENABLE_HUSH_FUNCTIONS
-                "func()",
-# endif
-        };
-
-        int pin, prn;
-
-        pin = 0;
-        while (pi) {
-                fprintf(stderr, "%*spipe %d res_word=%s followup=%d %s\n", lvl*2, "",
-                                pin, RES[pi->res_word], pi->followup, PIPE[pi->followup]);
-                prn = 0;
-                while (prn < pi->num_cmds) {
-                        struct command *command = &pi->cmds[prn];
-                        char **argv = command->argv;
-
-                        fprintf(stderr, "%*s cmd %d assignment_cnt:%d",
-                                        lvl*2, "", prn,
-                                        command->assignment_cnt);
-                        if (command->group) {
-                                fprintf(stderr, " group %s: (argv=%p)%s%s\n",
-                                                CMDTYPE[command->cmd_type],
-                                                argv
-# if !BB_MMU
-                                                , " group_as_string:", command->group_as_string
-# else
-                                                , "", ""
-# endif
-                                );
-                                debug_print_tree(command->group, lvl+1);
-                                prn++;
-                                continue;
-                        }
-                        if (argv) while (*argv) {
-                                fprintf(stderr, " '%s'", *argv);
-                                argv++;
-                        }
-                        fprintf(stderr, "\n");
-                        prn++;
-                }
-                pi = pi->next;
-                pin++;
-        }
-}
-#endif /* debug_print_tree */
-
 /* NB: called by pseudo_exec, and therefore must not modify any
  * global data until exec/_exit (we can be a child after vfork!) */
 static int run_list(struct pipe *pi)
@@ -6938,27 +7029,30 @@ static int run_list(struct pipe *pi)
 
 #if ENABLE_HUSH_LOOPS
         /* Check syntax for "for" */
-        for (struct pipe *cpipe = pi; cpipe; cpipe = cpipe->next) {
-                if (cpipe->res_word != RES_FOR && cpipe->res_word != RES_IN)
-                        continue;
-                /* current word is FOR or IN (BOLD in comments below) */
-                if (cpipe->next == NULL) {
-                        syntax_error("malformed for");
-                        debug_leave();
-                        debug_printf_exec("run_list lvl %d return 1\n", G.run_list_level);
-                        return 1;
-                }
-                /* "FOR v; do ..." and "for v IN a b; do..." are ok */
-                if (cpipe->next->res_word == RES_DO)
-                        continue;
-                /* next word is not "do". It must be "in" then ("FOR v in ...") */
-                if (cpipe->res_word == RES_IN /* "for v IN a b; not_do..."? */
-                 || cpipe->next->res_word != RES_IN /* FOR v not_do_and_not_in..."? */
-                ) {
-                        syntax_error("malformed for");
-                        debug_leave();
-                        debug_printf_exec("run_list lvl %d return 1\n", G.run_list_level);
-                        return 1;
+        {
+                struct pipe *cpipe;
+                for (cpipe = pi; cpipe; cpipe = cpipe->next) {
+                        if (cpipe->res_word != RES_FOR && cpipe->res_word != RES_IN)
+                                continue;
+                        /* current word is FOR or IN (BOLD in comments below) */
+                        if (cpipe->next == NULL) {
+                                syntax_error("malformed for");
+                                debug_leave();
+                                debug_printf_exec("run_list lvl %d return 1\n", G.run_list_level);
+                                return 1;
+                        }
+                        /* "FOR v; do ..." and "for v IN a b; do..." are ok */
+                        if (cpipe->next->res_word == RES_DO)
+                                continue;
+                        /* next word is not "do". It must be "in" then ("FOR v in ...") */
+                        if (cpipe->res_word == RES_IN /* "for v IN a b; not_do..."? */
+                         || cpipe->next->res_word != RES_IN /* FOR v not_do_and_not_in..."? */
+                        ) {
+                                syntax_error("malformed for");
+                                debug_leave();
+                                debug_printf_exec("run_list lvl %d return 1\n", G.run_list_level);
+                                return 1;
+                        }
                 }
         }
 #endif
@@ -7241,7 +7335,7 @@ static int run_and_free_list(struct pipe *pi)
 {
         int rcode = 0;
         debug_printf_exec("run_and_free_list entered\n");
-        if (!G.n_mode) {
+        if (!G.o_opt[OPT_O_NOEXEC]) {
                 debug_printf_exec(": run_list: 1st pipe with %d cmds\n", pi->num_cmds);
                 rcode = run_list(pi);
         }
@@ -7339,13 +7433,41 @@ static void set_fatal_handlers(void)
 }
 #endif
 
-static int set_mode(const char cstate, const char mode)
+static int set_mode(int state, char mode, const char *o_opt)
 {
-        int state = (cstate == '-' ? 1 : 0);
+        int idx;
         switch (mode) {
-                case 'n': G.n_mode = state; break;
-                case 'x': IF_HUSH_MODE_X(G_x_mode = state;) break;
-                default:  return EXIT_FAILURE;
+        case 'n':
+                G.o_opt[OPT_O_NOEXEC] = state;
+                break;
+        case 'x':
+                IF_HUSH_MODE_X(G_x_mode = state;)
+                break;
+        case 'o':
+                if (!o_opt) {
+                        /* "set -+o" without parameter.
+                         * in bash, set -o produces this output:
+                         *  pipefail        off
+                         * and set +o:
+                         *  set +o pipefail
+                         * We always use the second form.
+                         */
+                        const char *p = o_opt_strings;
+                        idx = 0;
+                        while (*p) {
+                                printf("set %co %s\n", (G.o_opt[idx] ? '-' : '+'), p);
+                                idx++;
+                                p += strlen(p) + 1;
+                        }
+                        break;
+                }
+                idx = index_in_strings(o_opt_strings, o_opt);
+                if (idx >= 0) {
+                        G.o_opt[idx] = state;
+                        break;
+                }
+        default:
+                return EXIT_FAILURE;
         }
         return EXIT_SUCCESS;
 }
@@ -7357,7 +7479,7 @@ int hush_main(int argc, char **argv)
         unsigned builtin_argc;
         char **e;
         struct variable *cur_var;
-        struct variable shell_ver;
+        struct variable *shell_ver;
 
         INIT_G();
         if (EXIT_SUCCESS) /* if EXIT_SUCCESS == 0, it is already done */
@@ -7366,17 +7488,17 @@ int hush_main(int argc, char **argv)
         G.argv0_for_re_execing = argv[0];
 #endif
         /* Deal with HUSH_VERSION */
-        memset(&shell_ver, 0, sizeof(shell_ver));
-        shell_ver.flg_export = 1;
-        shell_ver.flg_read_only = 1;
+        shell_ver = xzalloc(sizeof(*shell_ver));
+        shell_ver->flg_export = 1;
+        shell_ver->flg_read_only = 1;
         /* Code which handles ${var<op>...} needs writable values for all variables,
          * therefore we xstrdup: */
-        shell_ver.varstr = xstrdup(hush_version_str),
-        G.top_var = &shell_ver;
+        shell_ver->varstr = xstrdup(hush_version_str);
         /* Create shell local variables from the values
          * currently living in the environment */
         debug_printf_env("unsetenv '%s'\n", "HUSH_VERSION");
         unsetenv("HUSH_VERSION"); /* in case it exists in initial env */
+        G.top_var = shell_ver;
         cur_var = G.top_var;
         e = environ;
         if (e) while (*e) {
@@ -7391,8 +7513,8 @@ int hush_main(int argc, char **argv)
                 e++;
         }
         /* (Re)insert HUSH_VERSION into env (AFTER we scanned the env!) */
-        debug_printf_env("putenv '%s'\n", shell_ver.varstr);
-        putenv(shell_ver.varstr);
+        debug_printf_env("putenv '%s'\n", shell_ver->varstr);
+        putenv(shell_ver->varstr);
 
         /* Export PWD */
         set_pwd_var(/*exp:*/ 1);
@@ -7585,7 +7707,7 @@ int hush_main(int argc, char **argv)
 #endif
                 case 'n':
                 case 'x':
-                        if (set_mode('-', opt) == 0) /* no error */
+                        if (set_mode(1, opt, NULL) == 0) /* no error */
                                 break;
                 default:
 #ifndef BB_VER
@@ -7752,18 +7874,6 @@ int hush_main(int argc, char **argv)
         parse_and_run_file(stdin);
 
  final_return:
-#if ENABLE_FEATURE_CLEAN_UP
-        if (G.cwd != bb_msg_unknown)
-                free((char*)G.cwd);
-        cur_var = G.top_var->next;
-        while (cur_var) {
-                struct variable *tmp = cur_var;
-                if (!cur_var->max_len)
-                        free(cur_var->varstr);
-                cur_var = cur_var->next;
-                free(tmp);
-        }
-#endif
         hush_exit(G.last_exitcode);
 }
 
@@ -8375,15 +8485,18 @@ static int FAST_FUNC builtin_set(char **argv)
         }
 
         do {
-                if (!strcmp(arg, "--")) {
+                if (strcmp(arg, "--") == 0) {
                         ++argv;
                         goto set_argv;
                 }
                 if (arg[0] != '+' && arg[0] != '-')
                         break;
-                for (n = 1; arg[n]; ++n)
-                        if (set_mode(arg[0], arg[n]))
+                for (n = 1; arg[n]; ++n) {
+                        if (set_mode((arg[0] == '-'), arg[n], argv[1]))
                                 goto error;
+                        if (arg[n] == 'o' && argv[1])
+                                argv++;
+                }
         } while ((arg = *++argv) != NULL);
         /* Now argv[0] is 1st argument */
 
diff --git a/shell/hush_test/hush-misc/assignment3.right b/shell/hush_test/hush-misc/assignment3.right
new file mode 100644
index 000000000..0f02d7cbc
--- /dev/null
+++ b/shell/hush_test/hush-misc/assignment3.right
@@ -0,0 +1,2 @@
+Done:0
+abc=123
diff --git a/shell/hush_test/hush-misc/assignment3.tests b/shell/hush_test/hush-misc/assignment3.tests
new file mode 100755
index 000000000..790129be1
--- /dev/null
+++ b/shell/hush_test/hush-misc/assignment3.tests
@@ -0,0 +1,5 @@
+# This must be interpreted as assignments
+a=1 b\
+=2 c=3
+echo Done:$?
+echo abc=$a$b$c
diff --git a/shell/hush_test/hush-misc/pipefail.right b/shell/hush_test/hush-misc/pipefail.right
new file mode 100644
index 000000000..5845d8939
--- /dev/null
+++ b/shell/hush_test/hush-misc/pipefail.right
@@ -0,0 +1,40 @@
+Default:
+true | true:
+0
+1
+true | false:
+1
+0
+false | true:
+0
+1
+exit 2 | exit 3 | exit 4:
+4
+0
+Pipefail on:
+true | true:
+0
+1
+true | false:
+1
+0
+false | true:
+1
+0
+exit 2 | exit 3 | exit 4:
+4
+0
+Pipefail off:
+true | true:
+0
+1
+true | false:
+1
+0
+false | true:
+0
+1
+exit 2 | exit 3 | exit 4:
+4
+0
+Done
diff --git a/shell/hush_test/hush-misc/pipefail.tests b/shell/hush_test/hush-misc/pipefail.tests
new file mode 100755
index 000000000..9df841861
--- /dev/null
+++ b/shell/hush_test/hush-misc/pipefail.tests
@@ -0,0 +1,45 @@
+echo Default:
+echo "true | true:"
+  true | true; echo $?
+! true | true; echo $?
+echo "true | false:"
+  true | false; echo $?
+! true | false; echo $?
+echo "false | true:"
+  false | true; echo $?
+! false | true; echo $?
+echo "exit 2 | exit 3 | exit 4:"
+  exit 2 | exit 3 | exit 4; echo $?
+! exit 2 | exit 3 | exit 4; echo $?
+
+echo Pipefail on:
+set -o pipefail
+echo "true | true:"
+  true | true; echo $?
+! true | true; echo $?
+echo "true | false:"
+  true | false; echo $?
+! true | false; echo $?
+echo "false | true:"
+  false | true; echo $?
+! false | true; echo $?
+echo "exit 2 | exit 3 | exit 4:"
+  exit 2 | exit 3 | exit 4; echo $?
+! exit 2 | exit 3 | exit 4; echo $?
+
+echo Pipefail off:
+set +o pipefail
+echo "true | true:"
+  true | true; echo $?
+! true | true; echo $?
+echo "true | false:"
+  true | false; echo $?
+! true | false; echo $?
+echo "false | true:"
+  false | true; echo $?
+! false | true; echo $?
+echo "exit 2 | exit 3 | exit 4:"
+  exit 2 | exit 3 | exit 4; echo $?
+! exit 2 | exit 3 | exit 4; echo $?
+
+echo Done
diff --git a/shell/hush_test/hush-parsing/comment1.right b/shell/hush_test/hush-parsing/comment1.right
new file mode 100644
index 000000000..a102b1d4e
--- /dev/null
+++ b/shell/hush_test/hush-parsing/comment1.right
@@ -0,0 +1,2 @@
+Nothing:
+String: #should-be-echoed
diff --git a/shell/hush_test/hush-parsing/comment1.tests b/shell/hush_test/hush-parsing/comment1.tests
new file mode 100755
index 000000000..d268860ff
--- /dev/null
+++ b/shell/hush_test/hush-parsing/comment1.tests
@@ -0,0 +1,2 @@
+echo Nothing: #should-not-be-echoed
+echo String: ""#should-be-echoed
diff --git a/shell/hush_test/hush-parsing/eol1.right b/shell/hush_test/hush-parsing/eol1.right
new file mode 100644
index 000000000..31c896f62
--- /dev/null
+++ b/shell/hush_test/hush-parsing/eol1.right
@@ -0,0 +1 @@
+Done:0
diff --git a/shell/hush_test/hush-parsing/eol1.tests b/shell/hush_test/hush-parsing/eol1.tests
new file mode 100755
index 000000000..f1b55e8b8
--- /dev/null
+++ b/shell/hush_test/hush-parsing/eol1.tests
@@ -0,0 +1,18 @@
+# bug was that we treated <newline> as ';' in this line:
+true || echo foo |
+echo BAD1 | cat
+
+# variation on the same theme
+true || echo foo |
+# comment
+echo BAD2 | cat
+
+# variation on the same theme
+true || echo foo |
+
+echo BAD3 | cat
+
+# this should error out, but currently works in hush:
+#true || echo foo |;
+
+echo Done:$?
diff --git a/testsuite/bunzip2.tests b/testsuite/bunzip2.tests
index 827aee867..fcfce1a31 100755
--- a/testsuite/bunzip2.tests
+++ b/testsuite/bunzip2.tests
@@ -463,6 +463,24 @@ $ECHO -ne "\x40\xa0\x00\x8b\x12\xe8\xfb\xb7\x27\xaa\xd3\x36\x0c\xfc\xe1\x40"
 $ECHO -ne "\x01\xff\x8b\xb9\x22\x9c\x28\x48\x5f\xa5\xca\xf3\x80"
 }
 
+pbzip_4m_zeros() {
+$ECHO -ne "\x42\x5a\x68\x31\x31\x41\x59\x26\x53\x59\x63\xe3\xec\xa2\x00\x06"
+$ECHO -ne "\xe4\xc1\x00\xc0\x00\x02\x00\x00\x08\x20\x00\x30\xcc\x09\xaa\x69"
+$ECHO -ne "\x94\xa1\x36\xa9\x28\x4f\x17\x72\x45\x38\x50\x90\x63\xe3\xec\xa2"
+$ECHO -ne "\x42\x5a\x68\x31\x31\x41\x59\x26\x53\x59\x63\xe3\xec\xa2\x00\x06"
+$ECHO -ne "\xe4\xc1\x00\xc0\x00\x02\x00\x00\x08\x20\x00\x30\xcc\x09\xaa\x69"
+$ECHO -ne "\x94\xa1\x36\xa9\x28\x4f\x17\x72\x45\x38\x50\x90\x63\xe3\xec\xa2"
+$ECHO -ne "\x42\x5a\x68\x31\x31\x41\x59\x26\x53\x59\x63\xe3\xec\xa2\x00\x06"
+$ECHO -ne "\xe4\xc1\x00\xc0\x00\x02\x00\x00\x08\x20\x00\x30\xcc\x09\xaa\x69"
+$ECHO -ne "\x94\xa1\x36\xa9\x28\x4f\x17\x72\x45\x38\x50\x90\x63\xe3\xec\xa2"
+$ECHO -ne "\x42\x5a\x68\x31\x31\x41\x59\x26\x53\x59\x63\xe3\xec\xa2\x00\x06"
+$ECHO -ne "\xe4\xc1\x00\xc0\x00\x02\x00\x00\x08\x20\x00\x30\xcc\x09\xaa\x69"
+$ECHO -ne "\x94\xa1\x36\xa9\x28\x4f\x17\x72\x45\x38\x50\x90\x63\xe3\xec\xa2"
+$ECHO -ne "\x42\x5a\x68\x31\x31\x41\x59\x26\x53\x59\xc9\xb5\x21\xef\x00\x04"
+$ECHO -ne "\x8d\x40\x20\xc0\x00\x01\x00\x00\x08\x20\x00\x30\xcc\x05\x29\xa6"
+$ECHO -ne "\x4a\x11\xb1\x4a\x11\xe2\xee\x48\xa7\x0a\x12\x19\x36\xa4\x3d\xe0"
+}
+
 prep() {
     rm -f t*
     hello_$ext >t1.$ext
@@ -520,9 +538,18 @@ if test "${0##*/}" = "bunzip2.tests"; then
     if test1_bz2 | ${bb}bunzip2 >/dev/null \
         && test "`test1_bz2 | ${bb}bunzip2 | md5sum`" = "61bbeee4be9c6f110a71447f584fda7b  -"
     then
-        echo "PASS: $unpack: test bz2 file"
+        echo "PASS: $unpack: test_bz2 file"
+    else
+        echo "FAIL: $unpack: test_bz2 file"
+        FAILCOUNT=$((FAILCOUNT + 1))
+    fi
+
+    if pbzip_4m_zeros | ${bb}bunzip2 >/dev/null \
+        && test "`pbzip_4m_zeros | ${bb}bunzip2 | md5sum`" = "b5cfa9d6c8febd618f91ac2843d50a1c  -"
+    then
+        echo "PASS: $unpack: pbzip_4m_zeros file"
     else
-        echo "FAIL: $unpack: test bz2 file"
+        echo "FAIL: $unpack: pbzip_4m_zeros file"
         FAILCOUNT=$((FAILCOUNT + 1))
     fi
 fi
diff --git a/testsuite/date/date-@-works b/testsuite/date/date-@-works
new file mode 100644
index 000000000..03b4c7f03
--- /dev/null
+++ b/testsuite/date/date-@-works
@@ -0,0 +1,13 @@
+# Tests for time_t value (unix time format)
+
+# Just before DST switched off
+test x"Sun Oct 31 03:59:59 EEST 2010" = x"`TZ=EET-2EEST,M3.5.0/3,M10.5.0/4 busybox date -d @1288486799`"
+
+# Just after DST switched off
+test x"Sun Oct 31 03:00:01 EET 2010" = x"`TZ=EET-2EEST,M3.5.0/3,M10.5.0/4 busybox date -d @1288486801`"
+
+# Just before DST switched on
+test x"Sun Mar 28 02:59:59 EET 2010" = x"`TZ=EET-2EEST,M3.5.0/3,M10.5.0/4 busybox date -d @1269737999`"
+
+# Just after DST switched on
+test x"Sun Mar 28 04:00:01 EEST 2010" = x"`TZ=EET-2EEST,M3.5.0/3,M10.5.0/4 busybox date -d @1269738001`"
diff --git a/testsuite/du/du-h-works b/testsuite/du/du-h-works
index c18433c29..1c77b6552 100644
--- a/testsuite/du/du-h-works
+++ b/testsuite/du/du-h-works
@@ -1,4 +1,4 @@
 # FEATURE: CONFIG_FEATURE_HUMAN_READABLE
 
 dd if=/dev/zero of=file bs=1M count=1 2>/dev/null
-test x"`busybox du -h .`" = x"1.0M      ."
+test x"`busybox du -h file`" = x"1.0M   file"
diff --git a/testsuite/md5sum.tests b/testsuite/md5sum.tests
index 35ec67cb4..1068b083f 100755
--- a/testsuite/md5sum.tests
+++ b/testsuite/md5sum.tests
@@ -18,6 +18,11 @@ fi
 sum="$1"
 expected="$2"
 
+test -f "$bindir/.config" && . "$bindir/.config"
+
+test x"$CONFIG_FEATURE_FANCY_HEAD" != x"y" \
+&& { echo "SKIPPED: $sum"; exit 0; }
+
 text="The quick brown fox jumps over the lazy dog"
 text=`yes "$text" | head -c 9999`
 
diff --git a/testsuite/patch.tests b/testsuite/patch.tests
index e482304f6..c604b9c1d 100755
--- a/testsuite/patch.tests
+++ b/testsuite/patch.tests
@@ -75,7 +75,7 @@ zxc
 testing "patch detects already applied hunk" \
         'patch 2>&1; echo $?; cat input' \
 "\
-Possibly reversed hunk 1 at 2
+Possibly reversed hunk 1 at 4
 Hunk 1 FAILED 1/1.
  abc
 +def
@@ -103,7 +103,7 @@ def
 testing "patch detects already applied hunk at the EOF" \
         'patch 2>&1; echo $?; cat input' \
 "\
-Possibly reversed hunk 1 at 3
+Possibly reversed hunk 1 at 4
 Hunk 1 FAILED 1/1.
  abc
  123
@@ -175,6 +175,43 @@ abc
  123
 " \
 
+# testing "test name" "command(s)" "expected result" "file input" "stdin"
+testing "patch at the beginning" \
+        'patch 2>&1; cat input' \
+"\
+patching file input
+111changed
+444
+555
+666
+777
+888
+999
+" \
+"\
+111
+222
+333
+444
+555
+666
+777
+888
+999
+" \
+"\
+--- input
++++ input
+@@ -1,6 +1,4 @@
+-111
+-222
+-333
++111changed
+ 444
+ 555
+ 666
+" \
+
 rm input.orig 2>/dev/null
 
 exit $FAILCOUNT
diff --git a/testsuite/testing.sh b/testsuite/testing.sh
index c7c9ca6af..e7e64e58b 100644
--- a/testsuite/testing.sh
+++ b/testsuite/testing.sh
@@ -87,6 +87,7 @@ testing()
 
   $ECHO -ne "$3" > expected
   $ECHO -ne "$4" > input
+  [ -z "$VERBOSE" ] || echo ======================
   [ -z "$VERBOSE" ] || echo "echo -ne '$4' >input"
   [ -z "$VERBOSE" ] || echo "echo -ne '$5' | $2"
   $ECHO -ne "$5" | eval "$2" > actual
diff --git a/util-linux/Config.src b/util-linux/Config.src
index c71b4de38..dbf2b0d85 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -40,6 +40,13 @@ config BLKID
           WARNING:
           With all submodules selected, it will add ~8k to busybox.
 
+config FEATURE_BLKID_TYPE
+        bool "Print filesystem type"
+        default n
+        depends on BLKID
+        help
+          Show TYPE="filesystem type"
+
 config DMESG
         bool "dmesg"
         default y
diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 0b227a8ae..ce4c98ebe 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -16,9 +16,9 @@ enum {
         OPT_e = (1 << 2),
         OPT_f = (1 << 3),
         OPT_l = (1 << 4),
-        OPT_p = (1 << 5) * ENABLE_FEATURE_PIDFILE,
-        OPT_a = (1 << 6),
-        OPT_M = (1 << 7),
+        OPT_a = (1 << 5),
+        OPT_M = (1 << 6),
+        OPT_p = (1 << 7) * ENABLE_FEATURE_PIDFILE,
 };
 
 struct acpi_event {
@@ -199,8 +199,9 @@ int acpid_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
 
         opt_complementary = "df:e--e";
-        opts = getopt32(argv, "c:de:fl:p:a:M:" IF_FEATURE_ACPID_COMPAT("g:m:s:S:v"),
-                &opt_dir, &opt_input, &opt_logfile, &opt_pidfile, &opt_action, &opt_map
+        opts = getopt32(argv, "c:de:fl:a:M:" IF_FEATURE_PIDFILE("p:") IF_FEATURE_ACPID_COMPAT("g:m:s:S:v"),
+                &opt_dir, &opt_input, &opt_logfile, &opt_action, &opt_map
+                IF_FEATURE_PIDFILE(, &opt_pidfile)
                 IF_FEATURE_ACPID_COMPAT(, NULL, NULL, NULL, NULL)
         );
 
diff --git a/util-linux/blkid.c b/util-linux/blkid.c
index 4ce44b144..fe88fb31d 100644
--- a/util-linux/blkid.c
+++ b/util-linux/blkid.c
@@ -10,9 +10,16 @@
 #include "libbb.h"
 #include "volume_id.h"
 
+//TODO: extend to take BLOCKDEV args, and show TYPE="fstype"
+
 int blkid_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int blkid_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+int blkid_main(int argc UNUSED_PARAM, char **argv)
 {
+        while (*++argv) {
+                /* Note: bogus device names don't cause any error messages */
+                add_to_uuid_cache(*argv);
+        }
+
         display_uuid_cache();
         return 0;
 }
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 07c8f55d1..77cc1fc12 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -26,7 +26,7 @@ enum {
 
 struct fb_bitfield {
         uint32_t offset;                /* beginning of bitfield */
-        uint32_t length;                /* length of bitfield */
+        uint32_t length;                /* length of bitfield */
         uint32_t msb_right;             /* !=0: Most significant bit is right */
 };
 struct fb_var_screeninfo {
@@ -52,7 +52,7 @@ struct fb_var_screeninfo {
         uint32_t height;                /* height of picture in mm */
         uint32_t width;                 /* width of picture in mm */
 
-        uint32_t accel_flags;           /* acceleration flags (hints) */
+        uint32_t accel_flags;           /* acceleration flags (hints) */
 
         /* Timing: All values in pixclocks, except pixclock (of course) */
         uint32_t pixclock;              /* pixel clock in ps (pico seconds) */
@@ -317,7 +317,7 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn,
                 }
                 case 4:
                 case 5:
-                case 6: {
+                case 6: {
                         static const uint32_t syncs[] = {FB_SYNC_VERT_HIGH_ACT, FB_SYNC_HOR_HIGH_ACT, FB_SYNC_COMP_HIGH_ACT};
                         ss(&base->sync, syncs[i-4], p, "low");
 //bb_info_msg("SYNC[%s]", p);
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 3f2e0d3ae..02785ab85 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -662,6 +662,7 @@ STATIC_OSF void bsd_select(void);
 STATIC_OSF void xbsd_print_disklabel(int);
 #include "fdisk_osf.c"
 
+STATIC_GPT void gpt_list_table(int xtra);
 #include "fdisk_gpt.c"
 
 #if ENABLE_FEATURE_SGI_LABEL || ENABLE_FEATURE_SUN_LABEL
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 8c4d521ab..a38fe05e7 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -4,7 +4,7 @@
  * Based on code from util-linux v 2.11l
  *
  * Copyright (c) 1989
- *      The Regents of the University of California.  All rights reserved.
+ * The Regents of the University of California.  All rights reserved.
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
@@ -32,11 +32,11 @@ static void bb_dump_addfile(dumper_t *dumper, char *name)
 }
 
 static const char *const add_strings[] = {
-        "\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"",         /* b */
-        "\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"",         /* c */
-        "\"%07.7_ax \" 8/2 \"  %05u \" \"\\n\"",        /* d */
-        "\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"",         /* o */
-        "\"%07.7_ax \" 8/2 \"   %04x \" \"\\n\"",       /* x */
+        "\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"",   /* b */
+        "\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"",   /* c */
+        "\"%07.7_ax \" 8/2 \"  %05u \" \"\\n\"",  /* d */
+        "\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"",   /* o */
+        "\"%07.7_ax \" 8/2 \"   %04x \" \"\\n\"", /* x */
 };
 
 static const char add_first[] ALIGN1 = "\"%07.7_Ax\n\"";
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 731216c06..e597ed637 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -40,7 +40,7 @@ typedef enum type_id {
         MSG
 } type_id;
 
-static int remove_ids(type_id type, int argc, char **argv)
+static int remove_ids(type_id type, char **argv)
 {
         unsigned long id;
         int nb_errors = 0;
@@ -48,7 +48,7 @@ static int remove_ids(type_id type, int argc, char **argv)
 
         arg.val = 0;
 
-        while (argc) {
+        while (argv[0]) {
                 id = bb_strtoul(argv[0], NULL, 10);
                 if (errno || id > INT_MAX) {
                         bb_error_msg("invalid id: %s", argv[0]);
@@ -67,7 +67,6 @@ static int remove_ids(type_id type, int argc, char **argv)
                                 nb_errors++;
                         }
                 }
-                argc--;
                 argv++;
         }
 
@@ -109,7 +108,7 @@ int ipcrm_main(int argc, char **argv)
                         else if (w == 'e')
                                 what = SEM;
 
-                        if (remove_ids(what, argc-2, &argv[2]))
+                        if (remove_ids(what, &argv[2]))
                                 fflush_stdout_and_exit(EXIT_FAILURE);
                         printf("resource(s) deleted\n");
                         return 0;
diff --git a/util-linux/more.c b/util-linux/more.c
index 1fd6f9ee8..c424a0e4b 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -29,16 +29,20 @@ struct globals {
 #define new_settings     (G.new_settings    )
 #define cin_fileno       (G.cin_fileno      )
 
-#define setTermSettings(fd, argp) do { \
-                if (ENABLE_FEATURE_USE_TERMIOS) tcsetattr(fd, TCSANOW, argp); \
-        } while (0)
+#define setTermSettings(fd, argp) \
+do { \
+        if (ENABLE_FEATURE_USE_TERMIOS) \
+                tcsetattr(fd, TCSANOW, argp); \
+} while (0)
 #define getTermSettings(fd, argp) tcgetattr(fd, argp)
 
 static void gotsig(int sig UNUSED_PARAM)
 {
-        bb_putchar('\n');
+        /* bb_putchar_stderr doesn't use stdio buffering,
+         * therefore it is safe in signal handler */
+        bb_putchar_stderr('\n');
         setTermSettings(cin_fileno, &initial_settings);
-        exit(EXIT_FAILURE);
+        _exit(EXIT_FAILURE);
 }
 
 #define CONVERTED_TAB_SIZE 8
@@ -187,6 +191,7 @@ int more_main(int argc UNUSED_PARAM, char **argv)
                         }
                         /* My small mind cannot fathom backspaces and UTF-8 */
                         putchar(c);
+                        die_if_ferror_stdout(); /* if tty was destroyed (closed xterm, etc) */
                 }
                 fclose(file);
                 fflush_all();
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 78c603856..5597d9eba 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -9,39 +9,10 @@
  */
 #include <mntent.h>
 #include <sys/mount.h>
-/* Make sure we have all the new mount flags we actually try to use. */
-#ifndef MS_BIND
-# define MS_BIND        (1 << 12)
-#endif
-#ifndef MS_MOVE
-# define MS_MOVE        (1 << 13)
-#endif
-#ifndef MS_RECURSIVE
-# define MS_RECURSIVE   (1 << 14)
-#endif
-#ifndef MS_SILENT
-# define MS_SILENT      (1 << 15)
-#endif
-/* The shared subtree stuff, which went in around 2.6.15. */
-#ifndef MS_UNBINDABLE
-# define MS_UNBINDABLE  (1 << 17)
-#endif
-#ifndef MS_PRIVATE
-# define MS_PRIVATE     (1 << 18)
-#endif
-#ifndef MS_SLAVE
-# define MS_SLAVE       (1 << 19)
-#endif
-#ifndef MS_SHARED
-# define MS_SHARED      (1 << 20)
-#endif
-#ifndef MS_RELATIME
-# define MS_RELATIME    (1 << 21)
-#endif
 #include "libbb.h"
 
-
 #if defined(__dietlibc__)
+// TODO: This does not belong here.
 /* 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
  * dietlibc-0.30 does not have implementation of getmntent_r() */
 static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
@@ -54,23 +25,17 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
 
 /* ignored: -v -d -t -i */
 #define OPTION_STRING           "fldnra" "vdt:i"
-#define OPT_FORCE               (1 << 0)
-#define OPT_LAZY                (1 << 1)
+#define OPT_FORCE               (1 << 0) // Same as MNT_FORCE
+#define OPT_LAZY                (1 << 1) // Same as MNT_DETACH
 #define OPT_FREELOOP            (1 << 2)
 #define OPT_NO_MTAB             (1 << 3)
 #define OPT_REMOUNT             (1 << 4)
 #define OPT_ALL                 (ENABLE_FEATURE_UMOUNT_ALL ? (1 << 5) : 0)
 
-// These constants from linux/fs.h must match OPT_FORCE and OPT_LAZY,
-// otherwise "doForce" trick below won't work!
-//#define MNT_FORCE  0x00000001 /* Attempt to forcibly umount */
-//#define MNT_DETACH 0x00000002 /* Just detach from the tree */
-
 int umount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int umount_main(int argc UNUSED_PARAM, char **argv)
 {
         int doForce;
-        char *const buf = xmalloc(4096); /* reducing stack usage */
         struct mntent me;
         FILE *fp;
         char *fstype = NULL;
@@ -85,6 +50,9 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
         opt = getopt32(argv, OPTION_STRING, &fstype);
         //argc -= optind;
         argv += optind;
+
+        // MNT_FORCE and MNT_DETACH (from linux/fs.h) must match
+        // OPT_FORCE and OPT_LAZY, otherwise this trick won't work:
         doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY));
 
         /* Get a list of mount points from mtab.  We read them all in now mostly
@@ -101,7 +69,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
                 if (opt & OPT_ALL)
                         bb_error_msg_and_die("can't open '%s'", bb_path_mtab_file);
         } else {
-                while (getmntent_r(fp, &me, buf, 4096)) {
+                while (getmntent_r(fp, &me, bb_common_bufsiz1, sizeof(bb_common_bufsiz1))) {
                         /* Match fstype if passed */
                         if (!match_fstype(&me, fstype))
                                 continue;
@@ -203,7 +171,6 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
                         free(mtl);
                         mtl = m;
                 }
-                free(buf);
         }
 
         return status;
diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c
index b84a6f0b2..28e997043 100644
--- a/util-linux/volume_id/cramfs.c
+++ b/util-linux/volume_id/cramfs.c
@@ -51,7 +51,7 @@ int FAST_FUNC volume_id_probe_cramfs(struct volume_id *id /*,uint64_t off*/)
                 volume_id_set_label_string(id, cs->name, 16);
 
 //              volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//              id->type = "cramfs";
+                IF_FEATURE_BLKID_TYPE(id->type = "cramfs";)
                 return 0;
         }
 
diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index 80c217f98..b5194a7b5 100644
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -65,10 +65,12 @@ int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
         volume_id_set_uuid(id, es->uuid, UUID_DCE);
         dbg("ext: label '%s' uuid '%s'", id->label, id->uuid);
 
-//      if ((le32_to_cpu(es->feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)
-//              id->type = "ext3";
-//      else
-//              id->type = "ext2";
+#if ENABLE_FEATURE_BLKID_TYPE
+        if ((le32_to_cpu(es->feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)
+                id->type = "ext3";
+        else
+                id->type = "ext2";
+#endif
 
         return 0;
 }
diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c
index b0f427c74..904fbb201 100644
--- a/util-linux/volume_id/fat.c
+++ b/util-linux/volume_id/fat.c
@@ -332,7 +332,7 @@ int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partitio
 
  ret:
 //      volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//      id->type = "vfat";
+        IF_FEATURE_BLKID_TYPE(id->type = "vfat";)
 
         return 0;
 }
diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index bf32e6a8c..7c9930543 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -19,14 +19,22 @@ static struct uuidCache_s {
         char *device;
         char *label;
         char *uc_uuid; /* prefix makes it easier to grep for */
+        IF_FEATURE_BLKID_TYPE(const char *type;)
 } *uuidCache;
 
+#if !ENABLE_FEATURE_BLKID_TYPE
+#define get_label_uuid(fd, label, uuid, type) \
+        get_label_uuid(fd, label, uuid)
+#define uuidcache_addentry(device, label, uuid, type) \
+        uuidcache_addentry(device, label, uuid)
+#endif
+
 /* Returns !0 on error.
  * Otherwise, returns malloc'ed strings for label and uuid
  * (and they can't be NULL, although they can be "").
  * NB: closes fd. */
 static int
-get_label_uuid(int fd, char **label, char **uuid)
+get_label_uuid(int fd, char **label, char **uuid, const char **type)
 {
         int rv = 1;
         uint64_t size;
@@ -44,7 +52,12 @@ get_label_uuid(int fd, char **label, char **uuid)
         if (vid->label[0] != '\0' || vid->uuid[0] != '\0') {
                 *label = xstrndup(vid->label, sizeof(vid->label));
                 *uuid  = xstrndup(vid->uuid, sizeof(vid->uuid));
+#if ENABLE_FEATURE_BLKID_TYPE
+                *type = vid->type;
+                dbg("found label '%s', uuid '%s', type '%s'", *label, *uuid, *type);
+#else
                 dbg("found label '%s', uuid '%s'", *label, *uuid);
+#endif
                 rv = 0;
         }
  ret:
@@ -54,7 +67,7 @@ get_label_uuid(int fd, char **label, char **uuid)
 
 /* NB: we take ownership of (malloc'ed) label and uuid */
 static void
-uuidcache_addentry(char *device, /*int major, int minor,*/ char *label, char *uuid)
+uuidcache_addentry(char *device, /*int major, int minor,*/ char *label, char *uuid, const char *type)
 {
         struct uuidCache_s *last;
 
@@ -72,6 +85,7 @@ uuidcache_addentry(char *device, /*int major, int minor,*/ char *label, char *uu
         last->device = device;
         last->label = label;
         last->uc_uuid = uuid;
+        IF_FEATURE_BLKID_TYPE(last->type = type;)
 }
 
 /* If get_label_uuid() on device_name returns success,
@@ -83,10 +97,6 @@ uuidcache_check_device(const char *device,
                 void *userData UNUSED_PARAM,
                 int depth UNUSED_PARAM)
 {
-        char *uuid = uuid; /* for compiler */
-        char *label = label;
-        int fd;
-
         /* note: this check rejects links to devices, among other nodes */
         if (!S_ISBLK(statbuf->st_mode))
                 return TRUE;
@@ -99,21 +109,15 @@ uuidcache_check_device(const char *device,
         if (major(statbuf->st_rdev) == 2)
                 return TRUE;
 
-        fd = open(device, O_RDONLY);
-        if (fd < 0)
-                return TRUE;
+        add_to_uuid_cache(device);
 
-        /* get_label_uuid() closes fd in all cases (success & failure) */
-        if (get_label_uuid(fd, &label, &uuid) == 0) {
-                /* uuidcache_addentry() takes ownership of all three params */
-                uuidcache_addentry(xstrdup(device), /*ma, mi,*/ label, uuid);
-        }
         return TRUE;
 }
 
 static void
 uuidcache_init(void)
 {
+        dbg("DBG: uuidCache=%x, uuidCache");
         if (uuidCache)
                 return;
 
@@ -223,11 +227,38 @@ void display_uuid_cache(void)
                         printf(" LABEL=\"%s\"", u->label);
                 if (u->uc_uuid[0])
                         printf(" UUID=\"%s\"", u->uc_uuid);
+#if ENABLE_FEATURE_BLKID_TYPE
+        if (u->type)
+                printf(" TYPE=\"%s\"", u->type);
+#endif
                 bb_putchar('\n');
                 u = u->next;
         }
 }
 
+int add_to_uuid_cache(const char *device)
+{
+        char *uuid = uuid; /* for compiler */
+        char *label = label;
+#if ENABLE_FEATURE_BLKID_TYPE
+        const char *type = type;
+#endif
+        int fd;
+
+        fd = open(device, O_RDONLY);
+        if (fd < 0)
+                return 0;
+
+        /* get_label_uuid() closes fd in all cases (success & failure) */
+        if (get_label_uuid(fd, &label, &uuid, &type) == 0) {
+                /* uuidcache_addentry() takes ownership of all four params */
+                uuidcache_addentry(xstrdup(device), /*ma, mi,*/ label, uuid, type);
+                return 1;
+        }
+        return 0;
+}
+
+
 /* Used by mount and findfs */
 
 char *get_devname_from_label(const char *spec)
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index cf7585138..f3f19dba7 100644
--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@@ -195,7 +195,7 @@ int FAST_FUNC volume_id_probe_hfs_hfsplus(struct volume_id *id /*,uint64_t off*/
 
         volume_id_set_uuid(id, hfs->finder_info.id, UUID_HFS);
 //      volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//      id->type = "hfs";
+        IF_FEATURE_BLKID_TYPE(id->type = "hfs";)
 
         return 0;
 
diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c
index 1519de496..1d7693a9c 100644
--- a/util-linux/volume_id/iso9660.c
+++ b/util-linux/volume_id/iso9660.c
@@ -114,7 +114,7 @@ int FAST_FUNC volume_id_probe_iso9660(struct volume_id *id /*,uint64_t off*/)
 
  found:
 //      volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//      id->type = "iso9660";
+        IF_FEATURE_BLKID_TYPE(id->type = "iso9660";)
 
         return 0;
 }
diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c
index eb7a44872..5333af2c3 100644
--- a/util-linux/volume_id/jfs.c
+++ b/util-linux/volume_id/jfs.c
@@ -54,7 +54,7 @@ int FAST_FUNC volume_id_probe_jfs(struct volume_id *id /*,uint64_t off*/)
         volume_id_set_uuid(id, js->uuid, UUID_DCE);
 
 //      volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//      id->type = "jfs";
+        IF_FEATURE_BLKID_TYPE(id->type = "jfs";)
 
         return 0;
 }
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index e1c86369d..761e54f9f 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -75,7 +75,7 @@ int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/,
 
         dbg("found raid signature");
 //      volume_id_set_usage(id, VOLUME_ID_RAID);
-//      id->type = "linux_raid_member";
+        IF_FEATURE_BLKID_TYPE(id->type = "linux_raid_member";)
 
         return 0;
 }
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index 574354611..62d588522 100644
--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@@ -55,6 +55,7 @@ int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/)
                         if (memcmp(buf, "SWAPSPACE2", 10) == 0
                          || memcmp(buf, "S1SUSPEND", 9) == 0
                          || memcmp(buf, "S2SUSPEND", 9) == 0
+                         || memcmp(buf, "LINHIB0001", 10) == 0
                          || memcmp(buf, "ULSUSPEND", 9) == 0
                         ) {
                                 sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
@@ -72,7 +73,7 @@ int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/)
 
 found:
 //      volume_id_set_usage(id, VOLUME_ID_OTHER);
-//      id->type = "swap";
+        IF_FEATURE_BLKID_TYPE(id->type = "swap";)
 
         return 0;
 }
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index 8ab09e381..f9b376672 100644
--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@@ -94,7 +94,7 @@ int FAST_FUNC volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/)
 
 //      volume_id_set_usage(id, VOLUME_ID_CRYPTO);
         volume_id_set_uuid(id, header->uuid, UUID_DCE_STRING);
-//      id->type = "crypto_LUKS";
+        IF_FEATURE_BLKID_TYPE(id->type = "crypto_LUKS";)
 
         return 0;
 }
diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c
index 17b1fe8b3..547f141c9 100644
--- a/util-linux/volume_id/ntfs.c
+++ b/util-linux/volume_id/ntfs.c
@@ -188,7 +188,7 @@ int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/)
 
  found:
 //      volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//      id->type = "ntfs";
+        IF_FEATURE_BLKID_TYPE(id->type = "ntfs";)
 
         return 0;
 }
diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c
index e6c455965..fcdb15192 100644
--- a/util-linux/volume_id/ocfs2.c
+++ b/util-linux/volume_id/ocfs2.c
@@ -101,6 +101,6 @@ int FAST_FUNC volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/)
         volume_id_set_label_string(id, os->s_label, OCFS2_MAX_VOL_LABEL_LEN < VOLUME_ID_LABEL_SIZE ?
                                         OCFS2_MAX_VOL_LABEL_LEN : VOLUME_ID_LABEL_SIZE);
         volume_id_set_uuid(id, os->s_uuid, UUID_DCE);
-//      id->type = "ocfs2";
+        IF_FEATURE_BLKID_TYPE(id->type = "ocfs2";)
         return 0;
 }
diff --git a/util-linux/volume_id/reiserfs.c b/util-linux/volume_id/reiserfs.c
index 3120b29a0..67b4a1877 100644
--- a/util-linux/volume_id/reiserfs.c
+++ b/util-linux/volume_id/reiserfs.c
@@ -107,7 +107,7 @@ int FAST_FUNC volume_id_probe_reiserfs(struct volume_id *id /*,uint64_t off*/)
 
  found:
 //      volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//      id->type = "reiserfs";
+        IF_FEATURE_BLKID_TYPE(id->type = "reiserfs";)
 
         return 0;
 }
diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c
index 228e77a41..15653bedf 100644
--- a/util-linux/volume_id/romfs.c
+++ b/util-linux/volume_id/romfs.c
@@ -47,7 +47,7 @@ int FAST_FUNC volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/)
                 }
 
 //              volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//              id->type = "romfs";
+                IF_FEATURE_BLKID_TYPE(id->type = "romfs";)
                 return 0;
         }
 
diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c
index e0fa20a8c..6eb96464d 100644
--- a/util-linux/volume_id/sysv.c
+++ b/util-linux/volume_id/sysv.c
@@ -99,7 +99,7 @@ int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/)
                 if (vs->s_magic == cpu_to_le32(SYSV_MAGIC) || vs->s_magic == cpu_to_be32(SYSV_MAGIC)) {
 //                      volume_id_set_label_raw(id, vs->s_fname, 6);
                         volume_id_set_label_string(id, vs->s_fname, 6);
-//                      id->type = "sysv";
+                        IF_FEATURE_BLKID_TYPE(id->type = "sysv");
                         goto found;
                 }
         }
@@ -112,7 +112,7 @@ int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/)
                 if (xs->s_magic == cpu_to_le32(XENIX_MAGIC) || xs->s_magic == cpu_to_be32(XENIX_MAGIC)) {
 //                      volume_id_set_label_raw(id, xs->s_fname, 6);
                         volume_id_set_label_string(id, xs->s_fname, 6);
-//                      id->type = "xenix";
+                        IF_FEATURE_BLKID_TYPE(id->type = "xenix";)
                         goto found;
                 }
         }
diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c
index dd2573171..cd63c8d8a 100644
--- a/util-linux/volume_id/udf.c
+++ b/util-linux/volume_id/udf.c
@@ -167,7 +167,6 @@ anchor:
 
  found:
 //      volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//      id->type = "udf";
-
+        IF_FEATURE_BLKID_TYPE(id->type = "udf";)
         return 0;
 }
diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h
index 9b808ff6b..1c64046e5 100644
--- a/util-linux/volume_id/volume_id_internal.h
+++ b/util-linux/volume_id/volume_id_internal.h
@@ -80,7 +80,9 @@ struct volume_id {
 //      char            type_version[VOLUME_ID_FORMAT_SIZE];
 //      smallint        usage_id;
 //      const char      *usage;
-//      const char      *type;
+#if ENABLE_FEATURE_BLKID_TYPE
+        const char      *type;
+#endif
 };
 
 struct volume_id* FAST_FUNC volume_id_open_node(int fd);
diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c
index 1017d077b..84746020e 100644
--- a/util-linux/volume_id/xfs.c
+++ b/util-linux/volume_id/xfs.c
@@ -54,7 +54,7 @@ int FAST_FUNC volume_id_probe_xfs(struct volume_id *id /*,uint64_t off*/)
         volume_id_set_uuid(id, xs->uuid, UUID_DCE);
 
 //      volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//      id->type = "xfs";
+        IF_FEATURE_BLKID_TYPE(id->type = "xfs";)
 
         return 0;
 }