Merge commit '06f719fd79fe15ce6fd5431bc58fcb22851de24d^'

101 files changed, 2872 insertions, 2299 deletions

diff --git a/Config.in b/Config.in
index d2e64a08d..273f2de38 100644
--- a/Config.in
+++ b/Config.in
@@ -146,6 +146,14 @@ config FEATURE_INSTALLER
           busybox at runtime to create hard links or symlinks for all the
           applets that are compiled into busybox.
 
+config INSTALL_NO_USR
+        bool "Don't use /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.
+
 config LOCALE_SUPPORT
         bool "Enable locale support (system needs locale for this to work)"
         default n
@@ -298,15 +306,6 @@ config FEATURE_CLEAN_UP
           Don't enable this unless you have a really good reason to clean
           things up manually.
 
-config FEATURE_UTMP
-        bool "Support utmp file"
-        default y
-        help
-          The file /var/run/utmp is used to track who is currently logged in.
-          With this option on, certain applets (getty, login, telnetd etc)
-          will create and delete entries there.
-          "who" applet requires this option.
-
 config FEATURE_WTMP
         bool "Support wtmp file"
         default y
@@ -318,6 +317,15 @@ config FEATURE_WTMP
           will append new entries there.
           "last" applet requires this option.
 
+config FEATURE_UTMP
+        bool "Support utmp file"
+        default y
+        help
+          The file /var/run/utmp is used to track who is currently logged in.
+          With this option on, certain applets (getty, login, telnetd etc)
+          will create and delete entries there.
+          "who" applet requires this option.
+
 config FEATURE_PIDFILE
         bool "Support writing pidfiles"
         default y
@@ -330,14 +338,19 @@ config FEATURE_SUID
         default y
         help
           With this option you can install the busybox binary belonging
-          to root with the suid bit set, and it will automatically drop
-          priviledges for applets that don't need root access.
+          to root with the suid bit set, enabling some applets to perform
+          root-level operations even when run by ordinary users
+          (for example, mounting of user mounts in fstab needs this).
+
+          Busybox will automatically drop priviledges for applets
+          that don't need root access.
 
           If you are really paranoid and don't want to do this, build two
           busybox binaries with different applets in them (and the appropriate
           symlinks pointing to each binary), and only set the suid bit on the
-          one that needs it. The applets currently marked to need the suid bit
-          are:
+          one that needs it.
+
+          The applets currently marked to need the suid bit are:
 
           crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su,
           traceroute, vlock.
@@ -674,20 +687,13 @@ endchoice
 
 endmenu
 
-menu 'Installation Options'
-
-config INSTALL_NO_USR
-        bool "Don't use /usr"
-        default n
-        help
-          Disable use of /usr. Don't activate this option if you don't know
-          that you really want this behaviour.
+menu 'Installation Options ("make install" behavior)'
 
 choice
-        prompt "Applets links"
+        prompt "What kind of applet links to install"
         default INSTALL_APPLET_SYMLINKS
         help
-          Choose how you install applets links.
+          Choose what kind of links to applets are created by "make install".
 
 config INSTALL_APPLET_SYMLINKS
         bool "as soft-links"
@@ -711,8 +717,9 @@ config INSTALL_APPLET_DONT
         bool "not installed"
         depends on FEATURE_INSTALLER || FEATURE_SH_STANDALONE || FEATURE_PREFER_APPLETS
         help
-          Do not install applet links. Useful when using the -install feature
-          or a standalone shell for rescue purposes.
+          Do not install applet links. Useful when you plan to use
+          busybox --install for installing links, or plan to use
+          a standalone shell and thus don't need applet links.
 
 endchoice
 
@@ -736,8 +743,8 @@ config INSTALL_SH_APPLET_HARDLINK
 config INSTALL_SH_APPLET_SCRIPT_WRAPPER
         bool "as script wrapper"
         help
-          Install /bin/sh applet as script wrapper that call the busybox
-          binary.
+          Install /bin/sh applet as script wrapper that calls
+          the busybox binary.
 
 endchoice
 
diff --git a/applets/usage_compressed b/applets/usage_compressed
index e1fd0d94d..af66bc5dc 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -9,6 +9,13 @@ test -x "$loc/usage" || exit 1
 test "$SED" || SED=sed
 test "$DD" || DD=dd
 
+# Some people were bitten by their system lacking a (proper) od
+od -v -t x1 </dev/null >/dev/null
+if test $? != 0; then
+        echo 'od tool is not installed or cannot accept "-v -t x1" options'
+        exit 1
+fi
+
 exec >"$target.$$"
 
 echo '#define UNPACKED_USAGE "" \'
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index d96790b89..a195434e4 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -307,7 +307,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //usage:#define bunzip2_trivial_usage
-//usage:       "[OPTIONS] [FILE]..."
+//usage:       "[-cf] [FILE]..."
 //usage:#define bunzip2_full_usage "\n\n"
 //usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\nOptions:"
diff --git a/archival/cpio.c b/archival/cpio.c
index 7cd8ee8a7..a2d74dc79 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -370,7 +370,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
                 if (cpio_fmt[0] != 'n') /* we _require_ "-H newc" */
                         bb_show_usage();
                 if (opt & CPIO_OPT_FILE) {
-                        xmove_fd(xopen3(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO);
+                        xmove_fd(xopen(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
                 }
  dump:
                 return cpio_o();
diff --git a/archival/dpkg.c b/archival/dpkg.c
index b36c26198..07f01501b 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1524,8 +1524,8 @@ static char FAST_FUNC filter_rename_config(archive_handle_t *archive_handle)
                 buf = xmalloc(4096);
                 md5_begin(&md5);
                 while ((count = safe_read(fd, buf, 4096)) > 0)
-                        md5_hash(buf, count, &md5);
-                md5_end(buf, &md5); /* using buf as result storage */
+                        md5_hash(&md5, buf, count);
+                md5_end(&md5, buf); /* using buf as result storage */
                 close(fd);
 
                 md5line = xmalloc(16 * 2 + 2 + strlen(name_ptr) + 1);
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index cc549cd78..5fb1ab2ae 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -69,7 +69,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                         }
                 }
                 else if (existing_sb.st_mtime >= file_header->mtime) {
-                        if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
+                        if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
+                         && !S_ISDIR(file_header->mode)
+                        ) {
                                 bb_error_msg("%s not created: newer or "
                                         "same age file exists", file_header->name);
                         }
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index 8e7800ee9..7bf383e2d 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -8,6 +8,8 @@
  */
 #include "libbb.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
 int cksum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cksum_main(int argc UNUSED_PARAM, char **argv)
 {
diff --git a/coreutils/date.c b/coreutils/date.c
index 881dcc429..eed4714f9 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -19,38 +19,7 @@
 /* Input parsing code is always bulky - used heavy duty libc stuff as
    much as possible, missed out a lot of bounds checking */
 
-/* Default input handling to save surprising some people */
-
-/* GNU coreutils 6.9 man page:
- * date [OPTION]... [+FORMAT]
- * date [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]
- * -d, --date=STRING
- *      display time described by STRING, not `now'
- * -f, --file=DATEFILE
- *      like --date once for each line of DATEFILE
- * -r, --reference=FILE
- *      display the last modification time of FILE
- * -R, --rfc-2822
- *      output date and time in RFC 2822 format.
- *      Example: Mon, 07 Aug 2006 12:34:56 -0600
- * --rfc-3339=TIMESPEC
- *      output date and time in RFC 3339 format.
- *      TIMESPEC='date', 'seconds', or 'ns'
- *      Date and time components are separated by a single space:
- *      2006-08-07 12:34:56-06:00
- * -s, --set=STRING
- *      set time described by STRING
- * -u, --utc, --universal
- *      print or set Coordinated Universal Time
- *
- * Busybox:
- * long options are not supported
- * -f is not supported
- * -I seems to roughly match --rfc-3339, but -I has _optional_ param
- *    (thus "-I seconds" doesn't work, only "-Iseconds"),
- *    and does not support -Ins
- * -D FMT is a bbox extension for _input_ conversion of -d DATE
- */
+//applet:IF_DATE(APPLET(date, _BB_DIR_BIN, _BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_DATE) += date.o
 
@@ -69,6 +38,7 @@
 //config:         Enable option (-I) to output an ISO-8601 compliant
 //config:         date/time string.
 //config:
+//config:# defaults to "no": stat's nanosecond field is a bit non-portable
 //config:config FEATURE_DATE_NANO
 //config:       bool "Support %[num]N nanosecond format specifier"
 //config:       default n
@@ -92,6 +62,78 @@
 //config:         the same format. With it on, 'date DATE' additionally supports
 //config:         MMDDhhmm[[YY]YY][.ss] format.
 
+/* GNU coreutils 6.9 man page:
+ * date [OPTION]... [+FORMAT]
+ * date [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]
+ * -d, --date=STRING
+ *      display time described by STRING, not `now'
+ * -f, --file=DATEFILE
+ *      like --date once for each line of DATEFILE
+ * -r, --reference=FILE
+ *      display the last modification time of FILE
+ * -R, --rfc-2822
+ *      output date and time in RFC 2822 format.
+ *      Example: Mon, 07 Aug 2006 12:34:56 -0600
+ * --rfc-3339=TIMESPEC
+ *      output date and time in RFC 3339 format.
+ *      TIMESPEC='date', 'seconds', or 'ns'
+ *      Date and time components are separated by a single space:
+ *      2006-08-07 12:34:56-06:00
+ * -s, --set=STRING
+ *      set time described by STRING
+ * -u, --utc, --universal
+ *      print or set Coordinated Universal Time
+ *
+ * Busybox:
+ * long options are not supported
+ * -f is not supported
+ * -I seems to roughly match --rfc-3339, but -I has _optional_ param
+ *    (thus "-I seconds" doesn't work, only "-Iseconds"),
+ *    and does not support -Ins
+ * -D FMT is a bbox extension for _input_ conversion of -d DATE
+ */
+
+//usage:#define date_trivial_usage
+//usage:       "[OPTIONS] [+FMT] [TIME]"
+//usage:#define date_full_usage "\n\n"
+//usage:       "Display time (using +FMT), or set time\n"
+//usage:     "\nOptions:"
+//usage:        IF_NOT_LONG_OPTS(
+//usage:     "\n        [-s] TIME       Set time to TIME"
+//usage:     "\n        -u              Work in UTC (don't convert to local time)"
+//usage:     "\n        -R              Output RFC-2822 compliant date string"
+//usage:        ) IF_LONG_OPTS(
+//usage:     "\n        [-s,--set] TIME Set time to TIME"
+//usage:     "\n        -u,--utc        Work in UTC (don't convert to local time)"
+//usage:     "\n        -R,--rfc-2822   Output RFC-2822 compliant date string"
+//usage:        )
+//usage:        IF_FEATURE_DATE_ISOFMT(
+//usage:     "\n        -I[SPEC]        Output ISO-8601 compliant date string"
+//usage:     "\n                        SPEC='date' (default) for date only,"
+//usage:     "\n                        'hours', 'minutes', or 'seconds' for date and"
+//usage:     "\n                        time to the indicated precision"
+//usage:        )
+//usage:        IF_NOT_LONG_OPTS(
+//usage:     "\n        -r FILE         Display last modification time of FILE"
+//usage:     "\n        -d TIME         Display TIME, not 'now'"
+//usage:        ) IF_LONG_OPTS(
+//usage:     "\n        -r,--reference FILE     Display last modification time of FILE"
+//usage:     "\n        -d,--date TIME  Display TIME, not 'now'"
+//usage:        )
+//usage:        IF_FEATURE_DATE_ISOFMT(
+//usage:     "\n        -D FMT          Use FMT for -d TIME conversion"
+//usage:        )
+//usage:     "\n"
+//usage:     "\nRecognized TIME formats:"
+//usage:     "\n        hh:mm[:ss]"
+//usage:     "\n        [YYYY.]MM.DD-hh:mm[:ss]"
+//usage:     "\n        YYYY-MM-DD hh:mm[:ss]"
+//usage:     "\n        [[[[[YY]YY]MM]DD]hh]mm[.ss]"
+//usage:
+//usage:#define date_example_usage
+//usage:       "$ date\n"
+//usage:       "Wed Apr 12 18:52:41 MDT 2000\n"
+
 #include "libbb.h"
 #if ENABLE_FEATURE_DATE_NANO
 # include <sys/syscall.h>
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index ef1ea4328..8aa1d93b5 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -14,6 +14,8 @@
 
 #include "libbb.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
 enum {
         CT_UNIX2DOS = 1,
         CT_DOS2UNIX
diff --git a/coreutils/fold.c b/coreutils/fold.c
index 54f1aa2ac..4a6429ad7 100644
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -12,6 +12,8 @@
 #include "libbb.h"
 #include "unicode.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
 /* Must match getopt32 call */
 #define FLAG_COUNT_BYTES        1
 #define FLAG_BREAK_SPACES       2
diff --git a/coreutils/head.c b/coreutils/head.c
index 0845b4375..669aae819 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -13,6 +13,8 @@
 
 #include "libbb.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
 static const char head_opts[] ALIGN1 =
         "n:"
 #if ENABLE_FEATURE_FANCY_HEAD
diff --git a/coreutils/id.c b/coreutils/id.c
index 56286f4d4..ed1dc862e 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -17,6 +17,8 @@
 
 #include "libbb.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
 #if !ENABLE_USE_BB_PWD_GRP
 #if defined(__UCLIBC_MAJOR__) && (__UCLIBC_MAJOR__ == 0)
 #if (__UCLIBC_MINOR__ < 9) || (__UCLIBC_MINOR__ == 9 &&  __UCLIBC_SUBLEVEL__ < 30)
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 646f8bd10..e79210c0d 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -8,6 +8,8 @@
 
 #include "libbb.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
 typedef enum {
         /* 4th letter of applet_name is... */
         HASH_MD5 = 's', /* "md5>s<um" */
@@ -41,7 +43,7 @@ static uint8_t *hash_file(const char *filename /*, hash_algo_t hash_algo*/)
         } context;
         uint8_t *hash_value = NULL;
         RESERVE_CONFIG_UBUFFER(in_buf, 4096);
-        void FAST_FUNC (*update)(const void*, size_t, void*);
+        void FAST_FUNC (*update)(void*, const void*, size_t);
         void FAST_FUNC (*final)(void*, void*);
         hash_algo_t hash_algo = applet_name[3];
 
@@ -76,11 +78,11 @@ static uint8_t *hash_file(const char *filename /*, hash_algo_t hash_algo*/)
         }
 
         while (0 < (count = safe_read(src_fd, in_buf, 4096))) {
-                update(in_buf, count, &context);
+                update(&context, in_buf, count);
         }
 
         if (count == 0) {
-                final(in_buf, &context);
+                final(&context, in_buf);
                 hash_value = hash_bin_to_hex(in_buf, hash_len);
         }
 
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index 41aedd099..4388ccaa3 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -13,6 +13,8 @@
 #include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
 int mkfifo_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mkfifo_main(int argc UNUSED_PARAM, char **argv)
 {
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 0e5542dde..14d91b5df 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -14,6 +14,8 @@
 #include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
 static const char modes_chars[] ALIGN1 = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
 static const mode_t modes_cubp[] = { S_IFIFO, S_IFCHR, S_IFBLK };
 
diff --git a/coreutils/printenv.c b/coreutils/printenv.c
index d38f8fb5f..33be5c096 100644
--- a/coreutils/printenv.c
+++ b/coreutils/printenv.c
@@ -10,6 +10,8 @@
 
 #include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
 int printenv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int printenv_main(int argc UNUSED_PARAM, char **argv)
 {
diff --git a/coreutils/seq.c b/coreutils/seq.c
index 8be25360f..22bf3ec9d 100644
--- a/coreutils/seq.c
+++ b/coreutils/seq.c
@@ -86,7 +86,8 @@ int seq_main(int argc, char **argv)
         v = first;
         n = 0;
         while (increment >= 0 ? v <= last : v >= last) {
-                printf("%s%0*.*f", sep, width, frac_part, v);
+                if (printf("%s%0*.*f", sep, width, frac_part, v) < 0)
+                        break; /* I/O error, bail out (yes, this really happens) */
                 sep = opt_s;
                 /* v += increment; - would accumulate floating point errors */
                 n++;
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index b983df47e..433f9d6ee 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -20,7 +20,7 @@
 
 #include "libbb.h"
 
-/* This is a NOFORK applet. Be very careful! */
+/* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells */
 
 
 #if ENABLE_FEATURE_FANCY_SLEEP || ENABLE_FEATURE_FLOAT_SLEEP
@@ -49,6 +49,10 @@ int sleep_main(int argc UNUSED_PARAM, char **argv)
 
 #if ENABLE_FEATURE_FLOAT_SLEEP
 
+# if ENABLE_LOCALE_SUPPORT
+        /* undo busybox.c setlocale */
+        setlocale(LC_NUMERIC, "C");
+# endif
         duration = 0;
         do {
                 char *arg = *argv;
@@ -62,14 +66,15 @@ int sleep_main(int argc UNUSED_PARAM, char **argv)
                         d = strtod(arg, &pp);
                         if (errno || *pp)
                                 bb_show_usage();
-                        arg[len] = sv;
-                        len--;
-                        sv = arg[len];
-                        arg[len] = '1';
-                        duration += d * xatoul_sfx(&arg[len], sfx);
-                        arg[len] = sv;
-                } else
+                        arg += len;
+                        *arg-- = sv;
+                        sv = *arg;
+                        *arg = '1';
+                        duration += d * xatoul_sfx(arg, sfx);
+                        *arg = sv;
+                } else {
                         duration += xatoul_sfx(arg, sfx);
+                }
         } while (*++argv);
 
         ts.tv_sec = MAXINT(typeof(ts.tv_sec));
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 4407b7105..eccc2d437 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_SORT_BIG
         /* Open output file _after_ we read all input ones */
         if (option_mask32 & FLAG_o)
-                xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO);
+                xmove_fd(xopen(str_o, O_WRONLY|O_CREAT|O_TRUNC), STDOUT_FILENO);
 #endif
         flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
         for (i = 0; i < linecount; i++)
diff --git a/coreutils/tee.c b/coreutils/tee.c
index 2e1e367f2..e66e885ec 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -42,7 +42,7 @@ int tee_main(int argc, char **argv)
          * that doesn't consume all its input.  Good idea... */
         signal(SIGPIPE, SIG_IGN);
 
-        /* Allocate an array of FILE *'s, with one extra for a sentinal. */
+        /* Allocate an array of FILE *'s, with one extra for a sentinel. */
         fp = files = xzalloc(sizeof(FILE *) * (argc + 2));
         np = names = argv - 1;
 
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index f0364b9a1..358de7894 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -52,8 +52,8 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
                         if (output[0] != '-' || output[1]) {
                                 // Won't work with "uniq - FILE" and closed stdin:
                                 //close(STDOUT_FILENO);
-                                //xopen3(output, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-                                xmove_fd(xopen3(output, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO);
+                                //xopen(output, O_WRONLY | O_CREAT | O_TRUNC);
+                                xmove_fd(xopen(output, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
                         }
                 }
         }
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 0da9b0988..0c4311f24 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -13,7 +13,7 @@
 #include "libbb.h"
 
 #if ENABLE_UUDECODE
-static void read_stduu(FILE *src_stream, FILE *dst_stream)
+static void FAST_FUNC read_stduu(FILE *src_stream, FILE *dst_stream, int flags UNUSED_PARAM)
 {
         char *line;
 
@@ -75,71 +75,6 @@ static void read_stduu(FILE *src_stream, FILE *dst_stream)
 }
 #endif
 
-static void read_base64(FILE *src_stream, FILE *dst_stream)
-{
-        int term_count = 0;
-
-        while (1) {
-                unsigned char translated[4];
-                int count = 0;
-
-                /* Process one group of 4 chars */
-                while (count < 4) {
-                        char *table_ptr;
-                        int ch;
-
-                        /* Get next _valid_ character.
-                         * bb_uuenc_tbl_base64[] contains this string:
-                         *  0         1         2         3         4         5         6
-                         *  012345678901234567890123456789012345678901234567890123456789012345
-                         * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n"
-                         */
-                        do {
-                                ch = fgetc(src_stream);
-                                if (ch == EOF) {
-                                        if (ENABLE_BASE64
-                                         && (!ENABLE_UUDECODE || applet_name[0] == 'b')
-                                         && count == 0
-                                        ) {
-                                                return;
-                                        }
-                                        bb_error_msg_and_die("short file");
-                                }
-                                table_ptr = strchr(bb_uuenc_tbl_base64, ch);
-                        } while (!table_ptr);
-
-                        /* Convert encoded character to decimal */
-                        ch = table_ptr - bb_uuenc_tbl_base64;
-
-                        if (ch == 65 /* '\n' */) {
-                                /* Terminating "====" line? */
-                                if (term_count == 4)
-                                        return; /* yes */
-                                term_count = 0;
-                                continue;
-                        }
-                        /* ch is 64 is char was '=', otherwise 0..63 */
-                        translated[count] = ch & 63; /* 64 -> 0 */
-                        if (ch == 64) {
-                                term_count++;
-                                break;
-                        }
-                        count++;
-                }
-
-                /* Merge 6 bit chars to 8 bit.
-                 * count can be < 4 when we decode the tail:
-                 * "eQ==" -> "y", not "y NUL NUL"
-                 */
-                if (count > 1)
-                        fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
-                if (count > 2)
-                        fputc(translated[1] << 4 | translated[2] >> 2, dst_stream);
-                if (count > 3)
-                        fputc(translated[2] << 6 | translated[3], dst_stream);
-        } /* while (1) */
-}
-
 #if ENABLE_UUDECODE
 int uudecode_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int uudecode_main(int argc UNUSED_PARAM, char **argv)
@@ -158,7 +93,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 
         /* Search for the start of the encoding */
         while ((line = xmalloc_fgetline(src_stream)) != NULL) {
-                void (*decode_fn_ptr)(FILE *src, FILE *dst);
+                void FAST_FUNC (*decode_fn_ptr)(FILE *src, FILE *dst, int flags);
                 char *line_ptr;
                 FILE *dst_stream;
                 int mode;
@@ -189,7 +124,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
                         fchmod(fileno(dst_stream), mode & (S_IRWXU | S_IRWXG | S_IRWXO));
                 }
                 free(line);
-                decode_fn_ptr(src_stream, dst_stream);
+                decode_fn_ptr(src_stream, dst_stream, /*flags:*/ BASE64_FLAG_UU_STOP + BASE64_FLAG_NO_STOP_CHAR);
                 /* fclose_if_not_stdin(src_stream); - redundant */
                 return EXIT_SUCCESS;
         }
@@ -231,7 +166,7 @@ int base64_main(int argc UNUSED_PARAM, char **argv)
                 *--argv = (char*)"-";
         src_stream = xfopen_stdin(argv[0]);
         if (opts) {
-                read_base64(src_stream, stdout);
+                read_base64(src_stream, stdout, /*flags:*/ (char)EOF);
         } else {
                 enum {
                         SRC_BUF_SIZE = 76/4*3,  /* This *MUST* be a multiple of 3 */
diff --git a/coreutils/wc.c b/coreutils/wc.c
index 4f14374c3..ecadae59b 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-/* BB_AUDIT SUSv3 _NOT_ compliant -- option -m is not currently supported. */
+/* BB_AUDIT SUSv3 compliant. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/wc.html */
 
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
@@ -19,10 +19,6 @@
  *  3) no checking of ferror on EOF returns
  *  4) isprint() wasn't considered when word counting.
  *
- * TODO:
- *
- * When locale support is enabled, count multibyte chars in the '-m' case.
- *
  * NOTES:
  *
  * The previous busybox wc attempted an optimization using stat for the
@@ -40,8 +36,8 @@
  *
  * for which 'wc -c' should output '0'.
  */
-
 #include "libbb.h"
+#include "unicode.h"
 
 #if !ENABLE_LOCALE_SUPPORT
 # undef isprint
@@ -58,11 +54,39 @@
 # define COUNT_FMT "u"
 #endif
 
+/* We support -m even when UNICODE_SUPPORT is off,
+ * we just don't advertise it in help text,
+ * since it is the same as -c in this case.
+ */
+
+//usage:#define wc_trivial_usage
+//usage:       "[-c"IF_UNICODE_SUPPORT("m")"lwL] [FILE]..."
+//usage:
+//usage:#define wc_full_usage "\n\n"
+//usage:       "Count lines, words, and bytes for each FILE (or stdin)\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -c      Count bytes"
+//usage:        IF_UNICODE_SUPPORT(
+//usage:     "\n        -m      Count characters"
+//usage:        )
+//usage:     "\n        -l      Count newlines"
+//usage:     "\n        -w      Count words"
+//usage:     "\n        -L      Print longest line length"
+//usage:
+//usage:#define wc_example_usage
+//usage:       "$ wc /etc/passwd\n"
+//usage:       "     31      46    1365 /etc/passwd\n"
+
+/* Order is important if we want to be compatible with
+ * column order in "wc -cmlwL" output:
+ */
 enum {
-        WC_LINES        = 0,
-        WC_WORDS        = 1,
-        WC_CHARS        = 2,
-        WC_LENGTH       = 3
+        WC_LINES    = 0,
+        WC_WORDS    = 1,
+        WC_UNICHARS = 2,
+        WC_CHARS    = 3,
+        WC_LENGTH   = 4,
+        NUM_WCS     = 5,
 };
 
 int wc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -72,13 +96,15 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
         const char *start_fmt = " %9"COUNT_FMT + 1;
         const char *fname_fmt = " %s\n";
         COUNT_T *pcounts;
-        COUNT_T counts[4];
-        COUNT_T totals[4];
+        COUNT_T counts[NUM_WCS];
+        COUNT_T totals[NUM_WCS];
         int num_files;
         smallint status = EXIT_SUCCESS;
         unsigned print_type;
 
-        print_type = getopt32(argv, "lwcL");
+        init_unicode();
+
+        print_type = getopt32(argv, "lwcmL");
 
         if (print_type == 0) {
                 print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS);
@@ -99,7 +125,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
         pcounts = counts;
 
         num_files = 0;
-        while ((arg = *argv++) != 0) {
+        while ((arg = *argv++) != NULL) {
                 FILE *fp;
                 const char *s;
                 unsigned u;
@@ -117,21 +143,28 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
                 linepos = 0;
                 in_word = 0;
 
-                do {
+                while (1) {
                         int c;
                         /* Our -w doesn't match GNU wc exactly... oh well */
 
-                        ++counts[WC_CHARS];
                         c = getc(fp);
                         if (c == EOF) {
                                 if (ferror(fp)) {
                                         bb_simple_perror_msg(arg);
                                         status = EXIT_FAILURE;
                                 }
-                                --counts[WC_CHARS];
                                 goto DO_EOF;            /* Treat an EOF as '\r'. */
                         }
-                        if (isprint_asciionly(c)) {
+
+                        /* Cater for -c and -m */
+                        ++counts[WC_CHARS];
+                        if (unicode_status != UNICODE_ON /* every byte is a new char */
+                         || (c & 0xc0) != 0x80 /* it isn't a 2nd+ byte of a Unicode char */
+                        ) {
+                                ++counts[WC_UNICHARS];
+                        }
+
+                        if (isprint_asciionly(c)) { /* FIXME: not unicode-aware */
                                 ++linepos;
                                 if (!isspace(c)) {
                                         in_word = 1;
@@ -167,18 +200,18 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
                         if (c == EOF) {
                                 break;
                         }
-                } while (1);
+                }
+
+                fclose_if_not_stdin(fp);
 
                 if (totals[WC_LENGTH] < counts[WC_LENGTH]) {
                         totals[WC_LENGTH] = counts[WC_LENGTH];
                 }
                 totals[WC_LENGTH] -= counts[WC_LENGTH];
 
-                fclose_if_not_stdin(fp);
-
  OUTPUT:
                 /* coreutils wc tries hard to print pretty columns
-                 * (saves results for all files, find max col len etc...)
+                 * (saves results for all files, finds max col len etc...)
                  * we won't try that hard, it will bloat us too much */
                 s = start_fmt;
                 u = 0;
@@ -188,7 +221,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
                                 s = " %9"COUNT_FMT; /* Ok... restore the leading space. */
                         }
                         totals[u] += pcounts[u];
-                } while (++u < 4);
+                } while (++u < NUM_WCS);
                 printf(fname_fmt, arg);
         }
 
diff --git a/docs/busybox_footer.pod b/docs/busybox_footer.pod
index 47eabaeeb..c346c736b 100644
--- a/docs/busybox_footer.pod
+++ b/docs/busybox_footer.pod
@@ -252,4 +252,34 @@ Tito Ragusa <farmatito@tiscali.it>
 
     devfsd and size optimizations in strings, openvt and deallocvt.
 
+=for html <br>
+
+Paul Fox <pgf@foxharp.boston.ma.us>
+
+    vi editing mode for ash, various other patches/fixes
+
+=for html <br>
+
+Roberto A. Foglietta <me@roberto.foglietta.name>
+
+    port: dnsd
+
+=for html <br>
+
+Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+
+    misc
+
+=for html <br>
+
+Mike Frysinger <vapier@gentoo.org>
+
+    initial e2fsprogs, printenv, setarch, sum, misc
+
+=for html <br>
+
+Jie Zhang <jie.zhang@analog.com>
+
+    fixed two bugs in msh and hush (exitcode of killed processes)
+
 =cut
diff --git a/docs/contributing.txt b/docs/contributing.txt
index 39aaef1b5..e3289fd49 100644
--- a/docs/contributing.txt
+++ b/docs/contributing.txt
@@ -229,8 +229,11 @@ Here are some guidelines on how to submit a patch to Busybox.
 Making A Patch
 ~~~~~~~~~~~~~~
 
-If you've got anonymous CVS access set up, making a patch is simple. Just make
-sure you're in the busybox/ directory and type 'cvs diff -bwu > mychanges.patch'.
+If you've got anonymous Git access set up, making a patch is simple. Just make
+sure you're in the busybox/ directory and type:
+
+        git diff -b -w > mychanges.patch
+
 You can send the resulting .patch file to the mailing list with a description
 of what it does. (But not before you test it! See the next section for some
 guidelines.) It is preferred that patches be sent as attachments, but it is
@@ -238,8 +241,12 @@ not required.
 
 Also, feel free to help test other people's patches and reply to them with
 comments. You can apply a patch by saving it into your busybox/ directory and
-typing 'patch < mychanges.patch'. Then you can recompile, see if it runs, test
-if it works as advertised, and post your findings to the mailing list.
+typing:
+
+        patch -p1 < mychanges.patch
+
+Then you can recompile, see if it runs, test if it works as advertised, and
+post your findings to the mailing list.
 
 NOTE: Please do not include extraneous or irrelevant changes in your patches.
 Please do not try to "bundle" two patches together into one. Make single,
@@ -252,7 +259,7 @@ Testing Guidelines
 ~~~~~~~~~~~~~~~~~~
 
 It's considered good form to test your new feature before you submit a patch
-to the mailing list, and especially before you commit a change to CVS. Here
+to the mailing list, and especially before you push a change to Git. Here
 are some guidelines on how to test your changes.
 
  - Always test Busybox applets against GNU counterparts and make sure the
@@ -348,7 +355,7 @@ responses from queries to applet maintainer or positive responses from folks
 on the mailing list.
 
 We've made strident efforts to put a useful "collaboration" infrastructure in
-place in the form of mailing lists, the bug tracking system, and CVS. Please
+place in the form of mailing lists, the bug tracking system, and Git. Please
 use these resources.
 
 
@@ -373,39 +380,43 @@ opposite effect.
 
 
 
-Committing Changes to CVS
--------------------------
+Pushing Changes to Git
+----------------------
 
 If you submit several patches that demonstrate that you are a skilled and wise
-coder, you may be invited to become a committer, thus enabling you to commit
-changes directly to CVS. This is nice because you don't have to wait for
-someone else to commit your change for you, you can just do it yourself.
+coder, you may be invited to become a committer, thus enabling you to push
+changes directly to Git. This is nice because you don't have to wait for
+someone else to push your change for you, you can just do it yourself.
 
 But note that this is a privilege that comes with some responsibilities. You
-should test your changes before you commit them. You should also talk to an
+should test your changes before you push them. You should also talk to an
 applet maintainer before you make any kind of sweeping changes to somebody
 else's code. Big changes should still go to the mailing list first. Remember,
 being wise, polite, and discreet is more important than being clever.
 
+For more information on Git push access, see:
 
-When To Commit
-~~~~~~~~~~~~~~
+        http://busybox.net/developer.html
 
-Generally, you should feel free to commit a change if:
+
+When To Push
+~~~~~~~~~~~~
+
+Generally, you should feel free to push a change if:
 
  - Your changes are small and don't touch many files
  - You are fixing a bug
  - Somebody has told you that it's okay
  - It's obviously the Right Thing
 
-The more of the above are true, the better it is to just commit a change
-directly to CVS.
+The more of the above are true, the better it is to just push a change
+directly to Git.
 
 
-When Not To Commit
-~~~~~~~~~~~~~~~~~~
+When Not To Push
+~~~~~~~~~~~~~~~~
 
-Even if you have commit rights, you should probably still post a patch to the
+Even if you have push access, you should probably still post a patch to the
 mailing list if:
 
  - Your changes are broad and touch many different files
@@ -414,7 +425,7 @@ mailing list if:
  - You are not the maintainer and your changes make the maintainer cringe
 
 The more of the above are true, the better it is to post a patch to the
-mailing list instead of committing.
+mailing list instead of pushing.
 
 
 
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index 311349fec..75e4f6bcf 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -27,24 +27,40 @@ do { \
 #define FETCH_LE32(field) \
         (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size())
 
+//usage:#define tune2fs_trivial_usage
+//usage:       "[-c MOUNT_CNT] "
+////usage:     "[-e errors-behavior] [-g group] "
+//usage:       "[-i DAYS] "
+////usage:     "[-j] [-J journal-options] [-l] [-s sparse-flag] "
+////usage:     "[-m reserved-blocks-percent] [-o [^]mount-options[,...]] "
+////usage:     "[-r reserved-blocks-count] [-u user] [-C mount-count] "
+//usage:       "[-L LABEL] "
+////usage:     "[-M last-mounted-dir] [-O [^]feature[,...]] "
+////usage:     "[-T last-check-time] [-U UUID] "
+//usage:       "BLOCKDEV"
+//usage:
+//usage:#define tune2fs_full_usage "\n\n"
+//usage:       "Adjust filesystem options on ext[23] filesystems"
+
 enum {
         OPT_L = 1 << 0, // label
+        OPT_c = 1 << 1, // max mount count
+        OPT_i = 1 << 2, // check interval
 };
 
 int tune2fs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int tune2fs_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned opts;
-        const char *label;
+        const char *label, *str_c, *str_i;
         struct ext2_super_block *sb;
         int fd;
 
         opt_complementary = "=1";
-        opts = getopt32(argv, "L:", &label);
-        argv += optind; // argv[0] -- device
-
+        opts = getopt32(argv, "L:c:i:", &label, &str_c, &str_i);
         if (!opts)
                 bb_show_usage();
+        argv += optind; // argv[0] -- device
 
         // read superblock
         fd = xopen(argv[0], O_RDWR);
@@ -54,9 +70,23 @@ int tune2fs_main(int argc UNUSED_PARAM, char **argv)
 
         // mangle superblock
         //STORE_LE(sb->s_wtime, time(NULL)); - why bother?
+
         // set the label
-        if (1 /*opts & OPT_L*/)
+        if (opts & OPT_L)
                 safe_strncpy((char *)sb->s_volume_name, label, sizeof(sb->s_volume_name));
+
+        if (opts & OPT_c) {
+                int n = xatoi_range(str_c, -1, 0xfffe);
+                if (n == 0)
+                        n = -1;
+                STORE_LE(sb->s_max_mnt_count, (unsigned)n);
+        }
+
+        if (opts & OPT_i) {
+                unsigned n = xatou_range(str_i, 0, (unsigned)0xffffffff / (24*60*60)) * 24*60*60;
+                STORE_LE(sb->s_checkinterval, n);
+        }
+
         // write superblock
         xlseek(fd, 1024, SEEK_SET);
         xwrite(fd, sb, 1024);
diff --git a/editors/awk.c b/editors/awk.c
index f47d1ab02..2245cad03 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -17,10 +17,14 @@
 /* If you comment out one of these below, it will be #defined later
  * to perform debug printfs to stderr: */
 #define debug_printf_walker(...)  do {} while (0)
+#define debug_printf_eval(...)  do {} while (0)
 
 #ifndef debug_printf_walker
 # define debug_printf_walker(...) (fprintf(stderr, __VA_ARGS__))
 #endif
+#ifndef debug_printf_eval
+# define debug_printf_eval(...) (fprintf(stderr, __VA_ARGS__))
+#endif
 
 
 
@@ -700,14 +704,27 @@ static ALWAYS_INLINE int isalnum_(int c)
 
 static double my_strtod(char **pp)
 {
+        char *cp = *pp;
 #if ENABLE_DESKTOP
-        if ((*pp)[0] == '0'
-         && ((((*pp)[1] | 0x20) == 'x') || isdigit((*pp)[1]))
-        ) {
-                return strtoull(*pp, pp, 0);
+        if (cp[0] == '0') {
+                /* Might be hex or octal integer: 0x123abc or 07777 */
+                char c = (cp[1] | 0x20);
+                if (c == 'x' || isdigit(cp[1])) {
+                        unsigned long long ull = strtoull(cp, pp, 0);
+                        if (c == 'x')
+                                return ull;
+                        c = **pp;
+                        if (!isdigit(c) && c != '.')
+                                return ull;
+                        /* else: it may be a floating number. Examples:
+                         * 009.123 (*pp points to '9')
+                         * 000.123 (*pp points to '.')
+                         * fall through to strtod.
+                         */
+                }
         }
 #endif
-        return strtod(*pp, pp);
+        return strtod(cp, pp);
 }
 
 /* -------- working with variables (set/get/copy/etc) -------- */
@@ -817,17 +834,21 @@ static double getvar_i(var *v)
                 v->number = 0;
                 s = v->string;
                 if (s && *s) {
+                        debug_printf_eval("getvar_i: '%s'->", s);
                         v->number = my_strtod(&s);
+                        debug_printf_eval("%f (s:'%s')\n", v->number, s);
                         if (v->type & VF_USER) {
                                 s = skip_spaces(s);
                                 if (*s != '\0')
                                         v->type &= ~VF_USER;
                         }
                 } else {
+                        debug_printf_eval("getvar_i: '%s'->zero\n", s);
                         v->type &= ~VF_USER;
                 }
                 v->type |= VF_CACHED;
         }
+        debug_printf_eval("getvar_i: %f\n", v->number);
         return v->number;
 }
 
@@ -849,6 +870,7 @@ static var *copyvar(var *dest, const var *src)
         if (dest != src) {
                 clrvar(dest);
                 dest->type |= (src->type & ~(VF_DONTTOUCH | VF_FSTR));
+                debug_printf_eval("copyvar: number:%f string:'%s'\n", src->number, src->string);
                 dest->number = src->number;
                 if (src->string)
                         dest->string = xstrdup(src->string);
@@ -965,7 +987,6 @@ static uint32_t next_token(uint32_t expected)
         const char *tl;
         uint32_t tc;
         const uint32_t *ti;
-        int l;
 
         if (t_rollback) {
                 t_rollback = FALSE;
@@ -1031,7 +1052,7 @@ static uint32_t next_token(uint32_t expected)
                         char *pp = p;
                         t_double = my_strtod(&pp);
                         p = pp;
-                        if (*pp == '.')
+                        if (*p == '.')
                                 syntax_error(EMSG_UNEXP_TOKEN);
                         tc = TC_NUMBER;
 
@@ -1041,52 +1062,51 @@ static uint32_t next_token(uint32_t expected)
                         tc = 0x00000001;
                         ti = tokeninfo;
                         while (*tl) {
-                                l = *tl++;
-                                if (l == NTCC) {
+                                int l = (unsigned char) *tl++;
+                                if (l == (unsigned char) NTCC) {
                                         tc <<= 1;
                                         continue;
                                 }
-                                /* if token class is expected, token
-                                 * matches and it's not a longer word,
-                                 * then this is what we are looking for
+                                /* if token class is expected,
+                                 * token matches,
+                                 * and it's not a longer word,
                                  */
                                 if ((tc & (expected | TC_WORD | TC_NEWLINE))
-                                 && *tl == *p && strncmp(p, tl, l) == 0
+                                 && strncmp(p, tl, l) == 0
                                  && !((tc & TC_WORD) && isalnum_(p[l]))
                                 ) {
+                                        /* then this is what we are looking for */
                                         t_info = *ti;
                                         p += l;
-                                        break;
+                                        goto token_found;
                                 }
                                 ti++;
                                 tl += l;
                         }
-
-                        if (!*tl) {
-                                /* it's a name (var/array/function),
-                                 * otherwise it's something wrong
-                                 */
-                                if (!isalnum_(*p))
-                                        syntax_error(EMSG_UNEXP_TOKEN);
-
-                                t_string = --p;
-                                while (isalnum_(*++p)) {
-                                        p[-1] = *p;
-                                }
-                                p[-1] = '\0';
-                                tc = TC_VARIABLE;
-                                /* also consume whitespace between functionname and bracket */
-                                if (!(expected & TC_VARIABLE) || (expected & TC_ARRAY))
-                                        p = skip_spaces(p);
-                                if (*p == '(') {
-                                        tc = TC_FUNCTION;
-                                } else {
-                                        if (*p == '[') {
-                                                p++;
-                                                tc = TC_ARRAY;
-                                        }
+                        /* not a known token */
+
+                        /* is it a name? (var/array/function) */
+                        if (!isalnum_(*p))
+                                syntax_error(EMSG_UNEXP_TOKEN); /* no */
+                        /* yes */
+                        t_string = --p;
+                        while (isalnum_(*++p)) {
+                                p[-1] = *p;
+                        }
+                        p[-1] = '\0';
+                        tc = TC_VARIABLE;
+                        /* also consume whitespace between functionname and bracket */
+                        if (!(expected & TC_VARIABLE) || (expected & TC_ARRAY))
+                                p = skip_spaces(p);
+                        if (*p == '(') {
+                                tc = TC_FUNCTION;
+                        } else {
+                                if (*p == '[') {
+                                        p++;
+                                        tc = TC_ARRAY;
                                 }
                         }
+ token_found: ;
                 }
                 g_pos = p;
 
@@ -1164,6 +1184,7 @@ static node *parse_expr(uint32_t iexp)
         xtc = TC_OPERAND | TC_UOPPRE | TC_REGEXP | iexp;
 
         while (!((tc = next_token(xtc)) & iexp)) {
+
                 if (glptr && (t_info == (OC_COMPARE | VV | P(39) | 2))) {
                         /* input redirection (<) attached to glptr node */
                         cn = glptr->l.n = new_node(OC_CONCAT | SS | P(37));
@@ -1500,10 +1521,10 @@ static node *mk_splitter(const char *s, tsplitter *spl)
                 regfree(re);
                 regfree(ire); // TODO: nuke ire, use re+1?
         }
-        if (strlen(s) > 1) {
+        if (s[0] && s[1]) { /* strlen(s) > 1 */
                 mk_re_node(s, n, re);
         } else {
-                n->info = (uint32_t) *s;
+                n->info = (uint32_t) s[0];
         }
 
         return n;
@@ -1560,24 +1581,22 @@ static void fsrealloc(int size)
         if (size >= maxfields) {
                 i = maxfields;
                 maxfields = size + 16;
-                Fields = xrealloc(Fields, maxfields * sizeof(var));
+                Fields = xrealloc(Fields, maxfields * sizeof(Fields[0]));
                 for (; i < maxfields; i++) {
                         Fields[i].type = VF_SPECIAL;
                         Fields[i].string = NULL;
                 }
         }
-
-        if (size < nfields) {
-                for (i = size; i < nfields; i++) {
-                        clrvar(Fields + i);
-                }
+        /* if size < nfields, clear extra field variables */
+        for (i = size; i < nfields; i++) {
+                clrvar(Fields + i);
         }
         nfields = size;
 }
 
 static int awk_split(const char *s, node *spl, char **slist)
 {
-        int l, n = 0;
+        int l, n;
         char c[4];
         char *s1;
         regmatch_t pmatch[2]; // TODO: why [2]? [1] is enough...
@@ -1591,6 +1610,7 @@ static int awk_split(const char *s, node *spl, char **slist)
         if (*getvar_s(intvar[RS]) == '\0')
                 c[2] = '\n';
 
+        n = 0;
         if ((spl->info & OPCLSMASK) == OC_REGEXP) {  /* regex split */
                 if (!*s)
                         return n; /* "": zero fields */
@@ -1636,7 +1656,7 @@ static int awk_split(const char *s, node *spl, char **slist)
                 }
                 if (*s1)
                         n++;
-                while ((s1 = strpbrk(s1, c))) {
+                while ((s1 = strpbrk(s1, c)) != NULL) {
                         *s1++ = '\0';
                         n++;
                 }
@@ -2347,18 +2367,25 @@ static var *evaluate(node *op, var *res)
                 opn = (opinfo & OPNMASK);
                 g_lineno = op->lineno;
                 op1 = op->l.n;
+                debug_printf_eval("opinfo:%08x opn:%08x XC:%x\n", opinfo, opn, XC(opinfo & OPCLSMASK));
 
                 /* execute inevitable things */
                 if (opinfo & OF_RES1)
                         L.v = evaluate(op1, v1);
                 if (opinfo & OF_RES2)
                         R.v = evaluate(op->r.n, v1+1);
-                if (opinfo & OF_STR1)
+                if (opinfo & OF_STR1) {
                         L.s = getvar_s(L.v);
-                if (opinfo & OF_STR2)
+                        debug_printf_eval("L.s:'%s'\n", L.s);
+                }
+                if (opinfo & OF_STR2) {
                         R.s = getvar_s(R.v);
-                if (opinfo & OF_NUM1)
+                        debug_printf_eval("R.s:'%s'\n", R.s);
+                }
+                if (opinfo & OF_NUM1) {
                         L_d = getvar_i(L.v);
+                        debug_printf_eval("L_d:%f\n", L_d);
+                }
 
                 switch (XC(opinfo & OPCLSMASK)) {
 
@@ -2526,6 +2553,7 @@ static var *evaluate(node *op, var *res)
                         break;
 
                 case XC( OC_MOVE ):
+                        debug_printf_eval("MOVE\n");
                         /* if source is a temporary string, jusk relink it to dest */
 //Disabled: if R.v is numeric but happens to have cached R.v->string,
 //then L.v ends up being a string, which is wrong
@@ -2777,6 +2805,7 @@ static var *evaluate(node *op, var *res)
                 case XC( OC_BINARY ):
                 case XC( OC_REPLACE ): {
                         double R_d = getvar_i(R.v);
+                        debug_printf_eval("BINARY/REPLACE: R_d:%f opn:%c\n", R_d, opn);
                         switch (opn) {
                         case '+':
                                 L_d += R_d;
@@ -2805,6 +2834,7 @@ static var *evaluate(node *op, var *res)
                                 L_d -= (int)(L_d / R_d) * R_d;
                                 break;
                         }
+                        debug_printf_eval("BINARY/REPLACE result:%f\n", L_d);
                         res = setvar_i(((opinfo & OPCLSMASK) == OC_BINARY) ? res : L.v, L_d);
                         break;
                 }
diff --git a/editors/patch.c b/editors/patch.c
index c40f54155..66a9474fe 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -344,14 +344,12 @@ static int apply_one_hunk(void)
                 while (plist && *plist->data == "+-"[reverse]) {
                         if (data && !strcmp(data, plist->data+1)) {
                                 if (!backwarn) {
-                                        backwarn++;
+                                        backwarn = TT.linenum;
                                         if (option_mask32 & FLAG_IGNORE) {
                                                 dummy_revert = 1;
                                                 reverse ^= 1;
                                                 continue;
                                         }
-                                        fdprintf(2,"Possibly reversed hunk %d at %ld\n",
-                                                TT.hunknum, TT.linenum);
                                 }
                         }
                         plist = plist->next;
@@ -364,6 +362,10 @@ static int apply_one_hunk(void)
                         // Does this hunk need to match EOF?
                         if (!plist && matcheof) break;
 
+                        if (backwarn)
+                                fdprintf(2,"Possibly reversed hunk %d at %ld\n",
+                                        TT.hunknum, TT.linenum);
+
                         // File ended before we found a place for this hunk.
                         fail_hunk();
                         goto done;
@@ -552,7 +554,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                 int oldsum, newsum, del = 0;
                                 char *name;
 
-                                oldsum = TT.oldline + TT.oldlen;
+                                oldsum = TT.oldline + TT.oldlen;
                                 newsum = TT.newline + TT.newlen;
 
                                 name = reverse ? oldname : newname;
@@ -589,10 +591,10 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                                         xmkpath(name, -1);
                                                         *s = '/';
                                                 }
-                                                TT.filein = xopen3(name, O_CREAT|O_EXCL|O_RDWR, 0666);
+                                                TT.filein = xopen(name, O_CREAT|O_EXCL|O_RDWR);
                                         } else {
                                                 printf("patching file %s\n", name);
-                                                TT.filein = xopen(name, O_RDWR);
+                                                TT.filein = xopen(name, O_RDONLY);
                                         }
                                         TT.fileout = copy_tempfile(TT.filein, name, &TT.tempname);
                                         TT.linenum = 0;
diff --git a/editors/patch_toybox.c b/editors/patch_toybox.c
index 7f3234e66..a60bf070f 100644
--- a/editors/patch_toybox.c
+++ b/editors/patch_toybox.c
@@ -522,7 +522,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                 int oldsum, newsum, del = 0;
                                 char *s, *name;
 
-                                oldsum = TT.oldline + TT.oldlen;
+                                oldsum = TT.oldline + TT.oldlen;
                                 newsum = TT.newline + TT.newlen;
 
                                 name = reverse ? oldname : newname;
@@ -559,7 +559,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                                         xmkpath(name, -1);
                                                         *s = '/';
                                                 }
-                                                TT.filein = xopen3(name, O_CREAT|O_EXCL|O_RDWR, 0666);
+                                                TT.filein = xopen(name, O_CREAT|O_EXCL|O_RDWR);
                                         } else {
                                                 printf("patching file %s\n", name);
                                                 TT.filein = xopen(name, O_RDWR);
diff --git a/findutils/.gitignore b/findutils/.gitignore
deleted file mode 100644
index 7a30caf5c..000000000
--- a/findutils/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Config.in and Kbuild are auto-generated
-Config.in
-Kbuild
diff --git a/findutils/grep.c b/findutils/grep.c
index bf42753c5..f166aa48a 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -629,30 +629,33 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 
         /* do normal option parsing */
 #if ENABLE_FEATURE_GREP_CONTEXT
-        int Copt;
+        int Copt, opts;
 
         /* -H unsets -h; -C unsets -A,-B; -e,-f are lists;
          * -m,-A,-B,-C have numeric param */
         opt_complementary = "H-h:C-AB:e::f::m+:A+:B+:C+";
-        getopt32(argv,
+        opts = getopt32(argv,
                 OPTSTR_GREP,
                 &pattern_head, &fopt, &max_matches,
                 &lines_after, &lines_before, &Copt);
 
-        if (option_mask32 & OPT_C) {
+        if (opts & OPT_C) {
                 /* -C unsets prev -A and -B, but following -A or -B
                    may override it */
-                if (!(option_mask32 & OPT_A)) /* not overridden */
+                if (!(opts & OPT_A)) /* not overridden */
                         lines_after = Copt;
-                if (!(option_mask32 & OPT_B)) /* not overridden */
+                if (!(opts & OPT_B)) /* not overridden */
                         lines_before = Copt;
         }
         /* sanity checks */
-        if (option_mask32 & (OPT_c|OPT_q|OPT_l|OPT_L)) {
+        if (opts & (OPT_c|OPT_q|OPT_l|OPT_L)) {
                 option_mask32 &= ~OPT_n;
                 lines_before = 0;
                 lines_after = 0;
         } else if (lines_before > 0) {
+                if (lines_before > INT_MAX / sizeof(long long))
+                        lines_before = INT_MAX / sizeof(long long);
+                /* overflow in (lines_before * sizeof(x)) is prevented (above) */
                 before_buf = xzalloc(lines_before * sizeof(before_buf[0]));
                 IF_EXTRA_COMPAT(before_buf_size = xzalloc(lines_before * sizeof(before_buf_size[0]));)
         }
diff --git a/include/applets.src.h b/include/applets.src.h
index 0e4f966de..879dbf760 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -56,11 +56,6 @@ 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))
@@ -77,7 +72,6 @@ IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, ba
 IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_BLKID(APPLET(blkid, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_BOOTCHARTD(APPLET(bootchartd, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_BZIP2(APPLET(bzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CAL(APPLET(cal, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -94,7 +88,7 @@ IF_CHPST(APPLET(chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CHROOT(APPLET(chroot, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_CHRT(APPLET(chrt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CHVT(APPLET(chvt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_CKSUM(APPLET(cksum, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_CKSUM(APPLET_NOEXEC(cksum, cksum, _BB_DIR_USR_BIN, _BB_SUID_DROP, cksum))
 IF_CLEAR(APPLET(clear, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CMP(APPLET(cmp, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_COMM(APPLET(comm, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -104,14 +98,11 @@ IF_CROND(APPLET(crond, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 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))
-IF_DATE(APPLET(date, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_DC(APPLET(dc, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_DD(APPLET_NOEXEC(dd, dd, _BB_DIR_BIN, _BB_SUID_DROP, dd))
 IF_DEALLOCVT(APPLET(deallocvt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_DELGROUP(APPLET_ODDNAME(delgroup, deluser, _BB_DIR_BIN, _BB_SUID_DROP, delgroup))
 IF_DELUSER(APPLET(deluser, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_DEPMOD(APPLET(depmod, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
 IF_DEVFSD(APPLET(devfsd, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_DEVMEM(APPLET(devmem, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_DF(APPLET(df, _BB_DIR_BIN, _BB_SUID_DROP))
@@ -121,7 +112,7 @@ IF_DIRNAME(APPLET_NOFORK(dirname, dirname, _BB_DIR_USR_BIN, _BB_SUID_DROP, dirna
 IF_DMESG(APPLET(dmesg, _BB_DIR_BIN, _BB_SUID_DROP))
 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(dos2unix, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_DOS2UNIX(APPLET_NOEXEC(dos2unix, dos2unix, _BB_DIR_USR_BIN, _BB_SUID_DROP, dos2unix))
 IF_DPKG(APPLET(dpkg, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, _BB_DIR_USR_BIN, _BB_SUID_DROP, dpkg_deb))
 IF_DU(APPLET(du, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -152,7 +143,7 @@ IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, _BB_DIR_USR_SBIN, _B
 IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_unlock))
 IF_FLASHCP(APPLET(flashcp, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_FLOCK(APPLET(flock, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_FOLD(APPLET(fold, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_FOLD(APPLET_NOEXEC(fold, fold, _BB_DIR_USR_BIN, _BB_SUID_DROP, fold))
 IF_FREE(APPLET(free, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_FREERAMDISK(APPLET(freeramdisk, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_FSCK(APPLET(fsck, _BB_DIR_SBIN, _BB_SUID_DROP))
@@ -170,26 +161,22 @@ IF_GETSEBOOL(APPLET(getsebool, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_GETTY(APPLET(getty, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_GUNZIP(APPLET(gunzip, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_GZIP(APPLET(gzip, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_HD(APPLET_NOEXEC(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_DROP, hd))
 IF_HDPARM(APPLET(hdparm, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_HEAD(APPLET(head, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_HEAD(APPLET_NOEXEC(head, head, _BB_DIR_USR_BIN, _BB_SUID_DROP, head))
 IF_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, _BB_DIR_USR_BIN, _BB_SUID_DROP, hexdump))
 IF_HOSTID(APPLET_NOFORK(hostid, hostid, _BB_DIR_USR_BIN, _BB_SUID_DROP, hostid))
 IF_HOSTNAME(APPLET(hostname, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_HTTPD(APPLET(httpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_HWCLOCK(APPLET(hwclock, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_ID(APPLET(id, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_ID(APPLET_NOEXEC(id, id, _BB_DIR_USR_BIN, _BB_SUID_DROP, id))
 IF_IFCONFIG(APPLET(ifconfig, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_IFUPDOWN(APPLET_ODDNAME(ifdown, ifupdown, _BB_DIR_SBIN, _BB_SUID_DROP, ifdown))
 IF_IFENSLAVE(APPLET(ifenslave, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_IFPLUGD(APPLET(ifplugd, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_IFUPDOWN(APPLET_ODDNAME(ifup, ifupdown, _BB_DIR_SBIN, _BB_SUID_DROP, ifup))
 IF_INETD(APPLET(inetd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_INIT(APPLET(init, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_INOTIFYD(APPLET(inotifyd, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
 IF_INSTALL(APPLET(install, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_IONICE(APPLET(ionice, _BB_DIR_BIN, _BB_SUID_DROP))
 #if ENABLE_FEATURE_IP_ADDRESS \
@@ -217,7 +204,6 @@ IF_LENGTH(APPLET_NOFORK(length, length, _BB_DIR_USR_BIN, _BB_SUID_DROP, length))
 IF_LESS(APPLET(less, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_SETARCH(APPLET_ODDNAME(linux32, setarch, _BB_DIR_BIN, _BB_SUID_DROP, linux32))
 IF_SETARCH(APPLET_ODDNAME(linux64, setarch, _BB_DIR_BIN, _BB_SUID_DROP, linux64))
-IF_FEATURE_INITRD(APPLET_ODDNAME(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_DROP, linuxrc))
 IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, _BB_SUID_DROP, ln))
 IF_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
@@ -232,8 +218,6 @@ IF_LPQ(APPLET_ODDNAME(lpq, lpqr, _BB_DIR_USR_BIN, _BB_SUID_DROP, lpq))
 IF_LPR(APPLET_ODDNAME(lpr, lpqr, _BB_DIR_USR_BIN, _BB_SUID_DROP, lpr))
 IF_LS(APPLET_NOEXEC(ls, ls, _BB_DIR_BIN, _BB_SUID_DROP, ls))
 IF_LSATTR(APPLET(lsattr, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
 IF_LSPCI(APPLET(lspci, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_LSUSB(APPLET(lsusb, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzcat))
@@ -244,25 +228,22 @@ IF_MAKEDEVS(APPLET(makedevs, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MAKEMIME(APPLET(makemime, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_MD5SUM(APPLET_ODDNAME(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, md5sum))
+IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, md5sum))
 IF_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MESG(APPLET(mesg, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_MICROCOM(APPLET(microcom, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, _BB_DIR_BIN, _BB_SUID_DROP, mkdir))
 IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_vfat))
 IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_ext2))
-IF_MKFIFO(APPLET(mkfifo, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_MKFIFO(APPLET_NOEXEC(mkfifo, mkfifo, _BB_DIR_USR_BIN, _BB_SUID_DROP, mkfifo))
 IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_ext2))
 //IF_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_ext3))
 IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_minix))
 IF_MKFS_REISER(APPLET_ODDNAME(mkfs.reiser, mkfs_reiser, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_reiser))
 IF_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_vfat))
-IF_MKNOD(APPLET(mknod, _BB_DIR_BIN, _BB_SUID_DROP))
+IF_MKNOD(APPLET_NOEXEC(mknod, mknod, _BB_DIR_BIN, _BB_SUID_DROP, mknod))
 IF_CRYPTPW(APPLET_ODDNAME(mkpasswd, cryptpw, _BB_DIR_USR_BIN, _BB_SUID_DROP, mkpasswd))
 IF_MKSWAP(APPLET(mkswap, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MKTEMP(APPLET(mktemp, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MODPROBE_SMALL(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MORE(APPLET(more, _BB_DIR_BIN, _BB_SUID_DROP))
 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))
@@ -289,8 +270,7 @@ 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))
 IF_POPMAILDIR(APPLET(popmaildir, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_HALT(APPLET_ODDNAME(poweroff, halt, _BB_DIR_SBIN, _BB_SUID_DROP, poweroff))
-IF_PRINTENV(APPLET(printenv, _BB_DIR_BIN, _BB_SUID_DROP))
+IF_PRINTENV(APPLET_NOFORK(printenv, printenv, _BB_DIR_BIN, _BB_SUID_DROP, printenv))
 IF_PRINTF(APPLET_NOFORK(printf, printf, _BB_DIR_USR_BIN, _BB_SUID_DROP, printf))
 IF_PS(APPLET(ps, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_PSCAN(APPLET(pscan, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -302,7 +282,6 @@ IF_READAHEAD(APPLET(readahead, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_READLINK(APPLET(readlink, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_READPROFILE(APPLET(readprofile, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_REALPATH(APPLET(realpath, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_HALT(APPLET_ODDNAME(reboot, halt, _BB_DIR_SBIN, _BB_SUID_DROP, reboot))
 IF_REFORMIME(APPLET(reformime, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_RENICE(APPLET(renice, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_RESET(APPLET(reset, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -311,8 +290,6 @@ IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, _BB_DIR_SBIN, _BB_SUID_DROP,
 IF_RFKILL(APPLET(rfkill, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_RM(APPLET_NOFORK(rm, rm, _BB_DIR_BIN, _BB_SUID_DROP, rm))
 IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, _BB_DIR_BIN, _BB_SUID_DROP, rmdir))
-IF_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
 IF_ROUTE(APPLET(route, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -340,12 +317,13 @@ IF_SETLOGCONS(APPLET(setlogcons, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_SETSEBOOL(APPLET(setsebool, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_SETSID(APPLET(setsid, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, setuidgid))
-IF_SHA1SUM(APPLET_ODDNAME(sha1sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha1sum))
-IF_SHA256SUM(APPLET_ODDNAME(sha256sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha256sum))
-IF_SHA512SUM(APPLET_ODDNAME(sha512sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha512sum))
+IF_SHA1SUM(APPLET_NOEXEC(sha1sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha1sum))
+IF_SHA256SUM(APPLET_NOEXEC(sha256sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha256sum))
+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))
-IF_SLEEP(APPLET_NOFORK(sleep, sleep, _BB_DIR_BIN, _BB_SUID_DROP, sleep))
+/* 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))
 IF_SPLIT(APPLET(split, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -358,7 +336,7 @@ IF_SULOGIN(APPLET(sulogin, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_SUM(APPLET(sum, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_SV(APPLET(sv, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_SVLOGD(APPLET(svlogd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_SWAPONOFF(APPLET_ODDNAME(swapoff, swap_on_off, _BB_DIR_SBIN, _BB_SUID_DROP,swapoff))
+IF_SWAPONOFF(APPLET_ODDNAME(swapoff, swap_on_off, _BB_DIR_SBIN, _BB_SUID_DROP, swapoff))
 IF_SWAPONOFF(APPLET_ODDNAME(swapon, swap_on_off, _BB_DIR_SBIN, _BB_SUID_DROP, swapon))
 IF_SWITCH_ROOT(APPLET(switch_root, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_SYNC(APPLET_NOFORK(sync, sync, _BB_DIR_BIN, _BB_SUID_DROP, sync))
@@ -398,7 +376,7 @@ IF_UNAME(APPLET(uname, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_UNCOMPRESS(APPLET(uncompress, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, _BB_DIR_USR_BIN, _BB_SUID_DROP, unexpand))
 IF_UNIQ(APPLET(uniq, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_UNIX2DOS(APPLET_ODDNAME(unix2dos, dos2unix, _BB_DIR_USR_BIN, _BB_SUID_DROP, unix2dos))
+IF_UNIX2DOS(APPLET_NOEXEC(unix2dos, dos2unix, _BB_DIR_USR_BIN, _BB_SUID_DROP, unix2dos))
 IF_UNXZ(APPLET(unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_UNLZMA(APPLET(unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_LZOP(APPLET_ODDNAME(unlzop, lzop, _BB_DIR_USR_BIN, _BB_SUID_DROP, unlzop))
diff --git a/include/busybox.h b/include/busybox.h
index 76415dd72..757317fc7 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -16,8 +16,13 @@ typedef enum bb_install_loc_t {
         _BB_DIR_ROOT = 0,
         _BB_DIR_BIN,
         _BB_DIR_SBIN,
+#if ENABLE_INSTALL_NO_USR
+        _BB_DIR_USR_BIN  = _BB_DIR_BIN,
+        _BB_DIR_USR_SBIN = _BB_DIR_SBIN,
+#else
         _BB_DIR_USR_BIN,
-        _BB_DIR_USR_SBIN
+        _BB_DIR_USR_SBIN,
+#endif
 } bb_install_loc_t;
 
 typedef enum bb_suid_t {
diff --git a/include/libbb.h b/include/libbb.h
index 221837b64..9ece2f9ec 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1522,37 +1522,42 @@ unsigned get_cpu_count(void) FAST_FUNC;
 extern const char bb_uuenc_tbl_base64[];
 extern const char bb_uuenc_tbl_std[];
 void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC;
+enum {
+        BASE64_FLAG_UU_STOP = 0x100,
+        /* Sign-extends to a value which never matches fgetc result: */
+        BASE64_FLAG_NO_STOP_CHAR = 0x80,
+};
+void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags);
 
 typedef struct sha1_ctx_t {
         uint32_t hash[8];    /* 5, +3 elements for sha256 */
-        uint64_t total64;
+        uint64_t total64;    /* must be directly after hash[] */
         uint8_t wbuffer[64]; /* NB: always correctly aligned for uint64_t */
         void (*process_block)(struct sha1_ctx_t*) FAST_FUNC;
 } sha1_ctx_t;
 void sha1_begin(sha1_ctx_t *ctx) FAST_FUNC;
-void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx) FAST_FUNC;
-void sha1_end(void *resbuf, sha1_ctx_t *ctx) FAST_FUNC;
+void sha1_hash(sha1_ctx_t *ctx, const void *data, size_t length) FAST_FUNC;
+void sha1_end(sha1_ctx_t *ctx, void *resbuf) FAST_FUNC;
 typedef struct sha1_ctx_t sha256_ctx_t;
 void sha256_begin(sha256_ctx_t *ctx) FAST_FUNC;
 #define sha256_hash sha1_hash
 #define sha256_end sha1_end
 typedef struct sha512_ctx_t {
         uint64_t hash[8];
-        uint64_t total64[2];
+        uint64_t total64[2];  /* must be directly after hash[] */
         uint8_t wbuffer[128]; /* NB: always correctly aligned for uint64_t */
 } sha512_ctx_t;
 void sha512_begin(sha512_ctx_t *ctx) FAST_FUNC;
-void sha512_hash(const void *buffer, size_t len, sha512_ctx_t *ctx) FAST_FUNC;
-void sha512_end(void *resbuf, sha512_ctx_t *ctx) FAST_FUNC;
+void sha512_hash(sha512_ctx_t *ctx, const void *buffer, size_t len) FAST_FUNC;
+void sha512_end(sha512_ctx_t *ctx, void *resbuf) FAST_FUNC;
 #if 1
 typedef struct md5_ctx_t {
         uint32_t A;
         uint32_t B;
         uint32_t C;
         uint32_t D;
-        uint64_t total;
-        uint32_t buflen;
-        char buffer[128];
+        uint64_t total64;
+        char wbuffer[64];
 } md5_ctx_t;
 #else
 /* libbb/md5prime.c uses a bit different one: */
@@ -1563,8 +1568,8 @@ typedef struct md5_ctx_t {
 } md5_ctx_t;
 #endif
 void md5_begin(md5_ctx_t *ctx) FAST_FUNC;
-void md5_hash(const void *data, size_t length, md5_ctx_t *ctx) FAST_FUNC;
-void md5_end(void *resbuf, md5_ctx_t *ctx) FAST_FUNC;
+void md5_hash(md5_ctx_t *ctx, const void *data, size_t length) FAST_FUNC;
+void md5_end(md5_ctx_t *ctx, void *resbuf) FAST_FUNC;
 
 
 uint32_t *crc32_filltable(uint32_t *tbl256, int endian) FAST_FUNC;
diff --git a/include/platform.h b/include/platform.h
index 2b3ad42bd..ed8c137e1 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -215,6 +215,8 @@
 # define SWAP_LE16(x) bswap_16(x)
 # define SWAP_LE32(x) bswap_32(x)
 # define SWAP_LE64(x) bswap_64(x)
+# define IF_BIG_ENDIAN(...) __VA_ARGS__
+# define IF_LITTLE_ENDIAN(...)
 #else
 # define SWAP_BE16(x) bswap_16(x)
 # define SWAP_BE32(x) bswap_32(x)
@@ -222,6 +224,8 @@
 # define SWAP_LE16(x) (x)
 # define SWAP_LE32(x) (x)
 # define SWAP_LE64(x) (x)
+# define IF_BIG_ENDIAN(...)
+# define IF_LITTLE_ENDIAN(...) __VA_ARGS__
 #endif
 
 /* ---- Unaligned access ------------------------------------ */
diff --git a/include/usage.src.h b/include/usage.src.h
index 2866bdbba..5d7767bb4 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -18,21 +18,27 @@
 INSERT
 
 #define acpid_trivial_usage \
-       "[-d] [-c CONFDIR] [-l LOGFILE] [-e PROC_EVENT_FILE] [EVDEV_EVENT_FILE]..."
+       "[-d] [-c CONFDIR] [-l LOGFILE] [-a ACTIONFILE] [-M MAPFILE] [-e PROC_EVENT_FILE] [-p PIDFILE]"
 #define acpid_full_usage "\n\n" \
        "Listen to ACPI events and spawn specific helpers on event arrival\n" \
      "\nOptions:" \
-     "\n        -d      Don't daemonize, log to stderr" \
      "\n        -c DIR  Config directory [/etc/acpi]" \
+     "\n        -d      Don't daemonize, (implies -f)" \
      "\n        -e FILE /proc event file [/proc/acpi/event]" \
-     "\n        -l FILE Log file [/var/log/acpid]" \
+     "\n        -f      Run in foreground" \
+     "\n        -l FILE Log file [/var/log/acpid.log]" \
+     "\n        -p FILE Pid file [/var/run/acpid.pid]" \
+     "\n        -a FILE Action file [/etc/acpid.conf]" \
+     "\n        -M FILE Map file [/etc/acpi.map]" \
         IF_FEATURE_ACPID_COMPAT( \
      "\n\nAccept and ignore compatibility options -g -m -s -S -v" \
         )
 
 #define acpid_example_usage \
+       "Without -e option, acpid uses all /dev/input/event* files\n" \
+       "# acpid\n" \
        "# acpid -l /var/log/my-acpi-log\n" \
-       "# acpid -d /dev/input/event*\n"
+       "# acpid -e /proc/acpi/event\n"
 
 #define addgroup_trivial_usage \
        "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
@@ -95,7 +101,7 @@ INSERT
        "\n      -n              Don't resolve names" \
        "\n      -i IF           Network interface" \
        "\n      -D              Read <hwaddr> from given device" \
-       "\n      -A, -p AF       Protocol family" \
+       "\n      -A,-p AF        Protocol family" \
        "\n      -H HWTYPE       Hardware address type" \
 
 #define arping_trivial_usage \
@@ -214,7 +220,7 @@ INSERT
      "\n        -F      Don't store or verify checksum" \
 
 #define unlzma_trivial_usage \
-       "[OPTIONS] [FILE]..."
+       "[-cf] [FILE]..."
 #define unlzma_full_usage "\n\n" \
        "Decompress FILE (or stdin)\n" \
      "\nOptions:" \
@@ -222,7 +228,7 @@ INSERT
      "\n        -f      Force" \
 
 #define lzma_trivial_usage \
-       "-d [OPTIONS] [FILE]..."
+       "-d [-cf] [FILE]..."
 #define lzma_full_usage "\n\n" \
        "Decompress FILE (or stdin)\n" \
      "\nOptions:" \
@@ -236,7 +242,7 @@ INSERT
        "Decompress to stdout"
 
 #define unxz_trivial_usage \
-       "[OPTIONS] [FILE]..."
+       "[-cf] [FILE]..."
 #define unxz_full_usage "\n\n" \
        "Decompress FILE (or stdin)\n" \
      "\nOptions:" \
@@ -244,7 +250,7 @@ INSERT
      "\n        -f      Force" \
 
 #define xz_trivial_usage \
-       "-d [OPTIONS] [FILE]..."
+       "-d [-cf] [FILE]..."
 #define xz_full_usage "\n\n" \
        "Decompress FILE (or stdin)\n" \
      "\nOptions:" \
@@ -528,7 +534,7 @@ INSERT
        "Print the config file used by busybox build"
 
 #define chrt_trivial_usage \
-       "[OPTIONS] [PRIO] [PID | PROG ARGS]"
+       "[-prfom] [PRIO] [PID | PROG ARGS]"
 #define chrt_full_usage "\n\n" \
        "Change scheduling priority and class for a process\n" \
      "\nOptions:" \
@@ -696,46 +702,6 @@ INSERT
        "$ echo \"Hello world\" | cut -f 2 -d ' '\n" \
        "world\n"
 
-#define date_trivial_usage \
-       "[OPTIONS] [+FMT] [TIME]"
-#define date_full_usage "\n\n" \
-       "Display time (using +FMT), or set time\n" \
-     "\nOptions:" \
-        IF_NOT_LONG_OPTS( \
-     "\n        [-s] TIME       Set time to TIME" \
-     "\n        -u              Work in UTC (don't convert to local time)" \
-     "\n        -R              Output RFC-2822 compliant date string" \
-        ) IF_LONG_OPTS( \
-     "\n        [-s,--set] TIME Set time to TIME" \
-     "\n        -u,--utc        Work in UTC (don't convert to local time)" \
-     "\n        -R,--rfc-2822   Output RFC-2822 compliant date string" \
-        ) \
-        IF_FEATURE_DATE_ISOFMT( \
-     "\n        -I[SPEC]        Output ISO-8601 compliant date string" \
-     "\n                        SPEC='date' (default) for date only," \
-     "\n                        'hours', 'minutes', or 'seconds' for date and" \
-     "\n                        time to the indicated precision" \
-        ) IF_NOT_LONG_OPTS( \
-     "\n        -r FILE         Display last modification time of FILE" \
-     "\n        -d TIME         Display TIME, not 'now'" \
-        ) IF_LONG_OPTS( \
-     "\n        -r,--reference FILE     Display last modification time of FILE" \
-     "\n        -d,--date TIME  Display TIME, not 'now'" \
-        ) \
-        IF_FEATURE_DATE_ISOFMT( \
-     "\n        -D FMT          Use FMT for -d TIME conversion" \
-        ) \
-     "\n" \
-     "\nRecognized TIME formats:" \
-     "\n        hh:mm[:ss]" \
-     "\n        [YYYY.]MM.DD-hh:mm[:ss]" \
-     "\n        YYYY-MM-DD hh:mm[:ss]" \
-     "\n        [[[[[YY]YY]MM]DD]hh]mm[.ss]" \
-
-#define date_example_usage \
-       "$ date\n" \
-       "Wed Apr 12 18:52:41 MDT 2000\n"
-
 #define dd_trivial_usage \
        "[if=FILE] [of=FILE] " IF_FEATURE_DD_IBS_OBS("[ibs=N] [obs=N] ") "[bs=N] [count=N] [skip=N]\n" \
        "        [seek=N]" IF_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync]")
@@ -785,9 +751,6 @@ INSERT
 #define deluser_full_usage "\n\n" \
        "Delete USER from the system"
 
-#define depmod_trivial_usage NOUSAGE_STR
-#define depmod_full_usage ""
-
 #define devmem_trivial_usage \
         "ADDRESS [WIDTH [VALUE]]"
 
@@ -910,7 +873,7 @@ INSERT
      "\n                        nameserver NORNAL_DNS_SERVER" \
 
 #define dos2unix_trivial_usage \
-       "[OPTIONS] [FILE]"
+       "[-ud] [FILE]"
 #define dos2unix_full_usage "\n\n" \
        "Convert FILE in-place from DOS to Unix format.\n" \
        "When no file is given, use stdin/stdout.\n" \
@@ -919,7 +882,7 @@ INSERT
      "\n        -d      unix2dos" \
 
 #define unix2dos_trivial_usage \
-       "[OPTIONS] [FILE]"
+       "[-ud] [FILE]"
 #define unix2dos_full_usage "\n\n" \
        "Convert FILE in-place from Unix to DOS format.\n" \
        "When no file is given, use stdin/stdout.\n" \
@@ -1295,7 +1258,7 @@ INSERT
      "\n        -w      Use WIDTH columns instead of 80" \
 
 #define free_trivial_usage \
-       ""
+       "" IF_DESKTOP("[-b/k/m/g]")
 #define free_full_usage "\n\n" \
        "Display the amount of free and used system memory"
 #define free_example_usage \
@@ -1400,8 +1363,7 @@ INSERT
        "Find processes which use FILEs or PORTs\n" \
      "\nOptions:" \
      "\n        -m      Find processes which use same fs as FILEs" \
-     "\n        -4      Search only IPv4 space" \
-     "\n        -6      Search only IPv6 space" \
+     "\n        -4,-6   Search only IPv4/IPv6 space" \
      "\n        -s      Don't display PIDs" \
      "\n        -k      Kill found processes" \
      "\n        -SIGNAL Signal to send (default: KILL)" \
@@ -1479,7 +1441,7 @@ INSERT
      "\n        -H HOST         Log HOST into the utmp file as the hostname" \
 
 #define gunzip_trivial_usage \
-       "[OPTIONS] [FILE]..."
+       "[-cft] [FILE]..."
 #define gunzip_full_usage "\n\n" \
        "Decompress FILEs (or stdin)\n" \
      "\nOptions:" \
@@ -1495,7 +1457,7 @@ INSERT
        "-rw-rw-r--    1 andersen andersen  1761280 Apr 14 17:47 /tmp/BusyBox-0.43.tar\n"
 
 #define gzip_trivial_usage \
-       "[OPTIONS] [FILE]..."
+       "[-cfd] [FILE]..."
 #define gzip_full_usage "\n\n" \
        "Compress FILEs (or stdin)\n" \
      "\nOptions:" \
@@ -1510,18 +1472,6 @@ INSERT
        "$ ls -la /tmp/busybox*\n" \
        "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
 
-#define halt_trivial_usage \
-       "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
-#define halt_full_usage "\n\n" \
-       "Halt the system\n" \
-     "\nOptions:" \
-     "\n        -d      Delay interval for halting" \
-     "\n        -n      No call to sync()" \
-     "\n        -f      Force halt (don't go through init)" \
-        IF_FEATURE_WTMP( \
-     "\n        -w      Only write a wtmp record" \
-        )
-
 #define hdparm_trivial_usage \
        "[OPTIONS] [DEVICE]"
 #define hdparm_full_usage "\n\n" \
@@ -1679,7 +1629,7 @@ INSERT
      "\n        -i              Inetd mode" \
      "\n        -f              Don't daemonize" \
      "\n        -v[v]           Verbose" \
-     "\n        -p [IP:]PORT    Bind to ip:port (default *:80)" \
+     "\n        -p [IP:]PORT    Bind to IP:PORT (default *:80)" \
         IF_FEATURE_HTTPD_SETUID( \
      "\n        -u USER[:GRP]   Set uid/gid after binding to port") \
         IF_FEATURE_HTTPD_BASIC_AUTH( \
@@ -1716,13 +1666,13 @@ INSERT
        "Print information about USER or the current user\n" \
      "\nOptions:" \
         IF_SELINUX( \
-     "\n        -Z      Print the security context" \
+     "\n        -Z      Security context" \
         ) \
-     "\n        -u      Print user ID" \
-     "\n        -g      Print group ID" \
-     "\n        -G      Print supplementary group IDs" \
-     "\n        -n      Print name instead of a number" \
-     "\n        -r      Print real user ID instead of effective ID" \
+     "\n        -u      User ID" \
+     "\n        -g      Group ID" \
+     "\n        -G      Supplementary group IDs" \
+     "\n        -n      Print names instead of numbers" \
+     "\n        -r      Print real ID instead of effective ID" \
 
 #define id_example_usage \
        "$ id\n" \
@@ -1754,10 +1704,10 @@ INSERT
 #define ifenslave_full_usage "\n\n" \
        "Configure network interfaces for parallel routing\n" \
      "\nOptions:" \
-     "\n        -c, --change-active     Change active slave" \
-     "\n        -d, --detach            Remove slave interface from bonding device" \
-     "\n        -f, --force             Force, even if interface is not Ethernet" \
-/*   "\n        -r, --receive-slave     Create a receive-only slave" */
+     "\n        -c,--change-active      Change active slave" \
+     "\n        -d,--detach             Remove slave interface from bonding device" \
+     "\n        -f,--force              Force, even if interface is not Ethernet" \
+/*   "\n        -r,--receive-slave      Create a receive-only slave" */
 
 #define ifenslave_example_usage \
        "To create a bond device, simply follow these three steps:\n" \
@@ -1802,7 +1752,7 @@ INSERT
      "\n        -k              Kill running daemon" \
 
 #define ifup_trivial_usage \
-       "[-ain"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] IFACE..."
+       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
 #define ifup_full_usage "\n\n" \
        "Options:" \
      "\n        -a      De/configure all interfaces automatically" \
@@ -1816,7 +1766,7 @@ INSERT
      "\n        -f      Force de/configuration" \
 
 #define ifdown_trivial_usage \
-       "[-ain"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] ifaces..."
+       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
 #define ifdown_full_usage "\n\n" \
        "Options:" \
      "\n        -a      De/configure all interfaces automatically" \
@@ -1840,138 +1790,6 @@ INSERT
      "\n        -R N    Pause services after N connects/min" \
      "\n                (default: 0 - disabled)" \
 
-#define init_trivial_usage \
-       ""
-#define init_full_usage "\n\n" \
-       "Init is the parent of all processes"
-
-#define init_notes_usage \
-"This version of init is designed to be run only by the kernel.\n" \
-"\n" \
-"BusyBox init doesn't support multiple runlevels. The runlevels field of\n" \
-"the /etc/inittab file is completely ignored by BusyBox init. If you want\n" \
-"runlevels, use sysvinit.\n" \
-"\n" \
-"BusyBox init works just fine without an inittab. If no inittab is found,\n" \
-"it has the following default behavior:\n" \
-"\n" \
-"       ::sysinit:/etc/init.d/rcS\n" \
-"       ::askfirst:/bin/sh\n" \
-"       ::ctrlaltdel:/sbin/reboot\n" \
-"       ::shutdown:/sbin/swapoff -a\n" \
-"       ::shutdown:/bin/umount -a -r\n" \
-"       ::restart:/sbin/init\n" \
-"\n" \
-"if it detects that /dev/console is _not_ a serial console, it will also run:\n" \
-"\n" \
-"       tty2::askfirst:/bin/sh\n" \
-"       tty3::askfirst:/bin/sh\n" \
-"       tty4::askfirst:/bin/sh\n" \
-"\n" \
-"If you choose to use an /etc/inittab file, the inittab entry format is as follows:\n" \
-"\n" \
-"       <id>:<runlevels>:<action>:<process>\n" \
-"\n" \
-"       <id>:\n" \
-"\n" \
-"               WARNING: This field has a non-traditional meaning for BusyBox init!\n" \
-"               The id field is used by BusyBox init to specify the controlling tty for\n" \
-"               the specified process to run on. The contents of this field are\n" \
-"               appended to \"/dev/\" and used as-is. There is no need for this field to\n" \
-"               be unique, although if it isn't you may have strange results. If this\n" \
-"               field is left blank, the controlling tty is set to the console. Also\n" \
-"               note that if BusyBox detects that a serial console is in use, then only\n" \
-"               entries whose controlling tty is either the serial console or /dev/null\n" \
-"               will be run. BusyBox init does nothing with utmp. We don't need no\n" \
-"               stinkin' utmp.\n" \
-"\n" \
-"       <runlevels>:\n" \
-"\n" \
-"               The runlevels field is completely ignored.\n" \
-"\n" \
-"       <action>:\n" \
-"\n" \
-"               Valid actions include: sysinit, respawn, askfirst, wait,\n" \
-"               once, restart, ctrlaltdel, and shutdown.\n" \
-"\n" \
-"               The available actions can be classified into two groups: actions\n" \
-"               that are run only once, and actions that are re-run when the specified\n" \
-"               process exits.\n" \
-"\n" \
-"               Run only-once actions:\n" \
-"\n" \
-"                       'sysinit' is the first item run on boot. init waits until all\n" \
-"                       sysinit actions are completed before continuing. Following the\n" \
-"                       completion of all sysinit actions, all 'wait' actions are run.\n" \
-"                       'wait' actions, like 'sysinit' actions, cause init to wait until\n" \
-"                       the specified task completes. 'once' actions are asynchronous,\n" \
-"                       therefore, init does not wait for them to complete. 'restart' is\n" \
-"                       the action taken to restart the init process. By default this should\n" \
-"                       simply run /sbin/init, but can be a script which runs pivot_root or it\n" \
-"                       can do all sorts of other interesting things. The 'ctrlaltdel' init\n" \
-"                       actions are run when the system detects that someone on the system\n" \
-"                       console has pressed the CTRL-ALT-DEL key combination. Typically one\n" \
-"                       wants to run 'reboot' at this point to cause the system to reboot.\n" \
-"                       Finally the 'shutdown' action specifies the actions to taken when\n" \
-"                       init is told to reboot. Unmounting filesystems and disabling swap\n" \
-"                       is a very good here.\n" \
-"\n" \
-"               Run repeatedly actions:\n" \
-"\n" \
-"                       'respawn' actions are run after the 'once' actions. When a process\n" \
-"                       started with a 'respawn' action exits, init automatically restarts\n" \
-"                       it. Unlike sysvinit, BusyBox init does not stop processes from\n" \
-"                       respawning out of control. The 'askfirst' actions acts just like\n" \
-"                       respawn, except that before running the specified process it\n" \
-"                       displays the line \"Please press Enter to activate this console.\"\n" \
-"                       and then waits for the user to press enter before starting the\n" \
-"                       specified process.\n" \
-"\n" \
-"               Unrecognized actions (like initdefault) will cause init to emit an\n" \
-"               error message, and then go along with its business. All actions are\n" \
-"               run in the order they appear in /etc/inittab.\n" \
-"\n" \
-"       <process>:\n" \
-"\n" \
-"               Specifies the process to be executed and its command line.\n" \
-"\n" \
-"Example /etc/inittab file:\n" \
-"\n" \
-"       # This is run first except when booting in single-user mode\n" \
-"       #\n" \
-"       ::sysinit:/etc/init.d/rcS\n" \
-"       \n" \
-"       # /bin/sh invocations on selected ttys\n" \
-"       #\n" \
-"       # Start an \"askfirst\" shell on the console (whatever that may be)\n" \
-"       ::askfirst:-/bin/sh\n" \
-"       # Start an \"askfirst\" shell on /dev/tty2-4\n" \
-"       tty2::askfirst:-/bin/sh\n" \
-"       tty3::askfirst:-/bin/sh\n" \
-"       tty4::askfirst:-/bin/sh\n" \
-"       \n" \
-"       # /sbin/getty invocations for selected ttys\n" \
-"       #\n" \
-"       tty4::respawn:/sbin/getty 38400 tty4\n" \
-"       tty5::respawn:/sbin/getty 38400 tty5\n" \
-"       \n" \
-"       \n" \
-"       # Example of how to put a getty on a serial line (for a terminal)\n" \
-"       #\n" \
-"       #::respawn:/sbin/getty -L ttyS0 9600 vt100\n" \
-"       #::respawn:/sbin/getty -L ttyS1 9600 vt100\n" \
-"       #\n" \
-"       # Example how to put a getty on a modem line\n" \
-"       #::respawn:/sbin/getty 57600 ttyS2\n" \
-"       \n" \
-"       # Stuff to do when restarting the init process\n" \
-"       ::restart:/sbin/init\n" \
-"       \n" \
-"       # Stuff to do before rebooting\n" \
-"       ::ctrlaltdel:/sbin/reboot\n" \
-"       ::shutdown:/bin/umount -a -r\n" \
-"       ::shutdown:/sbin/swapoff -a\n"
-
 #define inotifyd_trivial_usage \
         "PROG FILE1[:MASK]..."
 #define inotifyd_full_usage "\n\n" \
@@ -2303,7 +2121,7 @@ INSERT
        "root\n"
 
 #define logread_trivial_usage \
-       "[OPTIONS]"
+       "[-f]"
 #define logread_full_usage "\n\n" \
        "Show messages in syslogd's circular buffer\n" \
      "\nOptions:" \
@@ -2430,11 +2248,6 @@ INSERT
      "\n        -l      List long flag names" \
      "\n        -v      List the file's version/generation number" \
 
-#define lsmod_trivial_usage \
-       ""
-#define lsmod_full_usage "\n\n" \
-       "List the currently loaded kernel modules"
-
 #define lspci_trivial_usage \
        "[-mk]"
 #define lspci_full_usage "\n\n" \
@@ -2520,7 +2333,7 @@ INSERT
      "\nOther options are silently ignored" \
 
 #define man_trivial_usage \
-       "[OPTIONS] [MANPAGE]..."
+       "[-aw] [MANPAGE]..."
 #define man_full_usage "\n\n" \
        "Format and display manual page\n" \
      "\nOptions:" \
@@ -2537,8 +2350,8 @@ INSERT
      "\n        -V      Verify file context on disk matches defaults" \
 
 #define md5sum_trivial_usage \
-       "[OPTIONS] [FILE]..." \
-        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum [OPTIONS] -c [FILE]")
+       "[FILE]..." \
+        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum -c [-sw] [FILE]")
 #define md5sum_full_usage "\n\n" \
        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums" \
         IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
@@ -2559,8 +2372,8 @@ INSERT
        "^D\n"
 
 #define sha1sum_trivial_usage \
-       "[OPTIONS] [FILE]..." \
-        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha1sum [OPTIONS] -c [FILE]")
+       "[FILE]..." \
+        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha1sum -c [-sw] [FILE]")
 #define sha1sum_full_usage "\n\n" \
        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums" \
         IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
@@ -2571,8 +2384,8 @@ INSERT
         )
 
 #define sha256sum_trivial_usage \
-       "[OPTIONS] [FILE]..." \
-        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha256sum [OPTIONS] -c [FILE]")
+       "[FILE]..." \
+        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha256sum -c [-sw] [FILE]")
 #define sha256sum_full_usage "\n\n" \
        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA256 checksums" \
         IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
@@ -2583,8 +2396,8 @@ INSERT
         )
 
 #define sha512sum_trivial_usage \
-       "[OPTIONS] [FILE]..." \
-        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha512sum [OPTIONS] -c [FILE]")
+       "[FILE]..." \
+        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha512sum -c [-sw] [FILE]")
 #define sha512sum_full_usage "\n\n" \
        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA512 checksums" \
         IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
@@ -2628,13 +2441,6 @@ INSERT
        "the last line match .* to override this.)\n\n" \
         )
 
-#define mesg_trivial_usage \
-       "[y|n]"
-#define mesg_full_usage "\n\n" \
-       "Control write access to your terminal\n" \
-       "        y       Allow write access to your terminal\n" \
-       "        n       Disallow write access to your terminal"
-
 #define microcom_trivial_usage \
        "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY"
 #define microcom_full_usage "\n\n" \
@@ -2651,7 +2457,7 @@ INSERT
 #define mkdir_full_usage "\n\n" \
        "Create DIRECTORY\n" \
      "\nOptions:" \
-     "\n        -m      Mode" \
+     "\n        -m MODE Mode" \
      "\n        -p      No error if exists; make parent directories as needed" \
         IF_SELINUX( \
      "\n        -Z      Set security context" \
@@ -2666,9 +2472,9 @@ INSERT
        "$ mkdir -p /tmp/foo/bar/baz\n"
 
 #define mkfifo_trivial_usage \
-       "[OPTIONS] name"
+       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME"
 #define mkfifo_full_usage "\n\n" \
-       "Create named pipe (identical to 'mknod name p')\n" \
+       "Create named pipe\n" \
      "\nOptions:" \
      "\n        -m MODE Mode (default a=rw)" \
         IF_SELINUX( \
@@ -2750,25 +2556,25 @@ INSERT
      "\n        -n LBL  Volume label" \
 
 #define mknod_trivial_usage \
-       "[OPTIONS] NAME TYPE MAJOR MINOR"
+       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE MAJOR MINOR"
 #define mknod_full_usage "\n\n" \
        "Create a special file (block, character, or pipe)\n" \
      "\nOptions:" \
-     "\n        -m      Create the special file using the specified mode (default a=rw)" \
-     "\nTYPEs include:" \
-     "\n        b:      Make a block device" \
-     "\n        c or u: Make a character device" \
-     "\n        p:      Make a named pipe (MAJOR and MINOR are ignored)" \
+     "\n        -m MODE Creation mode (default a=rw)" \
         IF_SELINUX( \
      "\n        -Z      Set security context" \
-        )
+        ) \
+     "\nTYPE:" \
+     "\n        b       Block device" \
+     "\n        c or u  Character device" \
+     "\n        p       Named pipe (MAJOR and MINOR are ignored)" \
 
 #define mknod_example_usage \
        "$ mknod /dev/fd0 b 2 0\n" \
        "$ mknod -m 644 /tmp/pipe p\n"
 
 #define mkswap_trivial_usage \
-       "[OPTIONS] BLOCKDEV [KBYTES]"
+       "[-L LBL] BLOCKDEV [KBYTES]"
 #define mkswap_full_usage "\n\n" \
        "Prepare BLOCKDEV to be used as swap partition\n" \
      "\nOptions:" \
@@ -2890,8 +2696,8 @@ INSERT
        "setpart tell unload unlock weof wset" \
 
 #define mv_trivial_usage \
-       "[OPTIONS] SOURCE DEST\n" \
-       "or: mv [OPTIONS] SOURCE... DIRECTORY"
+       "[-fi] SOURCE DEST\n" \
+       "or: mv [-fi] SOURCE... DIRECTORY"
 #define mv_full_usage "\n\n" \
        "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n" \
      "\nOptions:" \
@@ -3026,7 +2832,7 @@ INSERT
        "Change USER's password. If no USER is specified,\n" \
        "changes the password for the current user.\n" \
      "\nOptions:" \
-     "\n        -a      Algorithm to use for password (des, md5)" /* ", sha1)" */ \
+     "\n        -a ALG  Algorithm to use for password (des, md5)" /* ", sha1)" */ \
      "\n        -d      Delete password for the account" \
      "\n        -l      Lock (disable) account" \
      "\n        -u      Unlock (re-enable) account" \
@@ -3093,10 +2899,12 @@ INSERT
        "List PIDs of all processes with names that match NAMEs" \
         USAGE_PIDOF \
         IF_FEATURE_PIDOF_SINGLE( \
-     "\n        -s      Show only one PID") \
+     "\n        -s      Show only one PID" \
+        ) \
         IF_FEATURE_PIDOF_OMIT( \
      "\n        -o PID  Omit given pid" \
-     "\n                Use %PPID to omit pid of pidof's parent") \
+     "\n                Use %PPID to omit pid of pidof's parent" \
+        ) \
 
 #define pidof_example_usage \
        "$ pidof init\n" \
@@ -3121,7 +2929,7 @@ INSERT
 #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        -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" \
@@ -3216,15 +3024,6 @@ INSERT
        "$ popmaildir -k ~/Maildir -- nc pop.drvv.ru 110 [<password_file]\n" \
        "$ popmaildir ~/Maildir -- openssl s_client -quiet -connect pop.gmail.com:995 [<password_file]\n"
 
-#define poweroff_trivial_usage \
-       "[-d DELAY] [-n] [-f]"
-#define poweroff_full_usage "\n\n" \
-       "Halt and shut off power\n" \
-     "\nOptions:" \
-     "\n        -d      Delay interval for halting" \
-     "\n        -n      Do not sync" \
-     "\n        -f      Force power off (don't go through init)" \
-
 #define printenv_trivial_usage \
        "[VARIABLE]..."
 #define printenv_full_usage "\n\n" \
@@ -3367,15 +3166,6 @@ INSERT
 #define realpath_full_usage "\n\n" \
        "Return the absolute pathnames of given FILE"
 
-#define reboot_trivial_usage \
-       "[-d DELAY] [-n] [-f]"
-#define reboot_full_usage "\n\n" \
-       "Reboot the system\n" \
-     "\nOptions:" \
-     "\n        -d      Delay interval for rebooting" \
-     "\n        -n      No call to sync()" \
-     "\n        -f      Force reboot (don't go through init)" \
-
 #define reformime_trivial_usage \
        "[OPTIONS] [FILE]..."
 #define reformime_full_usage "\n\n" \
@@ -3431,7 +3221,7 @@ INSERT
      "\n                wimax, wwan, gps, fm" \
 
 #define rm_trivial_usage \
-       "[OPTIONS] FILE..."
+       "[-irf] FILE..."
 #define rm_full_usage "\n\n" \
        "Remove (unlink) FILEs\n" \
      "\nOptions:" \
@@ -3458,18 +3248,6 @@ INSERT
 #define rmdir_example_usage \
        "# rmdir /tmp/foo\n"
 
-#define rmmod_trivial_usage \
-       "[OPTIONS] [MODULE]..."
-#define rmmod_full_usage "\n\n" \
-       "Unload the specified kernel modules from the kernel\n" \
-     "\nOptions:" \
-     "\n        -w      Wait until the module is no longer used" \
-     "\n        -f      Force unloading" \
-     "\n        -a      Remove all unused modules (recursively)" \
-
-#define rmmod_example_usage \
-       "$ rmmod tulip\n"
-
 #define route_trivial_usage \
        "[{add|del|delete}]"
 #define route_full_usage "\n\n" \
@@ -3849,9 +3627,9 @@ INSERT
        "[OPTIONS] [INPUT [PREFIX]]"
 #define split_full_usage "\n\n" \
        "Options:" \
-     "\n        -b n[k|m]       Split by bytes" \
-     "\n        -l n            Split by lines" \
-     "\n        -a n            Use n letters as suffix" \
+     "\n        -b N[k|m]       Split by N (kilo|mega)bytes" \
+     "\n        -l N            Split by N lines" \
+     "\n        -a N            Use N letters as suffix" \
 
 #define split_example_usage \
        "$ split TODO foo\n" \
@@ -4080,7 +3858,7 @@ INSERT
        "Write all buffered blocks to disk"
 
 #define fsync_trivial_usage \
-       "[OPTIONS] FILE..."
+       "[-d] FILE..."
 #define fsync_full_usage "\n\n" \
        "Write files' buffered blocks to disk\n" \
      "\nOptions:" \
@@ -4156,7 +3934,7 @@ INSERT
        "pid 1's current affinity mask: 3\n"
 
 #define tee_trivial_usage \
-       "[OPTIONS] [FILE]..."
+       "[-ai] [FILE]..."
 #define tee_full_usage "\n\n" \
        "Copy stdin to each FILE, and also to stdout\n" \
      "\nOptions:" \
@@ -4261,7 +4039,7 @@ INSERT
      "\n        -u USER[:GRP]   Change to user/group after bind" \
      "\n        -c N            Handle up to N connections simultaneously" \
      "\n        -b N            Allow a backlog of approximately N TCP SYNs" \
-     "\n        -C N[:MSG]      Allow only up to N connections from the same IP" \
+     "\n        -C N[:MSG]      Allow only up to N connections from the same IP." \
      "\n                        New connections from this IP address are closed" \
      "\n                        immediately. MSG is written to the peer before close" \
      "\n        -h              Look up peer's hostname" \
@@ -4317,7 +4095,7 @@ INSERT
      "\n        -u      Access files as USER" \
 
 #define time_trivial_usage \
-       "[OPTIONS] PROG ARGS"
+       "[-v] PROG ARGS"
 #define time_full_usage "\n\n" \
        "Run PROG, display resource usage when it exits\n" \
      "\nOptions:" \
@@ -4338,12 +4116,13 @@ INSERT
 //TODO: add options and keyboard commands
 
 #define touch_trivial_usage \
-       "[-c] [-d DATE] FILE [FILE]..."
+       "[-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" \
@@ -4373,7 +4152,7 @@ INSERT
        "Trace the route to HOST\n" \
      "\nOptions:" \
         IF_TRACEROUTE6( \
-     "\n        -4, -6  Force IP or IPv6 name resolution" \
+     "\n        -4,-6   Force IP or IPv6 name resolution" \
         ) \
      "\n        -F      Set the don't fragment bit" \
      "\n        -I      Use ICMP ECHO instead of UDP datagrams" \
@@ -4453,18 +4232,6 @@ INSERT
        "# tunctl\n" \
        "# tunctl -d tun0\n"
 
-#define tune2fs_trivial_usage \
-/*     "[-c max-mounts-count] [-e errors-behavior] [-g group] " */ \
-/*     "[-i interval[d|m|w]] [-j] [-J journal-options] [-l] [-s sparse-flag] " */ \
-/*     "[-m reserved-blocks-percent] [-o [^]mount-options[,...]] " */ \
-/*     "[-r reserved-blocks-count] [-u user] [-C mount-count] " */ \
-       "[-L LABEL] " \
-/*     "[-M last-mounted-dir] [-O [^]feature[,...]] " */ \
-/*     "[-T last-check-time] [-U UUID] " */ \
-       "BLOCKDEV"
-#define tune2fs_full_usage "\n\n" \
-       "Adjust filesystem options on ext[23] filesystems"
-
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
 # define IF_UDHCP_VERBOSE(...) __VA_ARGS__
 #else
@@ -4708,13 +4475,15 @@ INSERT
        "Edit FILE\n" \
      "\nOptions:" \
         IF_FEATURE_VI_COLON( \
-     "\n        -c      Initial command to run ($EXINIT also available)") \
+     "\n        -c      Initial command to run ($EXINIT also available)" \
+        ) \
         IF_FEATURE_VI_READONLY( \
-     "\n        -R      Read-only") \
+     "\n        -R      Read-only" \
+        ) \
      "\n        -H      Short help regarding available features" \
 
 #define vlock_trivial_usage \
-       "[OPTIONS]"
+       "[-a]"
 #define vlock_full_usage "\n\n" \
        "Lock a virtual terminal. A password is required to unlock.\n" \
      "\nOptions:" \
@@ -4758,21 +4527,6 @@ INSERT
      "\n" \
      "\nUse 500ms to specify period in milliseconds" \
 
-#define wc_trivial_usage \
-       "[OPTIONS] [FILE]..."
-#define wc_full_usage "\n\n" \
-       "Print line, word, and byte counts for each FILE (or stdin),\n" \
-       "and a total line if more than one FILE is specified\n" \
-     "\nOptions:" \
-     "\n        -c      Print the byte counts" \
-     "\n        -l      Print the newline counts" \
-     "\n        -L      Print the length of the longest line" \
-     "\n        -w      Print the word counts" \
-
-#define wc_example_usage \
-       "$ wc /etc/passwd\n" \
-       "     31      46    1365 /etc/passwd\n"
-
 #define wget_trivial_usage \
         IF_FEATURE_WGET_LONG_OPTIONS( \
        "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n" \
diff --git a/init/Config.src b/init/Config.src
index 2cac3573e..5767c93f0 100644
--- a/init/Config.src
+++ b/init/Config.src
@@ -7,131 +7,4 @@ menu "Init Utilities"
 
 INSERT
 
-config INIT
-        bool "init"
-        default y
-        select FEATURE_SYSLOG
-        help
-          init is the first program run when the system boots.
-
-config FEATURE_USE_INITTAB
-        bool "Support reading an inittab file"
-        default y
-        depends on INIT
-        help
-          Allow init to read an inittab file when the system boot.
-
-config FEATURE_KILL_REMOVED
-        bool "Support killing processes that have been removed from inittab"
-        default n
-        depends on FEATURE_USE_INITTAB
-        help
-          When respawn entries are removed from inittab and a SIGHUP is
-          sent to init, this option will make init kill the processes
-          that have been removed.
-
-config FEATURE_KILL_DELAY
-        int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED
-        range 0 1024
-        default 0
-        depends on FEATURE_KILL_REMOVED
-        help
-          With nonzero setting, init sends TERM, forks, child waits N
-          seconds, sends KILL and exits. Setting it too high is unwise
-          (child will hang around for too long and could actually kill
-          the wrong process!)
-
-config FEATURE_INIT_SCTTY
-        bool "Run commands with leading dash with controlling tty"
-        default y
-        depends on INIT
-        help
-          If this option is enabled, init will try to give a controlling
-          tty to any command which has leading hyphen (often it's "-/bin/sh").
-          More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
-          If device attached to STDIN_FILENO can be a ctty but is not yet
-          a ctty for other session, it will become this process' ctty.
-          This is not the traditional init behavour, but is often what you want
-          in an embedded system where the console is only accessed during
-          development or for maintenance.
-          NB: using cttyhack applet may work better.
-
-config FEATURE_INIT_SYSLOG
-        bool "Enable init to write to syslog"
-        default y
-        depends on INIT
-
-config FEATURE_EXTRA_QUIET
-        bool "Be _extra_ quiet on boot"
-        default y
-        depends on INIT
-        help
-          Prevent init from logging some messages to the console during boot.
-
-config FEATURE_INIT_COREDUMPS
-        bool "Support dumping core for child processes (debugging only)"
-        default y
-        depends on INIT
-        help
-          If this option is enabled and the file /.init_enable_core
-          exists, then init will call setrlimit() to allow unlimited
-          core file sizes. If this option is disabled, processes
-          will not generate any core files.
-
-config FEATURE_INITRD
-        bool "Support running init from within an initrd (not initramfs)"
-        default y
-        depends on INIT
-        help
-          Legacy support for running init under the old-style initrd. Allows
-          the name linuxrc to act as init, and it doesn't assume init is PID 1.
-
-          This does not apply to initramfs, which runs /init as PID 1 and
-          requires no special support.
-
-config INIT_TERMINAL_TYPE
-        string "Initial terminal type"
-        default "linux"
-        depends on INIT
-        help
-          This is the initial value set by init for the TERM environment
-          variable. This variable is used by programs which make use of
-          extended terminal capabilities.
-
-          Note that on Linux, init attempts to detect serial terminal and
-          sets TERM to "vt102" if one is found.
-
-config HALT
-        bool "poweroff, halt, and reboot"
-        default y
-        help
-          Stop all processes and either halt, reboot, or power off the system.
-
-config FEATURE_CALL_TELINIT
-        bool "Call telinit on shutdown and reboot"
-        default y
-        depends on HALT && !INIT
-        help
-          Call an external program (normally telinit) to facilitate
-          a switch to a proper runlevel.
-
-          This option is only available if you selected halt and friends,
-          but did not select init.
-
-config TELINIT_PATH
-        string "Path to telinit executable"
-        default "/sbin/telinit"
-        depends on FEATURE_CALL_TELINIT
-        help
-          When busybox halt and friends have to call external telinit
-          to facilitate proper shutdown, this path is to be used when
-          locating telinit executable.
-
-config MESG
-        bool "mesg"
-        default y
-        help
-          Mesg controls access to your terminal by others. It is typically
-          used to allow or disallow other users to write to your terminal
-
 endmenu
diff --git a/init/Kbuild.src b/init/Kbuild.src
index 32dd5a045..6b4fb7470 100644
--- a/init/Kbuild.src
+++ b/init/Kbuild.src
@@ -7,7 +7,3 @@
 lib-y:=
 
 INSERT
-lib-$(CONFIG_HALT)       += halt.o
-lib-$(CONFIG_INIT)       += init.o
-lib-$(CONFIG_MESG)       += mesg.o
-lib-$(CONFIG_BOOTCHARTD) += bootchartd.o
diff --git a/init/bootchartd.c b/init/bootchartd.c
index f14d5c0fd..5a1b3e8e8 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -3,6 +3,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//applet:IF_BOOTCHARTD(APPLET(bootchartd, _BB_DIR_SBIN, _BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_BOOTCHARTD) += bootchartd.o
+
 //config:config BOOTCHARTD
 //config:       bool "bootchartd"
 //config:       default y
diff --git a/init/halt.c b/init/halt.c
index 903953e80..47f1ef7b2 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -7,6 +7,68 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+//applet:IF_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_DROP))
+//applet:IF_HALT(APPLET_ODDNAME(poweroff, halt, _BB_DIR_SBIN, _BB_SUID_DROP, poweroff))
+//applet:IF_HALT(APPLET_ODDNAME(reboot, halt, _BB_DIR_SBIN, _BB_SUID_DROP, reboot))
+
+//kbuild:lib-$(CONFIG_HALT) += halt.o
+
+//config:config HALT
+//config:       bool "poweroff, halt, and reboot"
+//config:       default y
+//config:       help
+//config:         Stop all processes and either halt, reboot, or power off the system.
+//config:
+//config:config FEATURE_CALL_TELINIT
+//config:       bool "Call telinit on shutdown and reboot"
+//config:       default y
+//config:       depends on HALT && !INIT
+//config:       help
+//config:         Call an external program (normally telinit) to facilitate
+//config:         a switch to a proper runlevel.
+//config:
+//config:         This option is only available if you selected halt and friends,
+//config:         but did not select init.
+//config:
+//config:config TELINIT_PATH
+//config:       string "Path to telinit executable"
+//config:       default "/sbin/telinit"
+//config:       depends on FEATURE_CALL_TELINIT
+//config:       help
+//config:         When busybox halt and friends have to call external telinit
+//config:         to facilitate proper shutdown, this path is to be used when
+//config:         locating telinit executable.
+
+//usage:#define halt_trivial_usage
+//usage:       "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
+//usage:#define halt_full_usage "\n\n"
+//usage:       "Halt the system\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -d SEC  Delay interval"
+//usage:     "\n        -n      Do not sync"
+//usage:     "\n        -f      Force (don't go through init)"
+//usage:        IF_FEATURE_WTMP(
+//usage:     "\n        -w      Only write a wtmp record"
+//usage:        )
+//usage:
+//usage:#define poweroff_trivial_usage
+//usage:       "[-d DELAY] [-n] [-f]"
+//usage:#define poweroff_full_usage "\n\n"
+//usage:       "Halt and shut off power\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -d SEC  Delay interval"
+//usage:     "\n        -n      Do not sync"
+//usage:     "\n        -f      Force (don't go through init)"
+//usage:
+//usage:#define reboot_trivial_usage
+//usage:       "[-d DELAY] [-n] [-f]"
+//usage:#define reboot_full_usage "\n\n"
+//usage:       "Reboot the system\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -d SEC  Delay interval"
+//usage:     "\n        -n      Do not sync"
+//usage:     "\n        -f      Force (don't go through init)"
+
 #include "libbb.h"
 #include "reboot.h"
 
diff --git a/init/init.c b/init/init.c
index 5c0d11402..340731b8b 100644
--- a/init/init.c
+++ b/init/init.c
@@ -9,6 +9,237 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//applet:IF_INIT(APPLET(init, _BB_DIR_SBIN, _BB_SUID_DROP))
+//applet:IF_FEATURE_INITRD(APPLET_ODDNAME(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_DROP, linuxrc))
+
+//kbuild:lib-$(CONFIG_INIT) += init.o
+
+//config:config INIT
+//config:       bool "init"
+//config:       default y
+//config:       select FEATURE_SYSLOG
+//config:       help
+//config:         init is the first program run when the system boots.
+//config:
+//config:config FEATURE_USE_INITTAB
+//config:       bool "Support reading an inittab file"
+//config:       default y
+//config:       depends on INIT
+//config:       help
+//config:         Allow init to read an inittab file when the system boot.
+//config:
+//config:config FEATURE_KILL_REMOVED
+//config:       bool "Support killing processes that have been removed from inittab"
+//config:       default n
+//config:       depends on FEATURE_USE_INITTAB
+//config:       help
+//config:         When respawn entries are removed from inittab and a SIGHUP is
+//config:         sent to init, this option will make init kill the processes
+//config:         that have been removed.
+//config:
+//config:config FEATURE_KILL_DELAY
+//config:       int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED
+//config:       range 0 1024
+//config:       default 0
+//config:       depends on FEATURE_KILL_REMOVED
+//config:       help
+//config:         With nonzero setting, init sends TERM, forks, child waits N
+//config:         seconds, sends KILL and exits. Setting it too high is unwise
+//config:         (child will hang around for too long and could actually kill
+//config:         the wrong process!)
+//config:
+//config:config FEATURE_INIT_SCTTY
+//config:       bool "Run commands with leading dash with controlling tty"
+//config:       default y
+//config:       depends on INIT
+//config:       help
+//config:         If this option is enabled, init will try to give a controlling
+//config:         tty to any command which has leading hyphen (often it's "-/bin/sh").
+//config:         More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
+//config:         If device attached to STDIN_FILENO can be a ctty but is not yet
+//config:         a ctty for other session, it will become this process' ctty.
+//config:         This is not the traditional init behavour, but is often what you want
+//config:         in an embedded system where the console is only accessed during
+//config:         development or for maintenance.
+//config:         NB: using cttyhack applet may work better.
+//config:
+//config:config FEATURE_INIT_SYSLOG
+//config:       bool "Enable init to write to syslog"
+//config:       default y
+//config:       depends on INIT
+//config:
+//config:config FEATURE_EXTRA_QUIET
+//config:       bool "Be _extra_ quiet on boot"
+//config:       default y
+//config:       depends on INIT
+//config:       help
+//config:         Prevent init from logging some messages to the console during boot.
+//config:
+//config:config FEATURE_INIT_COREDUMPS
+//config:       bool "Support dumping core for child processes (debugging only)"
+//config:       default y
+//config:       depends on INIT
+//config:       help
+//config:         If this option is enabled and the file /.init_enable_core
+//config:         exists, then init will call setrlimit() to allow unlimited
+//config:         core file sizes. If this option is disabled, processes
+//config:         will not generate any core files.
+//config:
+//config:config FEATURE_INITRD
+//config:       bool "Support running init from within an initrd (not initramfs)"
+//config:       default y
+//config:       depends on INIT
+//config:       help
+//config:         Legacy support for running init under the old-style initrd. Allows
+//config:         the name linuxrc to act as init, and it doesn't assume init is PID 1.
+//config:
+//config:         This does not apply to initramfs, which runs /init as PID 1 and
+//config:         requires no special support.
+//config:
+//config:config INIT_TERMINAL_TYPE
+//config:       string "Initial terminal type"
+//config:       default "linux"
+//config:       depends on INIT
+//config:       help
+//config:         This is the initial value set by init for the TERM environment
+//config:         variable. This variable is used by programs which make use of
+//config:         extended terminal capabilities.
+//config:
+//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>
diff --git a/init/mesg.c b/init/mesg.c
index ef5f0eb66..b560df205 100644
--- a/init/mesg.c
+++ b/init/mesg.c
@@ -7,6 +7,24 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//applet:IF_MESG(APPLET(mesg, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_MESG) += mesg.o
+
+//config:config MESG
+//config:       bool "mesg"
+//config:       default y
+//config:       help
+//config:         Mesg controls access to your terminal by others. It is typically
+//config:         used to allow or disallow other users to write to your terminal
+
+//usage:#define mesg_trivial_usage
+//usage:       "[y|n]"
+//usage:#define mesg_full_usage "\n\n"
+//usage:       "Control write access to your terminal\n"
+//usage:       "        y       Allow write access to your terminal\n"
+//usage:       "        n       Disallow write access to your terminal"
+
 #include "libbb.h"
 
 #ifdef USE_TTY_GROUP
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index ab1d48c31..3b691f945 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -592,9 +592,11 @@ 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/" */
-        usr_bin,
-        usr_sbin
+        &usr_sbin[4]  /* "/sbin/" */
+# if !ENABLE_INSTALL_NO_USR
+        ,usr_bin
+        ,usr_sbin
+# endif
 };
 
 
diff --git a/libbb/md5.c b/libbb/md5.c
index d8655ba91..051c8ede4 100644
--- a/libbb/md5.c
+++ b/libbb/md5.c
@@ -1,7 +1,7 @@
 /* vi: set sw=4 ts=4: */
 /*
- * md5.c - Compute MD5 checksum of strings according to the
- *         definition of MD5 in RFC 1321 from April 1992.
+ * Compute MD5 checksum of strings according to the
+ * definition of MD5 in RFC 1321 from April 1992.
  *
  * Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
  *
@@ -33,8 +33,7 @@ void FAST_FUNC md5_begin(md5_ctx_t *ctx)
         ctx->B = 0xefcdab89;
         ctx->C = 0x98badcfe;
         ctx->D = 0x10325476;
-        ctx->total = 0;
-        ctx->buflen = 0;
+        ctx->total64 = 0;
 }
 
 /* These are the four functions used in the four steps of the MD5 algorithm
@@ -49,13 +48,14 @@ void FAST_FUNC md5_begin(md5_ctx_t *ctx)
 
 #define rotl32(w, s) (((w) << (s)) | ((w) >> (32 - (s))))
 
-/* Hash a single block, 64 bytes long and 4-byte aligned. */
-static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
+/* Hash a single block, 64 bytes long and 4-byte aligned */
+static void md5_process_block64(md5_ctx_t *ctx)
 {
-        uint32_t correct_words[16];
-        const uint32_t *words = buffer;
-
 #if MD5_SIZE_VS_SPEED > 0
+        /* Before we start, one word to the strange constants.
+           They are defined in RFC 1321 as
+           T[i] = (int)(4294967296.0 * fabs(sin(i))), i=1..64
+         */
         static const uint32_t C_array[] = {
                 /* round 1 */
                 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
@@ -64,7 +64,7 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
                 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
                 /* round 2 */
                 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
-                0xd62f105d, 0x2441453, 0xd8a1e681, 0xe7d3fbc8,
+                0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
                 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
                 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
                 /* round 3 */
@@ -86,40 +86,33 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
                 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 */
         };
-# if MD5_SIZE_VS_SPEED > 1
-        static const char S_array[] ALIGN1 = {
-                7, 12, 17, 22,
-                5, 9, 14, 20,
-                4, 11, 16, 23,
-                6, 10, 15, 21
-        };
-# endif /* MD5_SIZE_VS_SPEED > 1 */
 #endif
+        uint32_t *words = (void*) ctx->wbuffer;
         uint32_t A = ctx->A;
         uint32_t B = ctx->B;
         uint32_t C = ctx->C;
         uint32_t D = ctx->D;
 
-        /* Process all bytes in the buffer with 64 bytes in each round of
-           the loop.  */
-        uint32_t *cwp = correct_words;
-        uint32_t A_save = A;
-        uint32_t B_save = B;
-        uint32_t C_save = C;
-        uint32_t D_save = D;
+#if MD5_SIZE_VS_SPEED >= 2  /* 2 or 3 */
 
-#if MD5_SIZE_VS_SPEED > 1
+        static const char S_array[] ALIGN1 = {
+                7, 12, 17, 22,
+                5, 9, 14, 20,
+                4, 11, 16, 23,
+                6, 10, 15, 21
+        };
         const uint32_t *pc;
         const char *pp;
         const char *ps;
         int i;
         uint32_t temp;
 
+# if BB_BIG_ENDIAN
         for (i = 0; i < 16; i++)
-                cwp[i] = SWAP_LE32(words[i]);
-        words += 16;
+                words[i] = SWAP_LE32(words[i]);
+# endif
 
-# if MD5_SIZE_VS_SPEED > 2
+# if MD5_SIZE_VS_SPEED == 3
         pc = C_array;
         pp = P_array;
         ps = S_array - 4;
@@ -141,7 +134,7 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
                 case 3:
                         temp += FI(B, C, D);
                 }
-                temp += cwp[(int) (*pp++)] + *pc++;
+                temp += words[(int) (*pp++)] + *pc++;
                 temp = rotl32(temp, ps[i & 3]);
                 temp += B;
                 A = D;
@@ -149,13 +142,13 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
                 C = B;
                 B = temp;
         }
-# else
+# else  /* MD5_SIZE_VS_SPEED == 2 */
         pc = C_array;
         pp = P_array;
         ps = S_array;
 
         for (i = 0; i < 16; i++) {
-                temp = A + FF(B, C, D) + cwp[(int) (*pp++)] + *pc++;
+                temp = A + FF(B, C, D) + words[(int) (*pp++)] + *pc++;
                 temp = rotl32(temp, ps[i & 3]);
                 temp += B;
                 A = D;
@@ -165,7 +158,7 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
         }
         ps += 4;
         for (i = 0; i < 16; i++) {
-                temp = A + FG(B, C, D) + cwp[(int) (*pp++)] + *pc++;
+                temp = A + FG(B, C, D) + words[(int) (*pp++)] + *pc++;
                 temp = rotl32(temp, ps[i & 3]);
                 temp += B;
                 A = D;
@@ -175,7 +168,7 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
         }
         ps += 4;
         for (i = 0; i < 16; i++) {
-                temp = A + FH(B, C, D) + cwp[(int) (*pp++)] + *pc++;
+                temp = A + FH(B, C, D) + words[(int) (*pp++)] + *pc++;
                 temp = rotl32(temp, ps[i & 3]);
                 temp += B;
                 A = D;
@@ -185,7 +178,7 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
         }
         ps += 4;
         for (i = 0; i < 16; i++) {
-                temp = A + FI(B, C, D) + cwp[(int) (*pp++)] + *pc++;
+                temp = A + FI(B, C, D) + words[(int) (*pp++)] + *pc++;
                 temp = rotl32(temp, ps[i & 3]);
                 temp += B;
                 A = D;
@@ -193,35 +186,41 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
                 C = B;
                 B = temp;
         }
+# endif
+        /* Add checksum to the starting values */
+        ctx->A += A;
+        ctx->B += B;
+        ctx->C += C;
+        ctx->D += D;
+
+#else  /* MD5_SIZE_VS_SPEED == 0 or 1 */
+
+        uint32_t A_save = A;
+        uint32_t B_save = B;
+        uint32_t C_save = C;
+        uint32_t D_save = D;
+# if MD5_SIZE_VS_SPEED == 1
+        const uint32_t *pc;
+        const char *pp;
+        int i;
+# endif
 
-# endif /* MD5_SIZE_VS_SPEED > 2 */
-#else
         /* First round: using the given function, the context and a constant
-           the next context is computed.  Because the algorithms processing
+           the next context is computed.  Because the algorithm's processing
            unit is a 32-bit word and it is determined to work on words in
            little endian byte order we perhaps have to change the byte order
            before the computation.  To reduce the work for the next steps
-           we store the swapped words in the array CORRECT_WORDS.  */
+           we save swapped words in WORDS array.  */
+# undef OP
 # define OP(a, b, c, d, s, T) \
         do { \
-                a += FF(b, c, d) + (*cwp++ = SWAP_LE32(*words)) + T; \
-                ++words; \
+                a += FF(b, c, d) + (*words IF_BIG_ENDIAN(= SWAP_LE32(*words))) + T; \
+                words++; \
                 a = rotl32(a, s); \
                 a += b; \
         } while (0)
 
-        /* Before we start, one word to the strange constants.
-           They are defined in RFC 1321 as
-           T[i] = (int)(4294967296.0 * fabs(sin(i))), i=1..64
-         */
-
-# if MD5_SIZE_VS_SPEED == 1
-        const uint32_t *pc;
-        const char *pp;
-        int i;
-# endif /* MD5_SIZE_VS_SPEED */
-
-        /* Round 1.  */
+        /* Round 1 */
 # if MD5_SIZE_VS_SPEED == 1
         pc = C_array;
         for (i = 0; i < 4; i++) {
@@ -247,20 +246,21 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
         OP(D, A, B, C, 12, 0xfd987193);
         OP(C, D, A, B, 17, 0xa679438e);
         OP(B, C, D, A, 22, 0x49b40821);
-# endif /* MD5_SIZE_VS_SPEED == 1 */
+# endif
+        words -= 16;
 
         /* For the second to fourth round we have the possibly swapped words
-           in CORRECT_WORDS.  Redefine the macro to take an additional first
+           in WORDS.  Redefine the macro to take an additional first
            argument specifying the function to use.  */
 # undef OP
 # define OP(f, a, b, c, d, k, s, T) \
         do { \
-                a += f(b, c, d) + correct_words[k] + T; \
+                a += f(b, c, d) + words[k] + T; \
                 a = rotl32(a, s); \
                 a += b; \
         } while (0)
 
-        /* Round 2.  */
+        /* Round 2 */
 # if MD5_SIZE_VS_SPEED == 1
         pp = P_array;
         for (i = 0; i < 4; i++) {
@@ -286,9 +286,9 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
         OP(FG, D, A, B, C, 2, 9, 0xfcefa3f8);
         OP(FG, C, D, A, B, 7, 14, 0x676f02d9);
         OP(FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
-# endif /* MD5_SIZE_VS_SPEED == 1 */
+# endif
 
-        /* Round 3.  */
+        /* Round 3 */
 # if MD5_SIZE_VS_SPEED == 1
         for (i = 0; i < 4; i++) {
                 OP(FH, A, B, C, D, (int) (*pp++), 4, *pc++);
@@ -313,9 +313,9 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
         OP(FH, D, A, B, C, 12, 11, 0xe6db99e5);
         OP(FH, C, D, A, B, 15, 16, 0x1fa27cf8);
         OP(FH, B, C, D, A, 2, 23, 0xc4ac5665);
-# endif /* MD5_SIZE_VS_SPEED == 1 */
+# endif
 
-        /* Round 4.  */
+        /* Round 4 */
 # if MD5_SIZE_VS_SPEED == 1
         for (i = 0; i < 4; i++) {
                 OP(FI, A, B, C, D, (int) (*pp++), 6, *pc++);
@@ -340,52 +340,62 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
         OP(FI, D, A, B, C, 11, 10, 0xbd3af235);
         OP(FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
         OP(FI, B, C, D, A, 9, 21, 0xeb86d391);
-# endif /* MD5_SIZE_VS_SPEED == 1 */
-#endif  /* MD5_SIZE_VS_SPEED > 1 */
-
-        /* Add the starting values of the context.  */
-        A += A_save;
-        B += B_save;
-        C += C_save;
-        D += D_save;
-
-        /* Put checksum in context given as argument.  */
-        ctx->A = A;
-        ctx->B = B;
-        ctx->C = C;
-        ctx->D = D;
+# endif
+        /* Add checksum to the starting values */
+        ctx->A = A_save + A;
+        ctx->B = B_save + B;
+        ctx->C = C_save + C;
+        ctx->D = D_save + D;
+#endif
 }
 
 /* Feed data through a temporary buffer to call md5_hash_aligned_block()
  * with chunks of data that are 4-byte aligned and a multiple of 64 bytes.
  * This function's internal buffer remembers previous data until it has 64
  * bytes worth to pass on.  Call md5_end() to flush this buffer. */
-void FAST_FUNC md5_hash(const void *buffer, size_t len, md5_ctx_t *ctx)
+void FAST_FUNC md5_hash(md5_ctx_t *ctx, const void *buffer, size_t len)
 {
-        char *buf = (char *)buffer;
+        unsigned bufpos = ctx->total64 & 63;
+        unsigned remaining;
 
-        /* RFC 1321 specifies the possible length of the file up to 2^64 bits,
+        /* RFC 1321 specifies the possible length of the file up to 2^64 bits.
          * Here we only track the number of bytes.  */
-        ctx->total += len;
-
-        /* Process all input. */
-        while (len) {
-                unsigned i = 64 - ctx->buflen;
-
-                /* Copy data into aligned buffer. */
-                if (i > len)
-                        i = len;
-                memcpy(ctx->buffer + ctx->buflen, buf, i);
-                len -= i;
-                ctx->buflen += i;
-                buf += i;
+        ctx->total64 += len;
+#if 0
+        remaining = 64 - bufpos;
+
+        /* Hash whole blocks */
+        while (len >= remaining) {
+                memcpy(ctx->wbuffer + bufpos, buffer, remaining);
+                buffer = (const char *)buffer + remaining;
+                len -= remaining;
+                remaining = 64;
+                bufpos = 0;
+                md5_process_block64(ctx);
+        }
 
-                /* When buffer fills up, process it. */
-                if (ctx->buflen == 64) {
-                        md5_hash_block(ctx->buffer, ctx);
-                        ctx->buflen = 0;
-                }
+        /* Save last, partial blosk */
+        memcpy(ctx->wbuffer + bufpos, buffer, len);
+#else
+        /* Tiny bit smaller code */
+        while (1) {
+                remaining = 64 - bufpos;
+                if (remaining > len)
+                        remaining = len;
+                /* Copy data into aligned buffer */
+                memcpy(ctx->wbuffer + bufpos, buffer, remaining);
+                len -= remaining;
+                buffer = (const char *)buffer + remaining;
+                bufpos += remaining;
+                /* clever way to do "if (bufpos != 64) break; ... ; bufpos = 0;" */
+                bufpos -= 64;
+                if (bufpos != 0)
+                        break;
+                /* Buffer is filled up, process it */
+                md5_process_block64(ctx);
+                /*bufpos = 0; - already is */
         }
+#endif
 }
 
 /* Process the remaining bytes in the buffer and put result from CTX
@@ -393,26 +403,31 @@ void FAST_FUNC md5_hash(const void *buffer, size_t len, md5_ctx_t *ctx)
  * endian byte order, so that a byte-wise output yields to the wanted
  * ASCII representation of the message digest.
  */
-void FAST_FUNC md5_end(void *resbuf, md5_ctx_t *ctx)
+void FAST_FUNC md5_end(md5_ctx_t *ctx, void *resbuf)
 {
-        char *buf = ctx->buffer;
-        int i;
-
-        /* Pad data to block size.  */
-        buf[ctx->buflen++] = 0x80;
-        memset(buf + ctx->buflen, 0, 128 - ctx->buflen);
-
-        /* Put the 64-bit file length in *bits* at the end of the buffer.  */
-        ctx->total <<= 3;
-        if (ctx->buflen > 56)
-                buf += 64;
-        for (i = 0; i < 8; i++)
-                buf[56 + i] = ctx->total >> (i*8);
-
-        /* Process last bytes.  */
-        if (buf != ctx->buffer)
-                md5_hash_block(ctx->buffer, ctx);
-        md5_hash_block(buf, ctx);
+        unsigned bufpos = ctx->total64 & 63;
+        /* Pad the buffer to the next 64-byte boundary with 0x80,0,0,0... */
+        ctx->wbuffer[bufpos++] = 0x80;
+
+        /* This loop iterates either once or twice, no more, no less */
+        while (1) {
+                unsigned remaining = 64 - bufpos;
+                memset(ctx->wbuffer + bufpos, 0, remaining);
+                /* Do we have enough space for the length count? */
+                if (remaining >= 8) {
+                        /* Store the 64-bit counter of bits in the buffer in BE format */
+                        uint64_t t = ctx->total64 << 3;
+                        unsigned i;
+                        for (i = 0; i < 8; i++) {
+                                ctx->wbuffer[56 + i] = t;
+                                t >>= 8;
+                        }
+                }
+                md5_process_block64(ctx);
+                if (remaining >= 8)
+                        break;
+                bufpos = 0;
+        }
 
         /* The MD5 result is in little endian byte order.
          * We (ab)use the fact that A-D are consecutive in memory.
diff --git a/libbb/procps.c b/libbb/procps.c
index 7ffcd8dbc..ec43b221e 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -121,7 +121,7 @@ void FAST_FUNC free_procps_scan(procps_status_t* sp)
         free(sp);
 }
 
-#if ENABLE_FEATURE_TOPMEM
+#if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP
 static unsigned long fast_strtoul_16(char **endptr)
 {
         unsigned char c;
diff --git a/libbb/pw_encrypt_md5.c b/libbb/pw_encrypt_md5.c
index 58964b567..889e09cab 100644
--- a/libbb/pw_encrypt_md5.c
+++ b/libbb/pw_encrypt_md5.c
@@ -92,10 +92,10 @@ md5_crypt(char result[MD5_OUT_BUFSIZE], const unsigned char *pw, const unsigned
         /* Hash. the password first, since that is what is most unknown */
         md5_begin(&ctx);
         pw_len = strlen((char*)pw);
-        md5_hash(pw, pw_len, &ctx);
+        md5_hash(&ctx, pw, pw_len);
 
         /* Then the salt including "$1$" */
-        md5_hash(salt, sl, &ctx);
+        md5_hash(&ctx, salt, sl);
 
         /* Copy salt to result; skip "$1$" */
         memcpy(result, salt, sl);
@@ -105,19 +105,19 @@ md5_crypt(char result[MD5_OUT_BUFSIZE], const unsigned char *pw, const unsigned
 
         /* Then just as many characters of the MD5(pw, salt, pw) */
         md5_begin(&ctx1);
-        md5_hash(pw, pw_len, &ctx1);
-        md5_hash(salt, sl, &ctx1);
-        md5_hash(pw, pw_len, &ctx1);
-        md5_end(final, &ctx1);
+        md5_hash(&ctx1, pw, pw_len);
+        md5_hash(&ctx1, salt, sl);
+        md5_hash(&ctx1, pw, pw_len);
+        md5_end(&ctx1, final);
         for (pl = pw_len; pl > 0; pl -= 16)
-                md5_hash(final, pl > 16 ? 16 : pl, &ctx);
+                md5_hash(&ctx, final, pl > 16 ? 16 : pl);
 
         /* Then something really weird... */
         memset(final, 0, sizeof(final));
         for (i = pw_len; i; i >>= 1) {
-                md5_hash(((i & 1) ? final : (const unsigned char *) pw), 1, &ctx);
+                md5_hash(&ctx, ((i & 1) ? final : (const unsigned char *) pw), 1);
         }
-        md5_end(final, &ctx);
+        md5_end(&ctx, final);
 
         /* And now, just to make sure things don't run too fast.
          * On a 60 Mhz Pentium this takes 34 msec, so you would
@@ -126,21 +126,21 @@ md5_crypt(char result[MD5_OUT_BUFSIZE], const unsigned char *pw, const unsigned
         for (i = 0; i < 1000; i++) {
                 md5_begin(&ctx1);
                 if (i & 1)
-                        md5_hash(pw, pw_len, &ctx1);
+                        md5_hash(&ctx1, pw, pw_len);
                 else
-                        md5_hash(final, 16, &ctx1);
+                        md5_hash(&ctx1, final, 16);
 
                 if (i % 3)
-                        md5_hash(salt, sl, &ctx1);
+                        md5_hash(&ctx1, salt, sl);
 
                 if (i % 7)
-                        md5_hash(pw, pw_len, &ctx1);
+                        md5_hash(&ctx1, pw, pw_len);
 
                 if (i & 1)
-                        md5_hash(final, 16, &ctx1);
+                        md5_hash(&ctx1, final, 16);
                 else
-                        md5_hash(pw, pw_len, &ctx1);
-                md5_end(final, &ctx1);
+                        md5_hash(&ctx1, pw, pw_len);
+                md5_end(&ctx1, final);
         }
 
         p = result + sl + 4; /* 12 bytes max (sl is up to 8 bytes) */
diff --git a/libbb/sha1.c b/libbb/sha1.c
index beeb70cf6..d79291148 100644
--- a/libbb/sha1.c
+++ b/libbb/sha1.c
@@ -30,11 +30,29 @@
 
 #include "libbb.h"
 
-#define rotl32(x,n) (((x) << (n)) | ((x) >> (32 - (n))))
-#define rotr32(x,n) (((x) >> (n)) | ((x) << (32 - (n))))
-/* for sha512: */
-#define rotr64(x,n) (((x) >> (n)) | ((x) << (64 - (n))))
+/* gcc 4.2.1 optimizes rotr64 better with inline than with macro
+ * (for rotX32, there is no difference). Why? My guess is that
+ * macro requires clever common subexpression elimination heuristics
+ * in gcc, while inline basically forces it to happen.
+ */
+//#define rotl32(x,n) (((x) << (n)) | ((x) >> (32 - (n))))
+static ALWAYS_INLINE uint32_t rotl32(uint32_t x, unsigned n)
+{
+        return (x << n) | (x >> (32 - n));
+}
+//#define rotr32(x,n) (((x) >> (n)) | ((x) << (32 - (n))))
+static ALWAYS_INLINE uint32_t rotr32(uint32_t x, unsigned n)
+{
+        return (x >> n) | (x << (32 - n));
+}
+/* rotr64 in needed for sha512 only: */
+//#define rotr64(x,n) (((x) >> (n)) | ((x) << (64 - (n))))
+static ALWAYS_INLINE uint64_t rotr64(uint64_t x, unsigned n)
+{
+        return (x >> n) | (x << (64 - n));
+}
 #if BB_LITTLE_ENDIAN
+/* ALWAYS_INLINE below would hurt code size, using plain inline: */
 static inline uint64_t hton64(uint64_t v)
 {
         return (((uint64_t)htonl(v)) << 32) | htonl(v >> 32);
@@ -44,14 +62,6 @@ static inline uint64_t hton64(uint64_t v)
 #endif
 #define ntoh64(v) hton64(v)
 
-/* To check alignment gcc has an appropriate operator.  Other
-   compilers don't.  */
-#if defined(__GNUC__) && __GNUC__ >= 2
-# define UNALIGNED_P(p,type) (((uintptr_t) p) % __alignof__(type) != 0)
-#else
-# define UNALIGNED_P(p,type) (((uintptr_t) p) % sizeof(type) != 0)
-#endif
-
 
 /* Some arch headers have conflicting defines */
 #undef ch
@@ -65,11 +75,8 @@ static void FAST_FUNC sha1_process_block64(sha1_ctx_t *ctx)
         uint32_t W[80], a, b, c, d, e;
         const uint32_t *words = (uint32_t*) ctx->wbuffer;
 
-        for (t = 0; t < 16; ++t) {
-                W[t] = ntohl(*words);
-                words++;
-        }
-
+        for (t = 0; t < 16; ++t)
+                W[t] = ntohl(words[t]);
         for (/*t = 16*/; t < 80; ++t) {
                 uint32_t T = W[t - 3] ^ W[t - 8] ^ W[t - 14] ^ W[t - 16];
                 W[t] = rotl32(T, 1);
@@ -190,11 +197,8 @@ static void FAST_FUNC sha256_process_block64(sha256_ctx_t *ctx)
 #define R1(x) (rotr32(x, 17) ^ rotr32(x, 19) ^ (x >> 10))
 
         /* Compute the message schedule according to FIPS 180-2:6.2.2 step 2.  */
-        for (t = 0; t < 16; ++t) {
-                W[t] = ntohl(*words);
-                words++;
-        }
-
+        for (t = 0; t < 16; ++t)
+                W[t] = ntohl(words[t]);
         for (/*t = 16*/; t < 64; ++t)
                 W[t] = R1(W[t - 2]) + W[t - 7] + R0(W[t - 15]) + W[t - 16];
 
@@ -269,10 +273,8 @@ static void FAST_FUNC sha512_process_block128(sha512_ctx_t *ctx)
 #define R1(x) (rotr64(x, 19) ^ rotr64(x, 61) ^ (x >> 6))
 
         /* Compute the message schedule according to FIPS 180-2:6.3.2 step 2.  */
-        for (t = 0; t < 16; ++t) {
-                W[t] = ntoh64(*words);
-                words++;
-        }
+        for (t = 0; t < 16; ++t)
+                W[t] = ntoh64(words[t]);
         for (/*t = 16*/; t < 80; ++t)
                 W[t] = R1(W[t - 2]) + W[t - 7] + R0(W[t - 15]) + W[t - 16];
 
@@ -327,7 +329,9 @@ static const uint32_t init256[] = {
         0x510e527f,
         0x9b05688c,
         0x1f83d9ab,
-        0x5be0cd19
+        0x5be0cd19,
+        0,
+        0,
 };
 static const uint32_t init512_lo[] = {
         0xf3bcc908,
@@ -337,7 +341,9 @@ static const uint32_t init512_lo[] = {
         0xade682d1,
         0x2b3e6c1f,
         0xfb41bd6b,
-        0x137e2179
+        0x137e2179,
+        0,
+        0,
 };
 
 /* Initialize structure containing state of computation.
@@ -345,7 +351,7 @@ static const uint32_t init512_lo[] = {
 void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
 {
         memcpy(ctx->hash, init256, sizeof(init256));
-        ctx->total64 = 0;
+        /*ctx->total64 = 0; - done by extending init256 with two 32-bit zeros */
         ctx->process_block = sha256_process_block64;
 }
 
@@ -354,36 +360,61 @@ void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
 void FAST_FUNC sha512_begin(sha512_ctx_t *ctx)
 {
         int i;
-        for (i = 0; i < 8; i++)
+        /* Two extra iterations zero out ctx->total64[] */
+        for (i = 0; i < 8+2; i++)
                 ctx->hash[i] = ((uint64_t)(init256[i]) << 32) + init512_lo[i];
-        ctx->total64[0] = ctx->total64[1] = 0;
+        /*ctx->total64[0] = ctx->total64[1] = 0; - already done */
 }
 
 
 /* Used also for sha256 */
-void FAST_FUNC sha1_hash(const void *buffer, size_t len, sha1_ctx_t *ctx)
+void FAST_FUNC sha1_hash(sha1_ctx_t *ctx, const void *buffer, size_t len)
 {
-        unsigned in_buf = ctx->total64 & 63;
-        unsigned add = 64 - in_buf;
+        unsigned bufpos = ctx->total64 & 63;
+        unsigned remaining;
 
         ctx->total64 += len;
-
-        while (len >= add) {    /* transfer whole blocks while possible  */
-                memcpy(ctx->wbuffer + in_buf, buffer, add);
-                buffer = (const char *)buffer + add;
-                len -= add;
-                add = 64;
-                in_buf = 0;
+#if 0
+        remaining = 64 - bufpos;
+
+        /* Hash whole blocks */
+        while (len >= remaining) {
+                memcpy(ctx->wbuffer + bufpos, buffer, remaining);
+                buffer = (const char *)buffer + remaining;
+                len -= remaining;
+                remaining = 64;
+                bufpos = 0;
                 ctx->process_block(ctx);
         }
 
-        memcpy(ctx->wbuffer + in_buf, buffer, len);
+        /* Save last, partial blosk */
+        memcpy(ctx->wbuffer + bufpos, buffer, len);
+#else
+        /* Tiny bit smaller code */
+        while (1) {
+                remaining = 64 - bufpos;
+                if (remaining > len)
+                        remaining = len;
+                /* Copy data into aligned buffer */
+                memcpy(ctx->wbuffer + bufpos, buffer, remaining);
+                len -= remaining;
+                buffer = (const char *)buffer + remaining;
+                bufpos += remaining;
+                /* clever way to do "if (bufpos != 64) break; ... ; bufpos = 0;" */
+                bufpos -= 64;
+                if (bufpos != 0)
+                        break;
+                /* Buffer is filled up, process it */
+                ctx->process_block(ctx);
+                /*bufpos = 0; - already is */
+        }
+#endif
 }
 
-void FAST_FUNC sha512_hash(const void *buffer, size_t len, sha512_ctx_t *ctx)
+void FAST_FUNC sha512_hash(sha512_ctx_t *ctx, const void *buffer, size_t len)
 {
-        unsigned in_buf = ctx->total64[0] & 127;
-        unsigned add = 128 - in_buf;
+        unsigned bufpos = ctx->total64[0] & 127;
+        unsigned remaining;
 
         /* First increment the byte count.  FIPS 180-2 specifies the possible
            length of the file up to 2^128 _bits_.
@@ -391,36 +422,57 @@ void FAST_FUNC sha512_hash(const void *buffer, size_t len, sha512_ctx_t *ctx)
         ctx->total64[0] += len;
         if (ctx->total64[0] < len)
                 ctx->total64[1]++;
-
-        while (len >= add) {    /* transfer whole blocks while possible  */
-                memcpy(ctx->wbuffer + in_buf, buffer, add);
-                buffer = (const char *)buffer + add;
-                len -= add;
-                add = 128;
-                in_buf = 0;
+#if 0
+        remaining = 128 - bufpos;
+
+        /* Hash whole blocks */
+        while (len >= remaining) {
+                memcpy(ctx->wbuffer + bufpos, buffer, remaining);
+                buffer = (const char *)buffer + remaining;
+                len -= remaining;
+                remaining = 128;
+                bufpos = 0;
                 sha512_process_block128(ctx);
         }
 
-        memcpy(ctx->wbuffer + in_buf, buffer, len);
+        /* Save last, partial blosk */
+        memcpy(ctx->wbuffer + bufpos, buffer, len);
+#else
+        while (1) {
+                remaining = 128 - bufpos;
+                if (remaining > len)
+                        remaining = len;
+                /* Copy data into aligned buffer */
+                memcpy(ctx->wbuffer + bufpos, buffer, remaining);
+                len -= remaining;
+                buffer = (const char *)buffer + remaining;
+                bufpos += remaining;
+                /* clever way to do "if (bufpos != 128) break; ... ; bufpos = 0;" */
+                bufpos -= 128;
+                if (bufpos != 0)
+                        break;
+                /* Buffer is filled up, process it */
+                sha512_process_block128(ctx);
+                /*bufpos = 0; - already is */
+        }
+#endif
 }
 
 
 /* Used also for sha256 */
-void FAST_FUNC sha1_end(void *resbuf, sha1_ctx_t *ctx)
+void FAST_FUNC sha1_end(sha1_ctx_t *ctx, void *resbuf)
 {
-        unsigned pad, in_buf;
+        unsigned bufpos = ctx->total64 & 63;
 
-        in_buf = ctx->total64 & 63;
         /* Pad the buffer to the next 64-byte boundary with 0x80,0,0,0... */
-        ctx->wbuffer[in_buf++] = 0x80;
+        ctx->wbuffer[bufpos++] = 0x80;
 
         /* This loop iterates either once or twice, no more, no less */
         while (1) {
-                pad = 64 - in_buf;
-                memset(ctx->wbuffer + in_buf, 0, pad);
-                in_buf = 0;
+                unsigned remaining = 64 - bufpos;
+                memset(ctx->wbuffer + bufpos, 0, remaining);
                 /* Do we have enough space for the length count? */
-                if (pad >= 8) {
+                if (remaining >= 8) {
                         /* Store the 64-bit counter of bits in the buffer in BE format */
                         uint64_t t = ctx->total64 << 3;
                         t = hton64(t);
@@ -428,35 +480,32 @@ void FAST_FUNC sha1_end(void *resbuf, sha1_ctx_t *ctx)
                         *(uint64_t *) (&ctx->wbuffer[64 - 8]) = t;
                 }
                 ctx->process_block(ctx);
-                if (pad >= 8)
+                if (remaining >= 8)
                         break;
+                bufpos = 0;
         }
 
-        in_buf = (ctx->process_block == sha1_process_block64) ? 5 : 8;
+        bufpos = (ctx->process_block == sha1_process_block64) ? 5 : 8;
         /* This way we do not impose alignment constraints on resbuf: */
         if (BB_LITTLE_ENDIAN) {
                 unsigned i;
-                for (i = 0; i < in_buf; ++i)
+                for (i = 0; i < bufpos; ++i)
                         ctx->hash[i] = htonl(ctx->hash[i]);
         }
-        memcpy(resbuf, ctx->hash, sizeof(ctx->hash[0]) * in_buf);
+        memcpy(resbuf, ctx->hash, sizeof(ctx->hash[0]) * bufpos);
 }
 
-void FAST_FUNC sha512_end(void *resbuf, sha512_ctx_t *ctx)
+void FAST_FUNC sha512_end(sha512_ctx_t *ctx, void *resbuf)
 {
-        unsigned pad, in_buf;
+        unsigned bufpos = ctx->total64[0] & 127;
 
-        in_buf = ctx->total64[0] & 127;
-        /* Pad the buffer to the next 128-byte boundary with 0x80,0,0,0...
-         * (FIPS 180-2:5.1.2)
-         */
-        ctx->wbuffer[in_buf++] = 0x80;
+        /* Pad the buffer to the next 128-byte boundary with 0x80,0,0,0... */
+        ctx->wbuffer[bufpos++] = 0x80;
 
         while (1) {
-                pad = 128 - in_buf;
-                memset(ctx->wbuffer + in_buf, 0, pad);
-                in_buf = 0;
-                if (pad >= 16) {
+                unsigned remaining = 128 - bufpos;
+                memset(ctx->wbuffer + bufpos, 0, remaining);
+                if (remaining >= 16) {
                         /* Store the 128-bit counter of bits in the buffer in BE format */
                         uint64_t t;
                         t = ctx->total64[0] << 3;
@@ -467,8 +516,9 @@ void FAST_FUNC sha512_end(void *resbuf, sha512_ctx_t *ctx)
                         *(uint64_t *) (&ctx->wbuffer[128 - 16]) = t;
                 }
                 sha512_process_block128(ctx);
-                if (pad >= 16)
+                if (remaining >= 16)
                         break;
+                bufpos = 0;
         }
 
         if (BB_LITTLE_ENDIAN) {
diff --git a/libbb/uuencode.c b/libbb/uuencode.c
index 181f49de0..03e708fd5 100644
--- a/libbb/uuencode.c
+++ b/libbb/uuencode.c
@@ -1,6 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Copyright 2006 Rob Landley <rob@landley.net>
+ * Copyright 2003, Glenn McGrath
+ * Copyright 2006, Rob Landley <rob@landley.net>
+ * Copyright 2010, Denys Vlasenko
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
@@ -69,3 +71,75 @@ void FAST_FUNC bb_uuencode(char *p, const void *src, int length, const char *tbl
                 length++;
         }
 }
+
+/*
+ * Decode base64 encoded stream.
+ * Can stop on EOF, specified char, or on uuencode-style "====" line:
+ * flags argument controls it.
+ */
+void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags)
+{
+/* Note that EOF _can_ be passed as exit_char too */
+#define exit_char    ((int)(signed char)flags)
+#define uu_style_end (flags & BASE64_FLAG_UU_STOP)
+
+        int term_count = 0;
+
+        while (1) {
+                unsigned char translated[4];
+                int count = 0;
+
+                /* Process one group of 4 chars */
+                while (count < 4) {
+                        char *table_ptr;
+                        int ch;
+
+                        /* Get next _valid_ character.
+                         * bb_uuenc_tbl_base64[] contains this string:
+                         *  0         1         2         3         4         5         6
+                         *  012345678901234567890123456789012345678901234567890123456789012345
+                         * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n"
+                         */
+                        do {
+                                ch = fgetc(src_stream);
+                                if (ch == exit_char && count == 0)
+                                        return;
+                                if (ch == EOF)
+                                        bb_error_msg_and_die("truncated base64 input");
+                                table_ptr = strchr(bb_uuenc_tbl_base64, ch);
+//TODO: add BASE64_FLAG_foo to die on bad char?
+//Note that then we may need to still allow '\r' (for mail processing)
+                        } while (!table_ptr);
+
+                        /* Convert encoded character to decimal */
+                        ch = table_ptr - bb_uuenc_tbl_base64;
+
+                        if (ch == 65 /* '\n' */) {
+                                /* Terminating "====" line? */
+                                if (uu_style_end && term_count == 4)
+                                        return; /* yes */
+                                term_count = 0;
+                                continue;
+                        }
+                        /* ch is 64 if char was '=', otherwise 0..63 */
+                        translated[count] = ch & 63; /* 64 -> 0 */
+                        if (ch == 64) {
+                                term_count++;
+                                break;
+                        }
+                        count++;
+                        term_count = 0;
+                }
+
+                /* Merge 6 bit chars to 8 bit.
+                 * count can be < 4 when we decode the tail:
+                 * "eQ==" -> "y", not "y NUL NUL"
+                 */
+                if (count > 1)
+                        fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
+                if (count > 2)
+                        fputc(translated[1] << 4 | translated[2] >> 2, dst_stream);
+                if (count > 3)
+                        fputc(translated[2] << 6 | translated[3], dst_stream);
+        } /* while (1) */
+}
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index ae950f94f..8e60e2165 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -134,7 +134,7 @@ int FAST_FUNC xopen3(const char *pathname, int flags, int mode)
         return ret;
 }
 
-// Die if we can't open an existing file and return a fd.
+// Die if we can't open a file and return a fd.
 int FAST_FUNC xopen(const char *pathname, int flags)
 {
         return xopen3(pathname, flags, 0666);
diff --git a/loginutils/Config.src b/loginutils/Config.src
index 5d497c4dc..8158bce74 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
@@ -93,41 +93,18 @@ config USE_BB_CRYPT_SHA
           With this option off, login will fail password check for any
           user which has password encrypted with these algorithms.
 
-config ADDGROUP
-        bool "addgroup"
+config ADDUSER
+        bool "adduser"
         default y
         help
-          Utility for creating a new group account.
+          Utility for creating a new user account.
 
-config FEATURE_ADDGROUP_LONG_OPTIONS
+config FEATURE_ADDUSER_LONG_OPTIONS
         bool "Enable long options"
         default y
-        depends on ADDGROUP && LONG_OPTS
-        help
-          Support long options for the addgroup applet.
-
-config FEATURE_ADDUSER_TO_GROUP
-        bool "Support for adding users to groups"
-        default y
-        depends on ADDGROUP
-        help
-          If  called  with two non-option arguments,
-          addgroup will add an existing user to an
-          existing group.
-
-config DELGROUP
-        bool "delgroup"
-        default y
-        help
-          Utility for deleting a group account.
-
-config FEATURE_DEL_USER_FROM_GROUP
-        bool "Support for removing users from groups"
-        default y
-        depends on DELGROUP
+        depends on ADDUSER && LONG_OPTS
         help
-          If called with two non-option arguments, deluser
-          or delgroup will remove an user from a specified group.
+          Support long options for the adduser applet.
 
 config FEATURE_CHECK_NAMES
         bool "Enable sanity check on user/group names in adduser and addgroup"
@@ -141,19 +118,6 @@ config FEATURE_CHECK_NAMES
           For compatibility with Samba machine accounts "$" is also supported
           at the end of the user or group name.
 
-config ADDUSER
-        bool "adduser"
-        default y
-        help
-          Utility for creating a new user account.
-
-config FEATURE_ADDUSER_LONG_OPTIONS
-        bool "Enable long options"
-        default y
-        depends on ADDUSER && LONG_OPTS
-        help
-          Support long options for the adduser applet.
-
 config FIRST_SYSTEM_ID
         int "First valid system uid or gid for adduser and addgroup"
         depends on ADDUSER || ADDGROUP
@@ -170,12 +134,48 @@ config LAST_SYSTEM_ID
         help
           Last valid system uid or gid for adduser and addgroup
 
+config ADDGROUP
+        bool "addgroup"
+        default y
+        help
+          Utility for creating a new group account.
+
+config FEATURE_ADDGROUP_LONG_OPTIONS
+        bool "Enable long options"
+        default y
+        depends on ADDGROUP && LONG_OPTS
+        help
+          Support long options for the addgroup applet.
+
+config FEATURE_ADDUSER_TO_GROUP
+        bool "Support for adding users to groups"
+        default y
+        depends on ADDGROUP
+        help
+          If  called  with two non-option arguments,
+          addgroup will add an existing user to an
+          existing group.
+
 config DELUSER
         bool "deluser"
         default y
         help
           Utility for deleting a user account.
 
+config DELGROUP
+        bool "delgroup"
+        default y
+        help
+          Utility for deleting a group account.
+
+config FEATURE_DEL_USER_FROM_GROUP
+        bool "Support for removing users from groups"
+        default y
+        depends on DELGROUP
+        help
+          If called with two non-option arguments, deluser
+          or delgroup will remove an user from a specified group.
+
 config GETTY
         bool "getty"
         default y
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index e234d6678..08ca266d0 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -11,20 +11,13 @@
  */
 #include "libbb.h"
 
-static int del_line_matching(char **args, const char *filename)
-{
-        if (ENABLE_FEATURE_DEL_USER_FROM_GROUP && args[2]) {
-                return update_passwd(filename, args[2], NULL, args[1]);
-        }
-        return update_passwd(filename, args[1], NULL, NULL);
-}
-
 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))
+            || applet_name[3] != 'g'
+            || argc != 3)
         ) {
                 bb_show_usage();
         }
@@ -32,25 +25,30 @@ int deluser_main(int argc, char **argv)
         if (geteuid())
                 bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
 
-        if ((ENABLE_FEATURE_DEL_USER_FROM_GROUP && argc != 3)
-         || ENABLE_DELUSER
-         || (ENABLE_DELGROUP && ENABLE_DESKTOP)
-        ) {
-                if (ENABLE_DELUSER
-                 && (!ENABLE_DELGROUP || applet_name[3] == 'u')
-                ) {
-                        if (del_line_matching(argv, bb_path_passwd_file) < 0)
+        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;
-                        if (ENABLE_FEATURE_SHADOWPASSWDS) {
-                                del_line_matching(argv, bb_path_shadow_file);
-                        }
-                } else if (ENABLE_DESKTOP && ENABLE_DELGROUP && getpwnam(argv[1]))
-                        bb_error_msg_and_die("can't remove primary group of user %s", argv[1]);
-        }
-        if (del_line_matching(argv, bb_path_group_file) < 0)
-                return EXIT_FAILURE;
-        if (ENABLE_FEATURE_SHADOWPASSWDS) {
-                del_line_matching(argv, bb_path_gshadow_file);
+        } 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;
+                        if (ENABLE_FEATURE_SHADOWPASSWDS)
+                                if (update_passwd(bb_path_gshadow_file, argv[1], NULL, NULL) < 0)
+                                        return EXIT_FAILURE;
+                } else {
+                        /* delgroup USER GROUP */
+                        if (update_passwd(bb_path_group_file, argv[2], NULL, argv[1]) < 0)
+                                return EXIT_FAILURE;
+                        if (ENABLE_FEATURE_SHADOWPASSWDS)
+                                if (update_passwd(bb_path_gshadow_file, argv[2], NULL, argv[1]) < 0)
+                                        return EXIT_FAILURE;
+                }
         }
         return EXIT_SUCCESS;
 }
diff --git a/mailutils/mail.c b/mailutils/mail.c
index 8e52a3efc..9b4bebce5 100644
--- a/mailutils/mail.c
+++ b/mailutils/mail.c
@@ -116,16 +116,15 @@ void FAST_FUNC encode_base64(char *fname, const char *text, const char *eol)
                 SRC_BUF_SIZE = 45,  /* This *MUST* be a multiple of 3 */
                 DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3),
         };
-
 #define src_buf text
+        char src[SRC_BUF_SIZE];
         FILE *fp = fp;
         ssize_t len = len;
         char dst_buf[DST_BUF_SIZE + 1];
 
         if (fname) {
                 fp = (NOT_LONE_DASH(fname)) ? xfopen_for_read(fname) : (FILE *)text;
-                src_buf = bb_common_bufsiz1;
-        // N.B. strlen(NULL) segfaults!
+                src_buf = src;
         } else if (text) {
                 // though we do not call uuencode(NULL, NULL) explicitly
                 // still we do not want to break things suddenly
@@ -161,73 +160,6 @@ void FAST_FUNC encode_base64(char *fname, const char *text, const char *eol)
 #undef src_buf
 }
 
-void FAST_FUNC decode_base64(FILE *src_stream, FILE *dst_stream)
-{
-        int term_count = 1;
-
-        while (1) {
-                char translated[4];
-                int count = 0;
-
-                while (count < 4) {
-                        char *table_ptr;
-                        int ch;
-
-                        /* Get next _valid_ character.
-                         * global vector bb_uuenc_tbl_base64[] contains this string:
-                         * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n"
-                         */
-                        do {
-                                ch = fgetc(src_stream);
-                                if (ch == EOF) {
-                                        bb_error_msg_and_die(bb_msg_read_error);
-                                }
-                                // - means end of MIME section
-                                if ('-' == ch) {
-                                        // push it back
-                                        ungetc(ch, src_stream);
-                                        return;
-                                }
-                                table_ptr = strchr(bb_uuenc_tbl_base64, ch);
-                        } while (table_ptr == NULL);
-
-                        /* Convert encoded character to decimal */
-                        ch = table_ptr - bb_uuenc_tbl_base64;
-
-                        if (*table_ptr == '=') {
-                                if (term_count == 0) {
-                                        translated[count] = '\0';
-                                        break;
-                                }
-                                term_count++;
-                        } else if (*table_ptr == '\n') {
-                                /* Check for terminating line */
-                                if (term_count == 5) {
-                                        return;
-                                }
-                                term_count = 1;
-                                continue;
-                        } else {
-                                translated[count] = ch;
-                                count++;
-                                term_count = 0;
-                        }
-                }
-
-                /* Merge 6 bit chars to 8 bit */
-                if (count > 1) {
-                        fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
-                }
-                if (count > 2) {
-                        fputc(translated[1] << 4 | translated[2] >> 2, dst_stream);
-                }
-                if (count > 3) {
-                        fputc(translated[2] << 6 | translated[3], dst_stream);
-                }
-        }
-}
-
-
 /*
  * get username and password from a file descriptor
  */
diff --git a/mailutils/mail.h b/mailutils/mail.h
index bb747c4c5..e0048fbfa 100644
--- a/mailutils/mail.h
+++ b/mailutils/mail.h
@@ -32,4 +32,3 @@ void FAST_FUNC get_cred_or_die(int fd);
 const FAST_FUNC char *command(const char *fmt, const char *param);
 
 void FAST_FUNC encode_base64(char *fname, const char *text, const char *eol);
-void FAST_FUNC decode_base64(FILE *src_stream, FILE *dst_stream);
diff --git a/mailutils/mime.c b/mailutils/mime.c
index 44c7d0216..682cf4536 100644
--- a/mailutils/mime.c
+++ b/mailutils/mime.c
@@ -225,7 +225,7 @@ static int parse(const char *boundary, char **argv)
         // prepare unique string pattern
         uniq = xasprintf("%%llu.%u.%s", (unsigned)getpid(), safe_gethostname());
 
-//bb_info_msg("PARSE[%s]", terminator);
+//bb_info_msg("PARSE[%s]", uniq);
 
         while ((line = xmalloc_fgets_str(stdin, "\r\n\r\n")) != NULL) {
 
@@ -306,7 +306,7 @@ static int parse(const char *boundary, char **argv)
 
                         // dump to fp
                         if (0 == strcasecmp(encoding, "base64")) {
-                                decode_base64(stdin, fp);
+                                read_base64(stdin, fp, '-');
                         } else if (0 != strcasecmp(encoding, "7bit")
                                 && 0 != strcasecmp(encoding, "8bit")
                         ) {
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c
index f37db03d5..77ec71129 100644
--- a/mailutils/popmaildir.c
+++ b/mailutils/popmaildir.c
@@ -109,9 +109,9 @@ int popmaildir_main(int argc UNUSED_PARAM, char **argv)
                                 s[1] = '\0';
                         // get md5 sum of "<stamp>password" string
                         md5_begin(&md5.ctx);
-                        md5_hash(buf, strlen(buf), &md5.ctx);
-                        md5_hash(G.pass, strlen(G.pass), &md5.ctx);
-                        md5_end(res, &md5.ctx);
+                        md5_hash(&md5.ctx, buf, strlen(buf));
+                        md5_hash(&md5.ctx, G.pass, strlen(G.pass));
+                        md5_end(&md5.ctx, res);
                         *bin2hex(md5.hex, (char*)res, 16) = '\0';
                         // APOP
                         s = xasprintf("%s %s", G.user, md5.hex);
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index 59591ee4b..ec97cf8af 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -221,12 +221,12 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
 
                 // analyze headers
                 // To: or Cc: headers add recipients
-                if (0 == strncasecmp("To: ", s, 4) || 0 == strncasecmp("Bcc: " + 1, s, 4)) {
-                        rcptto(sane_address(s+4));
+                if (0 == strncasecmp("To:", s, 3) || 0 == strncasecmp("Bcc:" + 1, s, 3)) {
+                        rcptto(sane_address(s+3));
                         goto addheader;
                 // Bcc: header adds blind copy (hidden) recipient
-                } else if (0 == strncasecmp("Bcc: ", s, 5)) {
-                        rcptto(sane_address(s+5));
+                } else if (0 == strncasecmp("Bcc:", s, 4)) {
+                        rcptto(sane_address(s+4));
                         free(s);
                         // N.B. Bcc: vanishes from headers!
 
diff --git a/miscutils/Config.src b/miscutils/Config.src
index 151f61bcc..4912daf88 100644
--- a/miscutils/Config.src
+++ b/miscutils/Config.src
@@ -136,7 +136,6 @@ config CHRT
 config CROND
         bool "crond"
         default y
-        select FEATURE_SUID
         select FEATURE_SYSLOG
         help
           Crond is a background daemon that parses individual crontab
diff --git a/miscutils/man.c b/miscutils/man.c
index 2d3776cf3..b356e726f 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -182,16 +182,21 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                         pager = "more";
         }
 
-        /* Parse man.conf[ig] */
+        /* Parse man.conf[ig] or man_db.conf */
         /* man version 1.6f uses man.config */
+        /* man-db implementation of man uses man_db.conf */
         parser = config_open2("/etc/man.config", fopen_for_read);
         if (!parser)
                 parser = config_open2("/etc/man.conf", fopen_for_read);
+        if (!parser)
+                parser = config_open2("/etc/man_db.conf", fopen_for_read);
 
         while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) {
                 if (!token[1])
                         continue;
-                if (strcmp("MANPATH", token[0]) == 0) {
+                if (strcmp("MANDATORY_MANPATH"+10, token[0]) == 0 /* "MANPATH"? */
+                 || strcmp("MANDATORY_MANPATH", token[0]) == 0
+                ) {
                         char *path = token[1];
                         while (*path) {
                                 char *next_path;
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index f42242687..6c85ea346 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -1,5 +1,5 @@
 /*
- * nandwrite.c - ported to busybox from mtd-utils
+ * nandwrite and nanddump ported to busybox from mtd-utils
  *
  * Author: Baruch Siach <baruch@tkos.co.il>, Orex Computed Radiography
  *
@@ -9,8 +9,10 @@
  */
 
 //applet:IF_NANDWRITE(APPLET(nandwrite, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
+//applet:IF_NANDWRITE(APPLET_ODDNAME(nanddump, nandwrite, _BB_DIR_USR_SBIN, _BB_SUID_DROP, nanddump))
 
 //kbuild:lib-$(CONFIG_NANDWRITE) += nandwrite.o
+//kbuild:lib-$(CONFIG_NANDDUMP) += nandwrite.o
 
 //config:config NANDWRITE
 //config:       bool "nandwrite"
@@ -18,9 +20,13 @@
 //config:       depends on PLATFORM_LINUX
 //config:       help
 //config:         Write to the specified MTD device, with bad blocks awareness
-
-#include "libbb.h"
-#include <mtd/mtd-user.h>
+//config:
+//config:config NANDDUMP
+//config:       bool "nanddump"
+//config:       default n
+//config:       depends on PLATFORM_LINUX
+//config:       help
+//config:         Dump the content of raw NAND chip
 
 //usage:#define nandwrite_trivial_usage
 //usage:        "[-p] [-s ADDR] MTD_DEVICE [FILE]"
@@ -30,18 +36,65 @@
 //usage:     "\n        -p      Pad to page size"
 //usage:     "\n        -s ADDR Start address"
 
+//usage:#define nanddump_trivial_usage
+//usage:        "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE"
+//usage:#define nanddump_full_usage "\n\n"
+//usage:        "Dump the sepcified MTD device\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -o      Omit oob data"
+//usage:     "\n        -b      Omit bad block from the dump"
+//usage:     "\n        -s ADDR Start address"
+//usage:     "\n        -l LEN  Length"
+//usage:     "\n        -f FILE Dump to file ('-' for stdout)"
+
+#include "libbb.h"
+#include <mtd/mtd-user.h>
+
+#define IS_NANDDUMP  (ENABLE_NANDDUMP && (!ENABLE_NANDWRITE || (applet_name[4] == 'd')))
+#define IS_NANDWRITE (ENABLE_NANDWRITE && (!ENABLE_NANDDUMP || (applet_name[4] != 'd')))
+
+#define OPT_p   (1 << 0) /* nandwrite only */
+#define OPT_o   (1 << 0) /* nanddump only */
+#define OPT_s   (1 << 1)
+#define OPT_b   (1 << 2)
+#define OPT_f   (1 << 3)
+#define OPT_l   (1 << 4)
+
+#define NAND_MAX_OOBSIZE 256
+/* helper for writing out 0xff for bad blocks pad */
+static void dump_bad(struct mtd_info_user *meminfo, unsigned len, int oob)
+{
+        unsigned char buf[meminfo->writesize];
+        unsigned count;
+
+        /* round len to the next page */
+        len = (len | ~(meminfo->writesize - 1)) + 1;
+
+        memset(buf, 0xff, sizeof(buf));
+        for (count = 0; count < len; count += meminfo->writesize) {
+                xwrite(STDOUT_FILENO, buf, meminfo->writesize);
+                if (oob)
+                        xwrite(STDOUT_FILENO, buf, meminfo->oobsize);
+        }
+}
+
 static unsigned next_good_eraseblock(int fd, struct mtd_info_user *meminfo,
                 unsigned block_offset)
 {
         while (1) {
                 loff_t offs;
-                if (block_offset >= meminfo->size)
-                        bb_error_msg_and_die("not enough space in MTD device");
+
+                if (block_offset >= meminfo->size) {
+                        if (IS_NANDWRITE)
+                                bb_error_msg_and_die("not enough space in MTD device");
+                        return block_offset; /* let the caller exit */
+                }
                 offs = block_offset;
                 if (xioctl(fd, MEMGETBADBLOCK, &offs) == 0)
                         return block_offset;
                 /* ioctl returned 1 => "bad block" */
-                printf("Skipping bad block at 0x%08x\n", block_offset);
+                if (IS_NANDWRITE)
+                        printf("Skipping bad block at 0x%08x\n", block_offset);
                 block_offset += meminfo->erasesize;
         }
 }
@@ -49,31 +102,49 @@ static unsigned next_good_eraseblock(int fd, struct mtd_info_user *meminfo,
 int nandwrite_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nandwrite_main(int argc UNUSED_PARAM, char **argv)
 {
+        /* Buffer for OOB data */
+        unsigned char oobbuf[NAND_MAX_OOBSIZE];
         unsigned opts;
         int fd;
         ssize_t cnt;
-        unsigned mtdoffset, meminfo_writesize, blockstart;
+        unsigned mtdoffset, meminfo_writesize, blockstart, limit;
+        unsigned end_addr = ~0;
         struct mtd_info_user meminfo;
+        struct mtd_oob_buf oob;
         unsigned char *filebuf;
-        const char *opt_s = "0";
-        enum {
-                OPT_p = (1 << 0),
-                OPT_s = (1 << 1),
-        };
-
-        opt_complementary = "-1:?2";
-        opts = getopt32(argv, "ps:", &opt_s);
+        const char *opt_s = "0", *opt_f = "-", *opt_l;
+
+        if (IS_NANDDUMP) {
+                opt_complementary = "=1";
+                opts = getopt32(argv, "os:bf:l:", &opt_s, &opt_f, &opt_l);
+        } else { /* nandwrite */
+                opt_complementary = "-1:?2";
+                opts = getopt32(argv, "ps:", &opt_s);
+        }
         argv += optind;
 
-        if (argv[1])
-                xmove_fd(xopen_stdin(argv[1]), STDIN_FILENO);
+        if (IS_NANDWRITE && argv[1])
+                opt_f = argv[1];
+        if (!LONE_DASH(opt_f)) {
+                int tmp_fd = xopen(opt_f,
+                        IS_NANDDUMP ? O_WRONLY | O_TRUNC | O_CREAT : O_RDONLY
+                );
+                xmove_fd(tmp_fd, IS_NANDDUMP ? STDOUT_FILENO : STDIN_FILENO);
+        }
 
         fd = xopen(argv[0], O_RDWR);
         xioctl(fd, MEMGETINFO, &meminfo);
 
-        mtdoffset = bb_strtou(opt_s, NULL, 0);
-        if (errno)
-                bb_error_msg_and_die("invalid number '%s'", opt_s);
+        oob.start  = 0;
+        oob.length = meminfo.oobsize;
+        oob.ptr    = oobbuf;
+
+        mtdoffset = xstrtou(opt_s, 0);
+        if (IS_NANDDUMP && (opts & OPT_l)) {
+                unsigned length = xstrtou(opt_l, 0);
+                if (length < meminfo.size - mtdoffset)
+                        end_addr = mtdoffset + length;
+        }
 
         /* Pull it into a CPU register (hopefully) - smaller code that way */
         meminfo_writesize = meminfo.writesize;
@@ -91,20 +162,39 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
                  * bad.
                  */
                 tmp = next_good_eraseblock(fd, &meminfo, blockstart);
-                if (tmp != blockstart) /* bad block(s), advance mtdoffset */
+                if (tmp != blockstart) {
+                        /* bad block(s), advance mtdoffset */
+                        if (IS_NANDDUMP & !(opts & OPT_b)) {
+                                int bad_len = MIN(tmp, end_addr) - mtdoffset;
+                                dump_bad(&meminfo, bad_len, !(opts & OPT_o));
+                        }
                         mtdoffset = tmp;
+                }
         }
 
         cnt = -1;
-        while (mtdoffset < meminfo.size) {
+        limit = MIN(meminfo.size, end_addr);
+        while (mtdoffset < limit) {
+                int input_fd = IS_NANDWRITE ? STDIN_FILENO : fd;
+                int output_fd = IS_NANDWRITE ? fd : STDOUT_FILENO;
+
                 blockstart = mtdoffset & ~(meminfo.erasesize - 1);
                 if (blockstart == mtdoffset) {
                         /* starting a new eraseblock */
                         mtdoffset = next_good_eraseblock(fd, &meminfo, blockstart);
-                        printf("Writing at 0x%08x\n", mtdoffset);
+                        if (IS_NANDWRITE)
+                                printf("Writing at 0x%08x\n", mtdoffset);
+                        else if (mtdoffset > blockstart) {
+                                int bad_len = MIN(mtdoffset, limit) - blockstart;
+                                dump_bad(&meminfo, bad_len, !(opts & OPT_o));
+                        }
+                        if (mtdoffset >= limit)
+                                break;
                 }
+                xlseek(fd, mtdoffset, SEEK_SET);
+
                 /* get some more data from input */
-                cnt = full_read(STDIN_FILENO, filebuf, meminfo_writesize);
+                cnt = full_read(input_fd, filebuf, meminfo_writesize);
                 if (cnt == 0) {
                         /* even with -p, we do not pad past the end of input
                          * (-p only zero-pads last incomplete page)
@@ -112,20 +202,29 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
                         break;
                 }
                 if (cnt < meminfo_writesize) {
+                        if (IS_NANDDUMP)
+                                bb_error_msg_and_die("short read");
                         if (!(opts & OPT_p))
                                 bb_error_msg_and_die("input size is not rounded up to page size, "
                                                 "use -p to zero pad");
                         /* zero pad to end of write block */
                         memset(filebuf + cnt, 0, meminfo_writesize - cnt);
                 }
-                xlseek(fd, mtdoffset, SEEK_SET);
-                xwrite(fd, filebuf, meminfo_writesize);
+                xwrite(output_fd, filebuf, meminfo_writesize);
+
+                if (IS_NANDDUMP && !(opts & OPT_o)) {
+                        /* Dump OOB data */
+                        oob.start = mtdoffset;
+                        xioctl(fd, MEMREADOOB, &oob);
+                        xwrite(output_fd, oobbuf, meminfo.oobsize);
+                }
+
                 mtdoffset += meminfo_writesize;
                 if (cnt < meminfo_writesize)
                         break;
         }
 
-        if (cnt != 0) {
+        if (IS_NANDWRITE && cnt != 0) {
                 /* We filled entire MTD, but did we reach EOF on input? */
                 if (full_read(STDIN_FILENO, filebuf, meminfo_writesize) != 0) {
                         /* no */
diff --git a/modutils/depmod.c b/modutils/depmod.c
index 006a7bcc1..85b64a229 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -8,6 +8,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//applet:IF_DEPMOD(APPLET(depmod, _BB_DIR_SBIN, _BB_SUID_DROP))
+
+//usage:#if !ENABLE_MODPROBE_SMALL
+//usage:#define depmod_trivial_usage NOUSAGE_STR
+//usage:#define depmod_full_usage ""
+//usage:#endif
+
 #include "libbb.h"
 #include "modutils.h"
 #include <sys/utsname.h> /* uname() */
@@ -144,6 +151,8 @@ static void xfreopen_write(const char *file, FILE *f)
  *              Print to stdout all the symbols each module depends on
  *              and the module's file name which provides that symbol.
  *      -r      No-op
+ *      -u      No-op
+ *      -q      No-op
  *
  * So far we only support: [-rn] [-b BASE] [VERSION] [MODFILES]...
  * -aAeF are accepted but ignored. -vC are not accepted.
@@ -155,7 +164,10 @@ enum {
         //OPT_e = (1 << 3), /* with -F, print unresolved symbols */
         //OPT_F = (1 << 4), /* System.map that contains the symbols */
         OPT_n = (1 << 5), /* dry-run, print to stdout only */
-        OPT_r = (1 << 6)  /* Compat dummy. Linux Makefile uses it */
+        OPT_r = (1 << 6), /* Compat dummy. Linux Makefile uses it */
+        OPT_u = (1 << 7), /* -u,--unresolved-error: ignored */
+        OPT_q = (1 << 8), /* -q,--quiet: ignored */
+        OPT_C = (1 << 9), /* -C,--config etc_modules_conf: ignored */
 };
 
 int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -167,7 +179,7 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
         struct utsname uts;
         int tmp;
 
-        getopt32(argv, "aAb:eF:nr", &moddir_base, NULL);
+        getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL);
         argv += optind;
 
         /* goto modules location */
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 17fc18c09..7ec3cae47 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -7,16 +7,19 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//applet:IF_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_DROP))
+
 #include "libbb.h"
 #include "modutils.h"
 
 /* 2.6 style insmod has no options and required filename
  * (not module name - .ko can't be omitted) */
 
+//usage:#if !ENABLE_MODPROBE_SMALL
 //usage:#define insmod_trivial_usage
 //usage:        IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ")
 //usage:        IF_NOT_FEATURE_2_4_MODULES("FILE ")
-//usage:        "[symbol=value]..."
+//usage:        "[SYMBOL=VALUE]..."
 //usage:#define insmod_full_usage "\n\n"
 //usage:       "Load the specified kernel modules into the kernel"
 //usage:        IF_FEATURE_2_4_MODULES( "\n"
@@ -31,6 +34,7 @@
 //usage:        )
 //usage:     "\n        -x      Don't export externs"
 //usage:        )
+//usage:#endif
 
 int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int insmod_main(int argc UNUSED_PARAM, char **argv)
diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index 9558a2510..ab7c11f2a 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -7,6 +7,16 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//applet:IF_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_DROP))
+
+//usage:#if !ENABLE_MODPROBE_SMALL
+//usage:#define lsmod_trivial_usage
+//usage:       ""
+//usage:#define lsmod_full_usage "\n\n"
+//usage:       "List the currently loaded kernel modules"
+//usage:#endif
+
 #include "libbb.h"
 #include "unicode.h"
 
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 05f2c34eb..ec3ddfb8f 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -8,6 +8,12 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+//applet:IF_MODPROBE_SMALL(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
+
 #include "libbb.h"
 /* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h> /* uname() */
@@ -18,10 +24,13 @@ extern int delete_module(const char *module, unsigned flags);
 extern int query_module(const char *name, int which, void *buf, size_t bufsize, size_t *ret);
 
 
-#define dbg1_error_msg(...) ((void)0)
-#define dbg2_error_msg(...) ((void)0)
-//#define dbg1_error_msg(...) bb_error_msg(__VA_ARGS__)
-//#define dbg2_error_msg(...) bb_error_msg(__VA_ARGS__)
+#if 1
+# define dbg1_error_msg(...) ((void)0)
+# define dbg2_error_msg(...) ((void)0)
+#else
+# define dbg1_error_msg(...) bb_error_msg(__VA_ARGS__)
+# define dbg2_error_msg(...) bb_error_msg(__VA_ARGS__)
+#endif
 
 #define DEPFILE_BB CONFIG_DEFAULT_DEPMOD_FILE".bb"
 
@@ -579,10 +588,9 @@ static void process_module(char *name, const char *cmdline_options)
 
         /* rmmod? unload it by name */
         if (is_rmmod) {
-                if (delete_module(name, O_NONBLOCK | O_EXCL) != 0
-                 && !(option_mask32 & OPT_q)
-                ) {
-                        bb_perror_msg("remove '%s'", name);
+                if (delete_module(name, O_NONBLOCK | O_EXCL) != 0) {
+                        if (!(option_mask32 & OPT_q))
+                                bb_perror_msg("remove '%s'", name);
                         goto ret;
                 }
                 /* N.B. we do not stop here -
@@ -594,9 +602,9 @@ static void process_module(char *name, const char *cmdline_options)
 
         if (!info) {
                 /* both dirscan and find_alias found nothing */
-                if (applet_name[0] != 'd') /* it wasn't depmod */
+                if (!is_rmmod && applet_name[0] != 'd') /* it wasn't rmmod or depmod */
                         bb_error_msg("module '%s' not found", name);
-//TODO: _and_die()?
+//TODO: _and_die()? or should we continue (un)loading modules listed on cmdline?
                 goto ret;
         }
 
@@ -686,6 +694,46 @@ The following options are useful for people managing distributions:
 */
 
 //usage:#if ENABLE_MODPROBE_SMALL
+
+//usage:#define depmod_trivial_usage NOUSAGE_STR
+//usage:#define depmod_full_usage ""
+
+//usage:#define lsmod_trivial_usage
+//usage:       ""
+//usage:#define lsmod_full_usage "\n\n"
+//usage:       "List the currently loaded kernel modules"
+
+//usage:#define insmod_trivial_usage
+//usage:        IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ")
+//usage:        IF_NOT_FEATURE_2_4_MODULES("FILE ")
+//usage:        "[SYMBOL=VALUE]..."
+//usage:#define insmod_full_usage "\n\n"
+//usage:       "Load the specified kernel modules into the kernel"
+//usage:        IF_FEATURE_2_4_MODULES( "\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -f      Force module to load into the wrong kernel version"
+//usage:     "\n        -k      Make module autoclean-able"
+//usage:     "\n        -v      Verbose"
+//usage:     "\n        -q      Quiet"
+//usage:     "\n        -L      Lock: prevent simultaneous loads"
+//usage:        IF_FEATURE_INSMOD_LOAD_MAP(
+//usage:     "\n        -m      Output load map to stdout"
+//usage:        )
+//usage:     "\n        -x      Don't export externs"
+//usage:        )
+
+//usage:#define rmmod_trivial_usage
+//usage:       "[-wfa] [MODULE]..."
+//usage:#define rmmod_full_usage "\n\n"
+//usage:       "Unload kernel modules\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -w      Wait until the module is no longer used"
+//usage:     "\n        -f      Force unload"
+//usage:     "\n        -a      Remove all unused modules (recursively)"
+//usage:
+//usage:#define rmmod_example_usage
+//usage:       "$ rmmod tulip\n"
+
 //usage:#define modprobe_trivial_usage
 //usage:        "[-qfwrsv] MODULE [symbol=value]..."
 //usage:#define modprobe_full_usage "\n\n"
@@ -696,7 +744,8 @@ The following options are useful for people managing distributions:
 //usage:     "\n        -f      Force"
 //usage:     "\n        -w      Wait for unload"
 //usage:     "\n        -s      Report via syslog instead of stderr"
-//usage:#endif /* ENABLE_MODPROBE_SMALL */
+
+//usage:#endif
 
 int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int modprobe_main(int argc UNUSED_PARAM, char **argv)
@@ -811,8 +860,8 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         /* Load/remove modules.
          * Only rmmod loops here, modprobe has only argv[0] */
         do {
-                process_module(*argv++, options);
-        } while (*argv);
+                process_module(*argv, options);
+        } while (*++argv);
 
         if (ENABLE_FEATURE_CLEAN_UP) {
                 IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);)
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index ab35628f4..a5cf4babf 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -8,17 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-/* 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.
- */
-#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)
+//applet:IF_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
 
 //usage:#if !ENABLE_MODPROBE_SMALL
 //usage:#define modprobe_notes_usage
@@ -98,6 +88,19 @@
 //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 */
 
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index aa1bb01d6..dde77731f 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -8,6 +8,21 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//applet:IF_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_DROP))
+
+//usage:#if !ENABLE_MODPROBE_SMALL
+//usage:#define rmmod_trivial_usage
+//usage:       "[-wfa] [MODULE]..."
+//usage:#define rmmod_full_usage "\n\n"
+//usage:       "Unload kernel modules\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -w      Wait until the module is no longer used"
+//usage:     "\n        -f      Force unload"
+//usage:     "\n        -a      Remove all unused modules (recursively)"
+//usage:#define rmmod_example_usage
+//usage:       "$ rmmod tulip\n"
+//usage:#endif
+
 #include "libbb.h"
 #include "modutils.h"
 
diff --git a/networking/Config.src b/networking/Config.src
index 9fc122bf3..6dd7df754 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -804,7 +804,7 @@ config TELNETD
 
                   mount -t devpts devpts /dev/pts
 
-          You need to be sure that Busybox has LOGIN and
+          You need to be sure that busybox has LOGIN and
           FEATURE_SUID enabled. And finally, you should make
           certain that Busybox has been installed setuid root:
 
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
new file mode 100644
index 000000000..5ac190c32
--- /dev/null
+++ b/networking/nbd-client.c
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2010 Rob Landley <rob@landley.net>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+#include "libbb.h"
+#include <netinet/tcp.h>
+#include <linux/fs.h>
+
+//applet:IF_NBDCLIENT(APPLET_ODDNAME(nbd-client, nbdclient, _BB_DIR_USR_SBIN, _BB_SUID_DROP, nbdclient))
+
+//kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
+
+//config:config NBDCLIENT
+//config:       bool "nbd-client"
+//config:       default y
+//config:       help
+//config:         Network block device client
+
+#define NBD_SET_SOCK          _IO(0xab, 0)
+#define NBD_SET_BLKSIZE       _IO(0xab, 1)
+#define NBD_SET_SIZE          _IO(0xab, 2)
+#define NBD_DO_IT             _IO(0xab, 3)
+#define NBD_CLEAR_SOCK        _IO(0xab, 4)
+#define NBD_CLEAR_QUEUE       _IO(0xab, 5)
+#define NBD_PRINT_DEBUG       _IO(0xab, 6)
+#define NBD_SET_SIZE_BLOCKS   _IO(0xab, 7)
+#define NBD_DISCONNECT        _IO(0xab, 8)
+#define NBD_SET_TIMEOUT       _IO(0xab, 9)
+
+//usage:#define nbdclient_trivial_usage
+//usage:       "HOST PORT BLOCKDEV"
+//usage:#define nbdclient_full_usage "\n\n"
+//usage:       "Connect to HOST and provide a network block device on BLOCKDEV"
+
+//TODO: more compat with nbd-client version 2.9.13 -
+//Usage: nbd-client [bs=blocksize] [timeout=sec] host port nbd_device [-swap] [-persist] [-nofork]
+//Or   : nbd-client -d nbd_device
+//Or   : nbd-client -c nbd_device
+//Default value for blocksize is 1024 (recommended for ethernet)
+//Allowed values for blocksize are 512,1024,2048,4096
+//Note, that kernel 2.4.2 and older ones do not work correctly with
+//blocksizes other than 1024 without patches
+
+int nbdclient_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int nbdclient_main(int argc, char **argv)
+{
+        unsigned long timeout = 0;
+        int nofork = 0;
+        char *host, *port, *device;
+        struct nbd_header_t {
+                uint64_t magic1; // "NBDMAGIC"
+                uint64_t magic2; // 0x420281861253 big endian
+                uint64_t devsize;
+                uint32_t flags;
+                char data[124];
+        } nbd_header;
+        struct bug_check {
+                char c[offsetof(struct nbd_header_t, data) == 8+8+8+4 ? 1 : -1];
+        };
+
+        // Parse command line stuff (just a stub now)
+        if (argc != 4)
+                bb_show_usage();
+
+#if !BB_MMU
+        bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS, argv);
+#endif
+
+        host = argv[1];
+        port = argv[2];
+        device = argv[3];
+
+        // Repeat until spanked (-persist behavior)
+        for (;;) {
+                int sock, nbd;
+                int ro;
+
+                // Make sure the /dev/nbd exists
+                nbd = xopen(device, O_RDWR);
+
+                // Find and connect to server
+                sock = create_and_connect_stream_or_die(host, xatou16(port));
+                setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &const_int_1, sizeof(const_int_1));
+
+                // Log on to the server
+                xread(sock, &nbd_header, 8+8+8+4 + 124);
+                if (memcmp(&nbd_header.magic1, "NBDMAGIC""\x00\x00\x42\x02\x81\x86\x12\x53", 16) != 0)
+                        bb_error_msg_and_die("login failed");
+
+                // Set 4k block size.  Everything uses that these days
+                ioctl(nbd, NBD_SET_BLKSIZE, 4096);
+                ioctl(nbd, NBD_SET_SIZE_BLOCKS, SWAP_BE64(nbd_header.devsize) / 4096);
+                ioctl(nbd, NBD_CLEAR_SOCK);
+
+                // If the sucker was exported read only, respect that locally
+                ro = (nbd_header.flags & SWAP_BE32(2)) / SWAP_BE32(2);
+                if (ioctl(nbd, BLKROSET, &ro) < 0)
+                        bb_perror_msg_and_die("BLKROSET");
+
+                if (timeout)
+                        if (ioctl(nbd, NBD_SET_TIMEOUT, timeout))
+                                bb_perror_msg_and_die("NBD_SET_TIMEOUT");
+                if (ioctl(nbd, NBD_SET_SOCK, sock))
+                        bb_perror_msg_and_die("NBD_SET_SOCK");
+
+                // if (swap) mlockall(MCL_CURRENT|MCL_FUTURE);
+
+#if BB_MMU
+                // Open the device to force reread of the partition table.
+                // Need to do it in a separate process, since open(device)
+                // needs some other process to sit in ioctl(nbd, NBD_DO_IT).
+                if (fork() == 0) {
+                        char *s = strrchr(device, '/');
+                        sprintf(nbd_header.data, "/sys/block/%.32s/pid", s ? s + 1 : device);
+                        // Is it up yet?
+                        for (;;) {
+                                int fd = open(nbd_header.data, O_RDONLY);
+                                if (fd >= 0) {
+                                        //close(fd);
+                                        break;
+                                }
+                                sleep(1);
+                        }
+                        open(device, O_RDONLY);
+                        return 0;
+                }
+
+                // Daemonize here
+                if (!nofork) {
+                        daemon(0, 0);
+                        nofork = 1;
+                }
+#endif
+
+                // This turns us (the process that calls this ioctl)
+                // into a dedicated NBD request handler.
+                // We block here for a long time.
+                // When exactly ioctl returns? On a signal,
+                // or if someone does ioctl(NBD_DISCONNECT) [nbd-client -d].
+                if (ioctl(nbd, NBD_DO_IT) >= 0 || errno == EBADR) {
+                        // Flush queue and exit
+                        ioctl(nbd, NBD_CLEAR_QUEUE);
+                        ioctl(nbd, NBD_CLEAR_SOCK);
+                        break;
+                }
+
+                close(sock);
+                close(nbd);
+        }
+
+        return 0;
+}
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 6b5b176c9..8594a67a6 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -57,7 +57,8 @@
 //usage:#define nc_trivial_usage
 //usage:       "[OPTIONS] HOST PORT  - connect"
 //usage:        IF_NC_SERVER("\n"
-//usage:       "nc [OPTIONS] -l -p PORT [HOST] [PORT]  - listen")
+//usage:       "nc [OPTIONS] -l -p PORT [HOST] [PORT]  - listen"
+//usage:        )
 //usage:#define nc_full_usage "\n\n"
 //usage:       "Options:"
 //usage:     "\n        -e PROG Run PROG after connect (must be last)"
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 6707e9bdb..ca4afa045 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1765,6 +1765,10 @@ recv_and_process_client_pkt(void /*int fd*/)
         /* this time was obtained between poll() and recv() */
         msg.m_rectime = d_to_lfp(G.cur_time);
         msg.m_xmttime = d_to_lfp(gettime1900d()); /* this instant */
+        if (G.peer_cnt == 0) {
+                /* we have no peers: "stratum 1 server" mode. reftime = our own time */
+                G.reftime = G.cur_time;
+        }
         msg.m_reftime = d_to_lfp(G.reftime);
         msg.m_orgtime = query_xmttime;
         msg.m_rootdelay = d_to_sfp(G.rootdelay);
@@ -1902,8 +1906,13 @@ static NOINLINE void ntp_init(char **argv)
                 bb_show_usage();
 //      if (opts & OPT_x) /* disable stepping, only slew is allowed */
 //              G.time_was_stepped = 1;
-        while (peers)
-                add_peers(llist_pop(&peers));
+        if (peers) {
+                while (peers)
+                        add_peers(llist_pop(&peers));
+        } else {
+                /* -l but no peers: "stratum 1 server" mode */
+                G.stratum = 1;
+        }
         if (!(opts & OPT_n)) {
                 bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO, argv);
                 logmode = LOGMODE_NONE;
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 97ab4cdbb..b6b274d91 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -37,6 +37,7 @@ const struct dhcp_optflag dhcp_optflags[] = {
         { OPTION_U8                               , 0x17 }, /* DHCP_IP_TTL        */
         { OPTION_U16                              , 0x1a }, /* DHCP_MTU           */
         { OPTION_IP                   | OPTION_REQ, 0x1c }, /* DHCP_BROADCAST     */
+        { OPTION_IP_PAIR | OPTION_LIST            , 0x21 }, /* DHCP_ROUTES        */
         { OPTION_STRING                           , 0x28 }, /* DHCP_NIS_DOMAIN    */
         { OPTION_IP | OPTION_LIST                 , 0x29 }, /* DHCP_NIS_SERVER    */
         { OPTION_IP | OPTION_LIST     | OPTION_REQ, 0x2a }, /* DHCP_NTP_SERVER    */
@@ -54,6 +55,7 @@ const struct dhcp_optflag dhcp_optflags[] = {
         { OPTION_SIP_SERVERS                      , 0x78 }, /* DHCP_SIP_SERVERS   */
 #endif
         { OPTION_STATIC_ROUTES                    , 0x79 }, /* DHCP_STATIC_ROUTES */
+        { OPTION_STATIC_ROUTES                    , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
         { OPTION_STRING                           , 0xfc }, /* DHCP_WPAD          */
 
         /* Options below have no match in dhcp_option_strings[],
@@ -95,6 +97,7 @@ const char dhcp_option_strings[] ALIGN1 =
         "ipttl" "\0"       /* DHCP_IP_TTL         */
         "mtu" "\0"         /* DHCP_MTU            */
         "broadcast" "\0"   /* DHCP_BROADCAST      */
+        "routes" "\0"      /* DHCP_ROUTES         */
         "nisdomain" "\0"   /* DHCP_NIS_DOMAIN     */
         "nissrv" "\0"      /* DHCP_NIS_SERVER     */
         "ntpsrv" "\0"      /* DHCP_NTP_SERVER     */
@@ -114,6 +117,7 @@ const char dhcp_option_strings[] ALIGN1 =
 // doesn't work in udhcpd.conf since OPTION_STATIC_ROUTES
 // is not handled yet by "string->option" conversion code:
         "staticroutes" "\0"/* DHCP_STATIC_ROUTES  */
+        "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
         "wpad" "\0"        /* DHCP_WPAD           */
         ;
 
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index c5abf17d5..9020b9c96 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -123,6 +123,7 @@ enum {
 //#define DHCP_IP_TTL           0x17
 //#define DHCP_MTU              0x1a
 //#define DHCP_BROADCAST        0x1c
+//#define DHCP_ROUTES           0x21
 //#define DHCP_NIS_DOMAIN       0x28
 //#define DHCP_NIS_SERVER       0x29
 //#define DHCP_NTP_SERVER       0x2a
@@ -144,6 +145,7 @@ enum {
 //#define DHCP_DOMAIN_SEARCH    0x77 /* RFC 3397. set of ASCIZ string, DNS-style compressed */
 //#define DHCP_SIP_SERVERS      0x78 /* RFC 3361. flag byte, then: 0: domain names, 1: IP addrs */
 //#define DHCP_STATIC_ROUTES    0x79 /* RFC 3442. (mask,ip,router) tuples */
+//#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */
 //#define DHCP_WPAD             0xfc /* MSIE's Web Proxy Autodiscovery Protocol */
 #define DHCP_END                0xff
 
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index de1b79844..27d6ad1a8 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -89,6 +89,7 @@ static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_
 
         /* option points to OPT_DATA, need to go back and get OPT_LEN */
         len = option[OPT_LEN - OPT_DATA];
+
         type = optflag->flags & OPTION_TYPE_MASK;
         optlen = dhcp_option_lengths[type];
         upper_length = len_of_option_as_string[type] * ((unsigned)len / (unsigned)optlen);
@@ -97,17 +98,16 @@ static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_
         dest += sprintf(ret, "%s=", opt_name);
 
         while (len >= optlen) {
+                unsigned ip_ofs = 0;
+
                 switch (type) {
                 case OPTION_IP_PAIR:
                         dest += sprint_nip(dest, "", option);
                         *dest++ = '/';
-                        option += 4;
-                        optlen = 4;
+                        ip_ofs = 4;
+                        /* fall through */
                 case OPTION_IP:
-                        dest += sprint_nip(dest, "", option);
-// TODO: it can be a list only if (optflag->flags & OPTION_LIST).
-// Should we bail out/warn if we see multi-ip option which is
-// not allowed to be such? For example, DHCP_BROADCAST...
+                        dest += sprint_nip(dest, "", option + ip_ofs);
                         break;
 //              case OPTION_BOOLEAN:
 //                      dest += sprintf(dest, *option ? "yes" : "no");
@@ -218,7 +218,10 @@ static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_
                 } /* switch */
                 option += optlen;
                 len -= optlen;
-                if (len <= 0)
+// TODO: it can be a list only if (optflag->flags & OPTION_LIST).
+// Should we bail out/warn if we see multi-ip option which is
+// not allowed to be such (for example, DHCP_BROADCAST)? -
+                if (len <= 0 /* || !(optflag->flags & OPTION_LIST) */)
                         break;
                 *dest++ = ' ';
                 *dest = '\0';
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index a2c7f359d..759a4ba03 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -11,9 +11,12 @@
  */
 #include "common.h"
 
-#define SERVER_PORT      67
-#define SELECT_TIMEOUT    5 /* select timeout in sec. */
-#define MAX_LIFETIME   2*60 /* lifetime of an xid entry in sec. */
+#define SERVER_PORT    67
+
+/* lifetime of an xid entry in sec. */
+#define MAX_LIFETIME   2*60
+/* select timeout in sec. */
+#define SELECT_TIMEOUT (MAX_LIFETIME / 8)
 
 /* This list holds information about clients. The xid_* functions manipulate this list. */
 struct xid_item {
@@ -67,11 +70,11 @@ static struct xid_item *xid_find(uint32_t xid)
         struct xid_item *item = dhcprelay_xid_list.next;
         while (item != NULL) {
                 if (item->xid == xid) {
-                        return item;
+                        break;
                 }
                 item = item->next;
         }
-        return NULL;
+        return item;
 }
 
 static void xid_del(uint32_t xid)
@@ -110,62 +113,72 @@ static int get_dhcp_packet_type(struct dhcp_packet *p)
 }
 
 /**
- * get_client_devices - parses the devices list
- * dev_list - comma separated list of devices
+ * make_iface_list - parses client/server interface names
  * returns array
  */
-static char **get_client_devices(char *dev_list, int *client_number)
+static char **make_iface_list(char **client_and_server_ifaces, int *client_number)
 {
-        char *s, **client_dev;
+        char *s, **iface_list;
         int i, cn;
 
-        /* copy list */
-        dev_list = xstrdup(dev_list);
-
-        /* get number of items, replace ',' with NULs */
-        s = dev_list;
-        cn = 1;
+        /* get number of items */
+        cn = 2; /* 1 server iface + at least 1 client one */
+        s = client_and_server_ifaces[0]; /* list of client ifaces */
         while (*s) {
-                if (*s == ',') {
-                        *s = '\0';
+                if (*s == ',')
                         cn++;
-                }
                 s++;
         }
         *client_number = cn;
 
         /* create vector of pointers */
-        client_dev = xzalloc(cn * sizeof(*client_dev));
-        client_dev[0] = dev_list;
+        iface_list = xzalloc(cn * sizeof(iface_list[0]));
+
+        iface_list[0] = client_and_server_ifaces[1]; /* server iface */
+
         i = 1;
-        while (i != cn) {
-                client_dev[i] = client_dev[i - 1] + strlen(client_dev[i - 1]) + 1;
-                i++;
+        s = xstrdup(client_and_server_ifaces[0]); /* list of client ifaces */
+        goto store_client_iface_name;
+
+        while (i < cn) {
+                if (*s++ == ',') {
+                        s[-1] = '\0';
+ store_client_iface_name:
+                        iface_list[i++] = s;
+                }
         }
-        return client_dev;
+
+        return iface_list;
 }
 
 /* Creates listen sockets (in fds) bound to client and server ifaces,
  * and returns numerically max fd.
  */
-static int init_sockets(char **client_ifaces, int num_clients,
-                        char *server_iface, int *fds)
+static int init_sockets(char **iface_list, int num_clients, int *fds)
 {
         int i, n;
 
-        /* talk to real server on bootps */
-        fds[0] = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT, server_iface);
-        n = fds[0];
-
-        for (i = 1; i < num_clients; i++) {
-                /* listen for clients on bootps */
-                fds[i] = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT, client_ifaces[i-1]);
-                if (fds[i] > n)
+        n = 0;
+        for (i = 0; i < num_clients; i++) {
+                fds[i] = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT, iface_list[i]);
+                if (n < fds[i])
                         n = fds[i];
         }
         return n;
 }
 
+static int sendto_ip4(int sock, const void *msg, int msg_len, struct sockaddr_in *to)
+{
+        int err;
+
+        errno = 0;
+        err = sendto(sock, msg, msg_len, 0, (struct sockaddr*) to, sizeof(*to));
+        err -= msg_len;
+        if (err)
+                bb_perror_msg("sendto");
+        return err;
+}
+
 /**
  * pass_to_server() - forwards dhcp packets from client to server
  * p - packet to send
@@ -174,7 +187,7 @@ static int init_sockets(char **client_ifaces, int num_clients,
 static void pass_to_server(struct dhcp_packet *p, int packet_len, int client, int *fds,
                         struct sockaddr_in *client_addr, struct sockaddr_in *server_addr)
 {
-        int res, type;
+        int type;
 
         /* check packet_type */
         type = get_dhcp_packet_type(p);
@@ -188,13 +201,12 @@ static void pass_to_server(struct dhcp_packet *p, int packet_len, int client, in
         /* create new xid entry */
         xid_add(p->xid, client_addr, client);
 
-        /* forward request to LAN (server) */
-        errno = 0;
-        res = sendto(fds[0], p, packet_len, 0, (struct sockaddr*)server_addr,
-                        sizeof(struct sockaddr_in));
-        if (res != packet_len) {
-                bb_perror_msg("sendto");
-        }
+        /* forward request to server */
+        /* note that we send from fds[0] which is bound to SERVER_PORT (67).
+         * IOW: we send _from_ SERVER_PORT! Although this may look strange,
+         * RFC 1542 not only allows, but prescribes this for BOOTP relays.
+         */
+        sendto_ip4(fds[0], p, packet_len, server_addr);
 }
 
 /**
@@ -203,7 +215,7 @@ static void pass_to_server(struct dhcp_packet *p, int packet_len, int client, in
  */
 static void pass_to_client(struct dhcp_packet *p, int packet_len, int *fds)
 {
-        int res, type;
+        int type;
         struct xid_item *item;
 
         /* check xid */
@@ -218,14 +230,12 @@ static void pass_to_client(struct dhcp_packet *p, int packet_len, int *fds)
                 return;
         }
 
+//TODO: also do it if (p->flags & htons(BROADCAST_FLAG)) is set!
         if (item->ip.sin_addr.s_addr == htonl(INADDR_ANY))
                 item->ip.sin_addr.s_addr = htonl(INADDR_BROADCAST);
-        errno = 0;
-        res = sendto(fds[item->client], p, packet_len, 0, (struct sockaddr*) &(item->ip),
-                        sizeof(item->ip));
-        if (res != packet_len) {
-                bb_perror_msg("sendto");
-                return;
+
+        if (sendto_ip4(fds[item->client], p, packet_len, &item->ip) != 0) {
+                return; /* send error occurred */
         }
 
         /* remove xid entry */
@@ -235,36 +245,30 @@ static void pass_to_client(struct dhcp_packet *p, int packet_len, int *fds)
 int dhcprelay_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dhcprelay_main(int argc, char **argv)
 {
-        struct dhcp_packet dhcp_msg;
         struct sockaddr_in server_addr;
-        struct sockaddr_in client_addr;
-        fd_set rfds;
-        char **client_ifaces;
+        char **iface_list;
         int *fds;
         int num_sockets, max_socket;
         uint32_t our_nip;
 
         server_addr.sin_family = AF_INET;
+        server_addr.sin_addr.s_addr = htonl(INADDR_BROADCAST);
         server_addr.sin_port = htons(SERVER_PORT);
 
-        /* dhcprelay client_iface1,client_iface2,... server_iface [server_IP] */
+        /* dhcprelay CLIENT_IFACE1[,CLIENT_IFACE2...] SERVER_IFACE [SERVER_IP] */
         if (argc == 4) {
                 if (!inet_aton(argv[3], &server_addr.sin_addr))
                         bb_perror_msg_and_die("bad server IP");
-        } else if (argc == 3) {
-                server_addr.sin_addr.s_addr = htonl(INADDR_BROADCAST);
-        } else {
+        } else if (argc != 3) {
                 bb_show_usage();
         }
 
-        /* Produce list of client ifaces */
-        client_ifaces = get_client_devices(argv[1], &num_sockets);
+        iface_list = make_iface_list(argv + 1, &num_sockets);
 
-        num_sockets++; /* for server socket at fds[0] */
         fds = xmalloc(num_sockets * sizeof(fds[0]));
 
         /* Create sockets and bind one to every iface */
-        max_socket = init_sockets(client_ifaces, num_sockets, argv[2], fds);
+        max_socket = init_sockets(iface_list, num_sockets, fds);
 
         /* Get our IP on server_iface */
         if (udhcp_read_interface(argv[2], NULL, &our_nip, NULL))
@@ -272,11 +276,10 @@ int dhcprelay_main(int argc, char **argv)
 
         /* Main loop */
         while (1) {
-//reinit stuff from time to time? go back to get_client_devices
-//every N minutes?
+// reinit stuff from time to time? go back to make_iface_list
+// every N minutes?
+                fd_set rfds;
                 struct timeval tv;
-                size_t packlen;
-                socklen_t addr_size;
                 int i;
 
                 FD_ZERO(&rfds);
@@ -285,6 +288,9 @@ int dhcprelay_main(int argc, char **argv)
                 tv.tv_sec = SELECT_TIMEOUT;
                 tv.tv_usec = 0;
                 if (select(max_socket + 1, &rfds, NULL, NULL, &tv) > 0) {
+                        int packlen;
+                        struct dhcp_packet dhcp_msg;
+
                         /* server */
                         if (FD_ISSET(fds[0], &rfds)) {
                                 packlen = udhcp_recv_kernel_packet(&dhcp_msg, fds[0]);
@@ -292,24 +298,65 @@ int dhcprelay_main(int argc, char **argv)
                                         pass_to_client(&dhcp_msg, packlen, fds);
                                 }
                         }
+
                         /* clients */
                         for (i = 1; i < num_sockets; i++) {
+                                struct sockaddr_in client_addr;
+                                socklen_t addr_size;
+
                                 if (!FD_ISSET(fds[i], &rfds))
                                         continue;
-                                addr_size = sizeof(struct sockaddr_in);
+
+                                addr_size = sizeof(client_addr);
                                 packlen = recvfrom(fds[i], &dhcp_msg, sizeof(dhcp_msg), 0,
                                                 (struct sockaddr *)(&client_addr), &addr_size);
                                 if (packlen <= 0)
                                         continue;
 
                                 /* Get our IP on corresponding client_iface */
-//why? what if server can't route such IP?
-                                if (udhcp_read_interface(client_ifaces[i-1], NULL, &dhcp_msg.gateway_nip, NULL)) {
-                                        /* Fall back to our server_iface's IP */
-//this makes more sense!
+// RFC 1542
+// 4.1 General BOOTP Processing for Relay Agents
+// 4.1.1 BOOTREQUEST Messages
+//   If the relay agent does decide to relay the request, it MUST examine
+//   the 'giaddr' ("gateway" IP address) field.  If this field is zero,
+//   the relay agent MUST fill this field with the IP address of the
+//   interface on which the request was received.  If the interface has
+//   more than one IP address logically associated with it, the relay
+//   agent SHOULD choose one IP address associated with that interface and
+//   use it consistently for all BOOTP messages it relays.  If the
+//   'giaddr' field contains some non-zero value, the 'giaddr' field MUST
+//   NOT be modified.  The relay agent MUST NOT, under any circumstances,
+//   fill the 'giaddr' field with a broadcast address as is suggested in
+//   [1] (Section 8, sixth paragraph).
+
+// but why? what if server can't route such IP? Client ifaces may be, say, NATed!
+
+// 4.1.2 BOOTREPLY Messages
+//   BOOTP relay agents relay BOOTREPLY messages only to BOOTP clients.
+//   It is the responsibility of BOOTP servers to send BOOTREPLY messages
+//   directly to the relay agent identified in the 'giaddr' field.
+// (yeah right, unless it is impossible... see comment above)
+//   Therefore, a relay agent may assume that all BOOTREPLY messages it
+//   receives are intended for BOOTP clients on its directly-connected
+//   networks.
+//
+//   When a relay agent receives a BOOTREPLY message, it should examine
+//   the BOOTP 'giaddr', 'yiaddr', 'chaddr', 'htype', and 'hlen' fields.
+//   These fields should provide adequate information for the relay agent
+//   to deliver the BOOTREPLY message to the client.
+//
+//   The 'giaddr' field can be used to identify the logical interface from
+//   which the reply must be sent (i.e., the host or router interface
+//   connected to the same network as the BOOTP client).  If the content
+//   of the 'giaddr' field does not match one of the relay agent's
+//   directly-connected logical interfaces, the BOOTREPLY messsage MUST be
+//   silently discarded.
+                                if (udhcp_read_interface(iface_list[i], NULL, &dhcp_msg.gateway_nip, NULL)) {
+                                        /* Fall back to our IP on server iface */
+// this makes more sense!
                                         dhcp_msg.gateway_nip = our_nip;
                                 }
-//maybe set dhcp_msg.flags |= BROADCAST_FLAG too?
+// maybe dhcp_msg.hops++? drop packets with too many hops (RFC 1542 says 4 or 16)?
                                 pass_to_server(&dhcp_msg, packlen, i, fds, &client_addr, &server_addr);
                         }
                 }
diff --git a/procps/free.c b/procps/free.c
index be65f46f1..efbac5ba6 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -11,47 +11,58 @@
 
 #include "libbb.h"
 
+struct globals {
+        unsigned mem_unit;
+#if ENABLE_DESKTOP
+        unsigned unit_steps;
+# define G_unit_steps G.unit_steps
+#else
+# define G_unit_steps 10
+#endif
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define INIT_G() do { } while (0)
+
+
+static unsigned long long scale(unsigned long d)
+{
+        return ((unsigned long long)d * G.mem_unit) >> G_unit_steps;
+}
+
+
 int free_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
 {
         struct sysinfo info;
-        unsigned mem_unit;
+
+        INIT_G();
 
 #if ENABLE_DESKTOP
-        if (argv[1] && argv[1][0] == '-')
-                bb_show_usage();
+        G.unit_steps = 10;
+        if (argv[1] && argv[1][0] == '-') {
+                switch (argv[1][1]) {
+                case 'b':
+                        G.unit_steps = 0;
+                        break;
+                case 'k': /* 2^10 */
+                        /* G.unit_steps = 10; - already is */
+                        break;
+                case 'm': /* 2^(2*10) */
+                        G.unit_steps = 20;
+                        break;
+                case 'g': /* 2^(3*10) */
+                        G.unit_steps = 30;
+                        break;
+                default:
+                        bb_show_usage();
+                }
+        }
 #endif
 
         sysinfo(&info);
 
         /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
-        mem_unit = 1;
-        if (info.mem_unit != 0) {
-                mem_unit = info.mem_unit;
-        }
-
-        /* Convert values to kbytes */
-        if (mem_unit == 1) {
-                info.totalram >>= 10;
-                info.freeram >>= 10;
-#if BB_MMU
-                info.totalswap >>= 10;
-                info.freeswap >>= 10;
-#endif
-                info.sharedram >>= 10;
-                info.bufferram >>= 10;
-        } else {
-                mem_unit >>= 10;
-                /* TODO:  Make all this stuff not overflow when mem >= 4 Tb */
-                info.totalram *= mem_unit;
-                info.freeram *= mem_unit;
-#if BB_MMU
-                info.totalswap *= mem_unit;
-                info.freeswap *= mem_unit;
-#endif
-                info.sharedram *= mem_unit;
-                info.bufferram *= mem_unit;
-        }
+        G.mem_unit = (info.mem_unit ? info.mem_unit : 1);
 
         printf("     %13s%13s%13s%13s%13s\n",
                 "total",
@@ -63,30 +74,33 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
                  * /proc/meminfo instead and get "Cached: NNN kB" from there.
                  */
         );
-#define FIELDS_5 "%13lu%13lu%13lu%13lu%13lu\n"
-#define FIELDS_3 (FIELDS_5 + 2*5)
-#define FIELDS_2 (FIELDS_5 + 3*5)
+
+#define FIELDS_5 "%13llu%13llu%13llu%13llu%13llu\n"
+#define FIELDS_3 (FIELDS_5 + 2*6)
+#define FIELDS_2 (FIELDS_5 + 3*6)
+
         printf("Mem: ");
         printf(FIELDS_5,
-                info.totalram,
-                info.totalram - info.freeram,
-                info.freeram,
-                info.sharedram, info.bufferram
+                scale(info.totalram),
+                scale(info.totalram - info.freeram),
+                scale(info.freeram),
+                scale(info.sharedram),
+                scale(info.bufferram)
         );
         /* Show alternate, more meaningful busy/free numbers by counting
          * buffer cache as free memory (make it "-/+ buffers/cache"
          * if/when we add support for "cached" column): */
         printf("-/+ buffers:      ");
         printf(FIELDS_2,
-                info.totalram - info.freeram - info.bufferram,
-                info.freeram + info.bufferram
+                scale(info.totalram - info.freeram - info.bufferram),
+                scale(info.freeram + info.bufferram)
         );
 #if BB_MMU
         printf("Swap:");
         printf(FIELDS_3,
-                info.totalswap,
-                info.totalswap - info.freeswap,
-                info.freeswap
+                scale(info.totalswap),
+                scale(info.totalswap - info.freeswap),
+                scale(info.freeswap)
         );
 #endif
         return EXIT_SUCCESS;
diff --git a/runit/Kbuild.src b/runit/Kbuild.src
index d38bad20f..0fce95507 100644
--- a/runit/Kbuild.src
+++ b/runit/Kbuild.src
@@ -8,10 +8,10 @@ lib-y:=
 
 INSERT
 
-lib-$(CONFIG_RUNSV) += runsv.o runit_lib.o
-lib-$(CONFIG_RUNSVDIR) += runsvdir.o runit_lib.o
-lib-$(CONFIG_SV) += sv.o runit_lib.o
-lib-$(CONFIG_SVLOGD) += svlogd.o runit_lib.o
+lib-$(CONFIG_RUNSV) += runsv.o
+lib-$(CONFIG_RUNSVDIR) += runsvdir.o
+lib-$(CONFIG_SV) += sv.o
+lib-$(CONFIG_SVLOGD) += svlogd.o
 lib-$(CONFIG_CHPST) += chpst.o
 
 lib-$(CONFIG_ENVDIR) += chpst.o
diff --git a/runit/runit_lib.c b/runit/runit_lib.c
deleted file mode 100644
index 8182a909a..000000000
--- a/runit/runit_lib.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
-Copyright (c) 2001-2006, Gerrit Pape
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-   3. The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
-/* Collected into one file from runit's many tiny files */
-/* TODO: review, eliminate unneeded stuff, move good stuff to libbb */
-
-#include <sys/poll.h>
-#include <sys/file.h>
-#include "libbb.h"
-#include "runit_lib.h"
-
-#ifdef UNUSED
-unsigned byte_chr(char *s,unsigned n,int c)
-{
-        char ch;
-        char *t;
-
-        ch = c;
-        t = s;
-        for (;;) {
-                if (!n) break;
-                if (*t == ch) break;
-                ++t;
-                --n;
-        }
-        return t - s;
-}
-
-static /* as it isn't used anywhere else */
-void tai_pack(char *s, const struct tai *t)
-{
-        uint64_t x;
-
-        x = t->x;
-        s[7] = x & 255; x >>= 8;
-        s[6] = x & 255; x >>= 8;
-        s[5] = x & 255; x >>= 8;
-        s[4] = x & 255; x >>= 8;
-        s[3] = x & 255; x >>= 8;
-        s[2] = x & 255; x >>= 8;
-        s[1] = x & 255; x >>= 8;
-        s[0] = x;
-}
-
-void tai_unpack(const char *s,struct tai *t)
-{
-        uint64_t x;
-
-        x = (unsigned char) s[0];
-        x <<= 8; x += (unsigned char) s[1];
-        x <<= 8; x += (unsigned char) s[2];
-        x <<= 8; x += (unsigned char) s[3];
-        x <<= 8; x += (unsigned char) s[4];
-        x <<= 8; x += (unsigned char) s[5];
-        x <<= 8; x += (unsigned char) s[6];
-        x <<= 8; x += (unsigned char) s[7];
-        t->x = x;
-}
-
-
-void taia_add(struct taia *t,const struct taia *u,const struct taia *v)
-{
-        t->sec.x = u->sec.x + v->sec.x;
-        t->nano = u->nano + v->nano;
-        t->atto = u->atto + v->atto;
-        if (t->atto > 999999999UL) {
-                t->atto -= 1000000000UL;
-                ++t->nano;
-        }
-        if (t->nano > 999999999UL) {
-                t->nano -= 1000000000UL;
-                ++t->sec.x;
-        }
-}
-
-int taia_less(const struct taia *t, const struct taia *u)
-{
-        if (t->sec.x < u->sec.x) return 1;
-        if (t->sec.x > u->sec.x) return 0;
-        if (t->nano < u->nano) return 1;
-        if (t->nano > u->nano) return 0;
-        return t->atto < u->atto;
-}
-
-void taia_now(struct taia *t)
-{
-        struct timeval now;
-        gettimeofday(&now, NULL);
-        tai_unix(&t->sec, now.tv_sec);
-        t->nano = 1000 * now.tv_usec + 500;
-        t->atto = 0;
-}
-
-/* UNUSED
-void taia_pack(char *s, const struct taia *t)
-{
-        unsigned long x;
-
-        tai_pack(s, &t->sec);
-        s += 8;
-
-        x = t->atto;
-        s[7] = x & 255; x >>= 8;
-        s[6] = x & 255; x >>= 8;
-        s[5] = x & 255; x >>= 8;
-        s[4] = x;
-        x = t->nano;
-        s[3] = x & 255; x >>= 8;
-        s[2] = x & 255; x >>= 8;
-        s[1] = x & 255; x >>= 8;
-        s[0] = x;
-}
-*/
-
-void taia_sub(struct taia *t, const struct taia *u, const struct taia *v)
-{
-        unsigned long unano = u->nano;
-        unsigned long uatto = u->atto;
-
-        t->sec.x = u->sec.x - v->sec.x;
-        t->nano = unano - v->nano;
-        t->atto = uatto - v->atto;
-        if (t->atto > uatto) {
-                t->atto += 1000000000UL;
-                --t->nano;
-        }
-        if (t->nano > unano) {
-                t->nano += 1000000000UL;
-                --t->sec.x;
-        }
-}
-
-/* XXX: breaks tai encapsulation */
-void taia_uint(struct taia *t, unsigned s)
-{
-        t->sec.x = s;
-        t->nano = 0;
-        t->atto = 0;
-}
-
-static
-uint64_t taia2millisec(const struct taia *t)
-{
-        return (t->sec.x * 1000) + (t->nano / 1000000);
-}
-
-void iopause(iopause_fd *x, unsigned len, struct taia *deadline, struct taia *stamp)
-{
-        int millisecs;
-        int i;
-
-        if (taia_less(deadline, stamp))
-                millisecs = 0;
-        else {
-                uint64_t m;
-                struct taia t;
-                t = *stamp;
-                taia_sub(&t, deadline, &t);
-                millisecs = m = taia2millisec(&t);
-                if (m > 1000) millisecs = 1000;
-                millisecs += 20;
-        }
-
-        for (i = 0; i < len; ++i)
-                x[i].revents = 0;
-
-        poll(x, len, millisecs);
-        /* XXX: some kernels apparently need x[0] even if len is 0 */
-        /* XXX: how to handle EAGAIN? are kernels really this dumb? */
-        /* XXX: how to handle EINVAL? when exactly can this happen? */
-}
-#endif
-
-int lock_ex(int fd)
-{
-        return flock(fd, LOCK_EX);
-}
-
-int lock_exnb(int fd)
-{
-        return flock(fd, LOCK_EX | LOCK_NB);
-}
-
-#ifdef UNUSED
-int open_append(const char *fn)
-{
-        return open(fn, O_WRONLY | O_NDELAY | O_APPEND | O_CREAT, 0600);
-}
-
-int open_trunc(const char *fn)
-{
-        return open(fn, O_WRONLY | O_NDELAY | O_TRUNC | O_CREAT, 0644);
-}
-#endif
-
-int open_read(const char *fn)
-{
-        return open(fn, O_RDONLY|O_NDELAY);
-}
-
-int open_write(const char *fn)
-{
-        return open(fn, O_WRONLY|O_NDELAY);
-}
-
-unsigned FAST_FUNC pmatch(const char *p, const char *s, unsigned len)
-{
-        for (;;) {
-                char c = *p++;
-                if (!c) return !len;
-                switch (c) {
-                case '*':
-                        c = *p;
-                        if (!c) return 1;
-                        for (;;) {
-                                if (!len) return 0;
-                                if (*s == c) break;
-                                ++s;
-                                --len;
-                        }
-                        continue;
-                case '+':
-                        c = *p++;
-                        if (c != *s) return 0;
-                        for (;;) {
-                                if (!len) return 1;
-                                if (*s != c) break;
-                                ++s;
-                                --len;
-                        }
-                        continue;
-                        /*
-                case '?':
-                        if (*p == '?') {
-                                if (*s != '?') return 0;
-                                ++p;
-                        }
-                        ++s; --len;
-                        continue;
-                        */
-                default:
-                        if (!len) return 0;
-                        if (*s != c) return 0;
-                        ++s;
-                        --len;
-                        continue;
-                }
-        }
-        return 0;
-}
diff --git a/runit/runit_lib.h b/runit/runit_lib.h
index d8304aca6..c36ea4ca5 100644
--- a/runit/runit_lib.h
+++ b/runit/runit_lib.h
@@ -27,59 +27,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-//extern unsigned byte_chr(char *s,unsigned n,int c);
-//
-//struct tai {
-//      uint64_t x;
-//};
-//
-//#define tai_unix(t,u) ((void) ((t)->x = 0x400000000000000aULL + (uint64_t) (u)))
-//
-//#define TAI_PACK 8
-//extern void tai_unpack(const char *,struct tai *);
-//
-//extern void tai_uint(struct tai *,unsigned);
-//
-//struct taia {
-//      struct tai sec;
-//      unsigned long nano; /* 0...999999999 */
-//      unsigned long atto; /* 0...999999999 */
-//};
-//
-//extern void taia_now(struct taia *);
-//
-//extern void taia_add(struct taia *,const struct taia *,const struct taia *);
-//extern void taia_addsec(struct taia *,const struct taia *,int);
-//extern void taia_sub(struct taia *,const struct taia *,const struct taia *);
-//extern void taia_half(struct taia *,const struct taia *);
-//extern int taia_less(const struct taia *,const struct taia *);
-//
-//#define TAIA_PACK 16
-//extern void taia_pack(char *,const struct taia *);
-//
-//extern void taia_uint(struct taia *,unsigned);
-//
-//typedef struct pollfd iopause_fd;
-//#define IOPAUSE_READ POLLIN
-//#define IOPAUSE_WRITE POLLOUT
-//
-//extern void iopause(iopause_fd *,unsigned,struct taia *,struct taia *);
-
-extern int lock_ex(int);
-//extern int lock_un(int);
-extern int lock_exnb(int);
-
-extern int open_read(const char *);
-extern int open_write(const char *);
-//extern int open_excl(const char *);
-//extern int open_append(const char *);
-//extern int open_trunc(const char *);
-
-extern unsigned FAST_FUNC pmatch(const char *, const char *, unsigned);
-
-//#define str_diff(s,t) strcmp((s), (t))
-#define str_equal(s,t) (!strcmp((s), (t)))
-
 /*
  * runsv / supervise / sv stuff
  */
diff --git a/runit/runsv.c b/runit/runsv.c
index 6bb6ec886..ebb031837 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -524,7 +524,7 @@ int runsv_main(int argc UNUSED_PARAM, char **argv)
         }
         svd[0].fdlock = xopen3("log/supervise/lock"+4,
                         O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600);
-        if (lock_exnb(svd[0].fdlock) == -1)
+        if (flock(svd[0].fdlock, LOCK_EX | LOCK_NB) == -1)
                 fatal_cannot("lock supervise/lock");
         close_on_exec_on(svd[0].fdlock);
         if (haslog) {
@@ -548,7 +548,7 @@ int runsv_main(int argc UNUSED_PARAM, char **argv)
                 }
                 svd[1].fdlock = xopen3("log/supervise/lock",
                                 O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600);
-                if (lock_ex(svd[1].fdlock) == -1)
+                if (flock(svd[1].fdlock, LOCK_EX) == -1)
                         fatal_cannot("lock log/supervise/lock");
                 close_on_exec_on(svd[1].fdlock);
         }
@@ -618,7 +618,7 @@ int runsv_main(int argc UNUSED_PARAM, char **argv)
                                 pidchanged = 1;
                                 svd[0].ctrl &= ~C_TERM;
                                 if (svd[0].state != S_FINISH) {
-                                        fd = open_read("finish");
+                                        fd = open("finish", O_RDONLY|O_NDELAY);
                                         if (fd != -1) {
                                                 close(fd);
                                                 svd[0].state = S_FINISH;
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 71fde757e..e77eeff04 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -276,7 +276,7 @@ int runsvdir_main(int argc UNUSED_PARAM, char **argv)
         }
  run:
 #endif
-        curdir = open_read(".");
+        curdir = open(".", O_RDONLY|O_NDELAY);
         if (curdir == -1)
                 fatal2_cannot("open current directory", "");
         close_on_exec_on(curdir);
diff --git a/runit/sv.c b/runit/sv.c
index 3f76a2d47..c420a91a6 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -176,6 +176,9 @@ struct globals {
 #define INIT_G() do { } while (0)
 
 
+#define str_equal(s,t) (!strcmp((s), (t)))
+
+
 static void fatal_cannot(const char *m1) NORETURN;
 static void fatal_cannot(const char *m1)
 {
@@ -221,7 +224,7 @@ static int svstatus_get(void)
 {
         int fd, r;
 
-        fd = open_write("supervise/ok");
+        fd = open("supervise/ok", O_WRONLY|O_NDELAY);
         if (fd == -1) {
                 if (errno == ENODEV) {
                         *acts == 'x' ? ok("runsv not running")
@@ -232,7 +235,7 @@ static int svstatus_get(void)
                 return -1;
         }
         close(fd);
-        fd = open_read("supervise/status");
+        fd = open("supervise/status", O_RDONLY|O_NDELAY);
         if (fd == -1) {
                 warn("can't open supervise/status");
                 return -1;
@@ -397,7 +400,7 @@ static int control(const char *a)
         if (svstatus.want == *a)
                 return 0;
 */
-        fd = open_write("supervise/control");
+        fd = open("supervise/control", O_WRONLY|O_NDELAY);
         if (fd == -1) {
                 if (errno != ENODEV)
                         warn("can't open supervise/control");
@@ -446,7 +449,7 @@ int sv_main(int argc UNUSED_PARAM, char **argv)
 
         tnow = time(NULL) + 0x400000000000000aULL;
         tstart = tnow;
-        curdir = open_read(".");
+        curdir = open(".", O_RDONLY|O_NDELAY);
         if (curdir == -1)
                 fatal_cannot("open current directory");
 
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 1f0a77cc2..052806c25 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -261,6 +261,52 @@ static char* wstrdup(const char *str)
         return s;
 }
 
+static unsigned pmatch(const char *p, const char *s, unsigned len)
+{
+        for (;;) {
+                char c = *p++;
+                if (!c) return !len;
+                switch (c) {
+                case '*':
+                        c = *p;
+                        if (!c) return 1;
+                        for (;;) {
+                                if (!len) return 0;
+                                if (*s == c) break;
+                                ++s;
+                                --len;
+                        }
+                        continue;
+                case '+':
+                        c = *p++;
+                        if (c != *s) return 0;
+                        for (;;) {
+                                if (!len) return 1;
+                                if (*s != c) break;
+                                ++s;
+                                --len;
+                        }
+                        continue;
+                        /*
+                case '?':
+                        if (*p == '?') {
+                                if (*s != '?') return 0;
+                                ++p;
+                        }
+                        ++s; --len;
+                        continue;
+                        */
+                default:
+                        if (!len) return 0;
+                        if (*s != c) return 0;
+                        ++s;
+                        --len;
+                        continue;
+                }
+        }
+        return 0;
+}
+
 /*** ex fmt_ptime.[ch] ***/
 
 /* NUL terminated */
@@ -342,7 +388,7 @@ static void processorstart(struct logdir *ld)
                 ld->fnsave[26] = 't'; /* <- that's why we need sv_ch! */
                 fd = xopen(ld->fnsave, O_WRONLY|O_NDELAY|O_TRUNC|O_CREAT);
                 xmove_fd(fd, 1);
-                fd = open_read("state");
+                fd = open("state", O_RDONLY|O_NDELAY);
                 if (fd == -1) {
                         if (errno != ENOENT)
                                 bb_perror_msg_and_die(FATAL"can't %s processor %s", "open state for", ld->name);
@@ -626,7 +672,7 @@ static NOINLINE unsigned logdir_open(struct logdir *ld, const char *fn)
         }
         ld->fdlock = open("lock", O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600);
         if ((ld->fdlock == -1)
-         || (lock_exnb(ld->fdlock) == -1)
+         || (flock(ld->fdlock, LOCK_EX | LOCK_NB) == -1)
         ) {
                 logdir_close(ld);
                 warn2("can't lock directory", (char*)fn);
diff --git a/shell/ash.c b/shell/ash.c
index f1f044cbf..45ec13097 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5766,25 +5766,17 @@ redirectsafe(union node *redir, int flags)
 static arith_t
 ash_arith(const char *s)
 {
-        arith_eval_hooks_t math_hooks;
+        arith_state_t math_state;
         arith_t result;
-        int errcode = 0;
 
-        math_hooks.lookupvar = lookupvar;
-        math_hooks.setvar    = setvar2;
-        //math_hooks.endofname = endofname;
+        math_state.lookupvar = lookupvar;
+        math_state.setvar    = setvar2;
+        //math_state.endofname = endofname;
 
         INT_OFF;
-        result = arith(s, &errcode, &math_hooks);
-        if (errcode < 0) {
-                if (errcode == -3)
-                        ash_msg_and_raise_error("exponent less than 0");
-                if (errcode == -2)
-                        ash_msg_and_raise_error("divide by zero");
-                if (errcode == -5)
-                        ash_msg_and_raise_error("expression recursion loop detected");
-                raise_error_syntax(s);
-        }
+        result = arith(&math_state, s);
+        if (math_state.errmsg)
+                ash_msg_and_raise_error(math_state.errmsg);
         INT_ON;
 
         return result;
@@ -5848,7 +5840,7 @@ cvtnum(arith_t num)
         int len;
 
         expdest = makestrspace(32, expdest);
-        len = fmtstr(expdest, 32, arith_t_fmt, num);
+        len = fmtstr(expdest, 32, ARITH_FMT, num);
         STADJUST(len, expdest);
         return len;
 }
@@ -8624,7 +8616,7 @@ static int evalstring(char *s, int mask);
 
 /* Called to execute a trap.
  * Single callsite - at the end of evaltree().
- * If we return non-zero, exaltree raises EXEXIT exception.
+ * If we return non-zero, evaltree raises EXEXIT exception.
  *
  * Perhaps we should avoid entering new trap handlers
  * while we are executing a trap handler. [is it a TODO?]
@@ -8814,11 +8806,15 @@ evaltree(union node *n, int flags)
 
  out:
         exception_handler = savehandler;
+
  out1:
+        /* Order of checks below is important:
+         * signal handlers trigger before exit caused by "set -e".
+         */
+        if (pending_sig && dotrap())
+                goto exexit;
         if (checkexit & exitstatus)
                 evalskip |= SKIPEVAL;
-        else if (pending_sig && dotrap())
-                goto exexit;
 
         if (flags & EV_EXIT) {
  exexit:
@@ -9212,7 +9208,7 @@ poplocalvars(void)
         while ((lvp = localvars) != NULL) {
                 localvars = lvp->next;
                 vp = lvp->vp;
-                TRACE(("poplocalvar %s\n", vp ? vp->text : "-"));
+                TRACE(("poplocalvar %s\n", vp ? vp->var_text : "-"));
                 if (vp == NULL) {       /* $- saved */
                         memcpy(optlist, lvp->text, sizeof(optlist));
                         free((char*)lvp->text);
@@ -13383,7 +13379,7 @@ init(void)
         /* bash re-enables SIGHUP which is SIG_IGNed on entry.
          * Try: "trap '' HUP; bash; echo RET" and type "kill -HUP $$"
          */
-        signal(SIGHUP, SIG_DFL);
+        signal(SIGHUP, SIG_DFL);
 
         /* from var.c: */
         {
@@ -13598,10 +13594,12 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                 if (e == EXERROR)
                         exitstatus = 2;
                 s = state;
-                if (e == EXEXIT || s == 0 || iflag == 0 || shlvl)
+                if (e == EXEXIT || s == 0 || iflag == 0 || shlvl) {
                         exitshell();
-                if (e == EXINT)
+                }
+                if (e == EXINT) {
                         outcslow('\n', stderr);
+                }
 
                 popstackmark(&smark);
                 FORCE_INT_ON; /* enable interrupts */
@@ -13705,6 +13703,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                 _mcleanup();
         }
 #endif
+        TRACE(("End of main reached\n"));
         exitshell();
         /* NOTREACHED */
 }
diff --git a/shell/ash_test/ash-arith/arith.right b/shell/ash_test/ash-arith/arith.right
index 3ea7ce680..9b9ca8e2f 100644
--- a/shell/ash_test/ash-arith/arith.right
+++ b/shell/ash_test/ash-arith/arith.right
@@ -55,28 +55,28 @@ Format: 'expected actual'
 30 30
 20 20
 30 30
-./arith.tests: line 117: syntax error: 1 ? 20 : x+=2
+./arith.tests: line 117: arithmetic syntax error
 6 6
 6,5,3 6,5,3
 263 263
 255 255
 40 40
-./arith.tests: line 163: syntax error:  7 = 43 
+./arith.tests: line 163: arithmetic syntax error
 ./arith.tests: line 165: divide by zero
-./arith.tests: let: line 166: syntax error: jv += $iv
-./arith.tests: line 167: syntax error:  jv += $iv 
-./arith.tests: let: line 168: syntax error: rv = 7 + (43 * 6
+./arith.tests: let: line 166: arithmetic syntax error
+./arith.tests: line 167: arithmetic syntax error
+./arith.tests: let: line 168: arithmetic syntax error
 abc
 def
 ghi
-./arith.tests: line 191: syntax error:  ( 4 + A ) + 4 
+./arith.tests: line 191: arithmetic syntax error
 16 16
-./arith.tests: line 196: syntax error:  4 ? : 3 + 5 
-./arith.tests: line 197: syntax error:  1 ? 20 
-./arith.tests: line 198: syntax error:  4 ? 20 : 
+./arith.tests: line 196: arithmetic syntax error
+./arith.tests: line 197: malformed ?: operator
+./arith.tests: line 198: arithmetic syntax error
 9 9
-./arith.tests: line 205: syntax error:  0 && B=42 
-./arith.tests: line 208: syntax error:  1 || B=88 
+./arith.tests: line 205: arithmetic syntax error
+./arith.tests: line 208: arithmetic syntax error
 9 9
 9 9
 9 9
@@ -97,18 +97,18 @@ ghi
 3 3
 4 4
 4 4
-./arith.tests: line 257: syntax error:  7-- 
-./arith.tests: line 259: syntax error:  --x=7 
-./arith.tests: line 260: syntax error:  ++x=7 
-./arith.tests: line 262: syntax error:  x++=7 
-./arith.tests: line 263: syntax error:  x--=7 
+./arith.tests: line 257: arithmetic syntax error
+./arith.tests: line 259: arithmetic syntax error
+./arith.tests: line 260: arithmetic syntax error
+./arith.tests: line 262: arithmetic syntax error
+./arith.tests: line 263: arithmetic syntax error
 4 4
 7 7
 -7 -7
-./arith1.sub: line 2: syntax error:  4-- 
-./arith1.sub: line 3: syntax error:  4++ 
-./arith1.sub: line 4: syntax error:  4 -- 
-./arith1.sub: line 5: syntax error:  4 ++ 
+./arith1.sub: line 2: arithmetic syntax error
+./arith1.sub: line 3: arithmetic syntax error
+./arith1.sub: line 4: arithmetic syntax error
+./arith1.sub: line 5: arithmetic syntax error
 6 6
 3 3
 7 7
@@ -119,19 +119,19 @@ ghi
 2 2
 -2 -2
 1 1
-./arith1.sub: line 37: syntax error:  +++7 
-./arith2.sub: line 2: syntax error:  --7 
-./arith2.sub: line 3: syntax error:  ++7 
-./arith2.sub: line 4: syntax error:  -- 7 
-./arith2.sub: line 5: syntax error:  ++ 7 
+./arith1.sub: line 37: arithmetic syntax error
+./arith2.sub: line 2: arithmetic syntax error
+./arith2.sub: line 3: arithmetic syntax error
+./arith2.sub: line 4: arithmetic syntax error
+./arith2.sub: line 5: arithmetic syntax error
 5 5
 1 1
 4 4
 0 0
-./arith2.sub: line 42: syntax error:  -- - 7 
-./arith2.sub: line 47: syntax error:  ++ + 7 
+./arith2.sub: line 42: arithmetic syntax error
+./arith2.sub: line 47: arithmetic syntax error
 8 12
-./arith.tests: line 290: syntax error: a b
+./arith.tests: line 290: arithmetic syntax error
 42
 42
 42
diff --git a/shell/ash_test/ash-signals/signal8.right b/shell/ash_test/ash-signals/signal8.right
new file mode 100644
index 000000000..39572f30e
--- /dev/null
+++ b/shell/ash_test/ash-signals/signal8.right
@@ -0,0 +1,3 @@
+Removing traps
+End of exit_func
+Done: 0
diff --git a/shell/ash_test/ash-signals/signal8.tests b/shell/ash_test/ash-signals/signal8.tests
new file mode 100755
index 000000000..731af7477
--- /dev/null
+++ b/shell/ash_test/ash-signals/signal8.tests
@@ -0,0 +1,18 @@
+"$THIS_SH" -c '
+exit_func() {
+    echo "Removing traps"
+    trap - EXIT TERM INT
+    echo "End of exit_func"
+}
+set -e
+trap exit_func EXIT TERM INT
+sleep 2
+exit 77
+' &
+
+sleep 1
+# BUG: ash kills -PGRP, but in non-interactive shell we do not create pgrps!
+# In this case, bash kills by PID, not PGRP.
+kill -TERM %1
+wait
+echo Done: $?
diff --git a/shell/ash_test/ash-signals/signal9.right b/shell/ash_test/ash-signals/signal9.right
new file mode 100644
index 000000000..39572f30e
--- /dev/null
+++ b/shell/ash_test/ash-signals/signal9.right
@@ -0,0 +1,3 @@
+Removing traps
+End of exit_func
+Done: 0
diff --git a/shell/ash_test/ash-signals/signal9.tests b/shell/ash_test/ash-signals/signal9.tests
new file mode 100755
index 000000000..18e71012b
--- /dev/null
+++ b/shell/ash_test/ash-signals/signal9.tests
@@ -0,0 +1,21 @@
+# Note: the inner script is a test which checks for a different bug
+# (ordering between INT handler and exit on "set -e"),
+# but so far I did not figure out how to simulate it non-interactively.
+
+"$THIS_SH" -c '
+exit_func() {
+    echo "Removing traps"
+    trap - EXIT TERM INT
+    echo "End of exit_func"
+}
+set -e
+trap exit_func EXIT TERM INT
+sleep 2
+exit 77
+' &
+
+child=$!
+sleep 1
+kill -TERM $child
+wait
+echo Done: $?
diff --git a/shell/hush.c b/shell/hush.c
index 752efd0c8..75083dc2e 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -8,6 +8,8 @@
  * Copyright (C) 2000,2001  Larry Doolittle <larry@doolittle.boa.org>
  * Copyright (C) 2008,2009  Denys Vlasenko <vda.linux@googlemail.com>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ *
  * Credits:
  *      The parser routines proper are all original material, first
  *      written Dec 2000 and Jan 2001 by Larry Doolittle.  The
@@ -50,7 +52,6 @@
  *
  * Bash compat TODO:
  *      redirection of stdout+stderr: &> and >&
- *      brace expansion: one/{two,three,four}
  *      reserved words: function select
  *      advanced test: [[ ]]
  *      process substitution: <(list) and >(list)
@@ -63,7 +64,9 @@
  *          The EXPR is evaluated according to ARITHMETIC EVALUATION.
  *          This is exactly equivalent to let "EXPR".
  *      $[EXPR]: synonym for $((EXPR))
- *      export builtin should be special, its arguments are assignments
+ *
+ * Won't do:
+ *      In bash, export builtin is special, its arguments are assignments
  *          and therefore expansion of them should be "one-word" expansion:
  *              $ export i=`echo 'a  b'` # export has one arg: "i=a  b"
  *          compare with:
@@ -77,8 +80,6 @@
  *              aaa  bbb
  *              $ "export" i=`echo 'aaa  bbb'`; echo "$i"
  *              aaa
- *
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "busybox.h"  /* for APPLET_IS_NOFORK/NOEXEC */
 #include <malloc.h>   /* for malloc_trim */
@@ -119,8 +120,8 @@
 //config:
 //config:         It will compile and work on no-mmu systems.
 //config:
-//config:         It does not handle select, aliases, brace expansion,
-//config:         tilde expansion, &>file and >&file redirection of stdout+stderr.
+//config:         It does not handle select, aliases, tilde expansion,
+//config:         &>file and >&file redirection of stdout+stderr.
 //config:
 //config:config HUSH_BASH_COMPAT
 //config:       bool "bash-compatible extensions"
@@ -129,6 +130,13 @@
 //config:       help
 //config:         Enable bash-compatible extensions.
 //config:
+//config:config HUSH_BRACE_EXPANSION
+//config:       bool "Brace expansion"
+//config:       default y
+//config:       depends on HUSH_BASH_COMPAT
+//config:       help
+//config:         Enable {abc,def} extension.
+//config:
 //config:config HUSH_HELP
 //config:       bool "help builtin"
 //config:       default y
@@ -391,18 +399,10 @@ enum {
         RES_SNTX
 };
 
-enum {
-        EXP_FLAG_GLOB = 0x200,
-        EXP_FLAG_ESC_GLOB_CHARS = 0x100,
-        EXP_FLAG_SINGLEWORD = 0x80, /* must be 0x80 */
-};
-
 typedef struct o_string {
         char *data;
         int length; /* position where data is appended */
         int maxlen;
-        /* Protect newly added chars against globbing
-         * (by prepending \ to *, ?, [, \) */
         int o_expflags;
         /* At least some part of the string was inside '' or "",
          * possibly empty one: word"", wo''rd etc. */
@@ -411,10 +411,18 @@ typedef struct o_string {
         smallint o_assignment; /* 0:maybe, 1:yes, 2:no */
 } o_string;
 enum {
-        MAYBE_ASSIGNMENT = 0,
+        EXP_FLAG_SINGLEWORD     = 0x80, /* must be 0x80 */
+        EXP_FLAG_GLOB           = 0x2,
+        /* Protect newly added chars against globbing
+         * by prepending \ to *, ?, [, \ */
+        EXP_FLAG_ESC_GLOB_CHARS = 0x1,
+};
+enum {
+        MAYBE_ASSIGNMENT      = 0,
         DEFINITELY_ASSIGNMENT = 1,
-        NOT_ASSIGNMENT = 2,
-        WORD_IS_KEYWORD = 3, /* not assigment, but next word may be: "if v=xyz cmd;" */
+        NOT_ASSIGNMENT        = 2,
+        /* Not an assigment, but next word may be: "if v=xyz cmd;" */
+        WORD_IS_KEYWORD       = 3,
 };
 /* Used for initialization: o_string foo = NULL_O_STRING; */
 #define NULL_O_STRING { NULL }
@@ -707,8 +715,7 @@ struct globals {
 #endif
         const char *ifs;
         const char *cwd;
-        struct variable *top_var; /* = &G.shell_ver (set in main()) */
-        struct variable shell_ver;
+        struct variable *top_var;
         char **expanded_assignments;
 #if ENABLE_HUSH_FUNCTIONS
         struct function *top_func;
@@ -2001,26 +2008,8 @@ static void o_addstr_with_NUL(o_string *o, const char *str)
         o_addblock(o, str, strlen(str) + 1);
 }
 
-static void o_addblock_duplicate_backslash(o_string *o, const char *str, int len)
-{
-        while (len) {
-                len--;
-                o_addchr(o, *str);
-                if (*str++ == '\\') {
-                        /* \z -> \\\z; \<eol> -> \\<eol> */
-                        o_addchr(o, '\\');
-                        if (len) {
-                                len--;
-                                o_addchr(o, '\\');
-                                o_addchr(o, *str++);
-                        }
-                }
-        }
-}
-
-#undef HUSH_BRACE_EXP
 /*
- * HUSH_BRACE_EXP code needs corresponding quoting on variable expansion side.
+ * HUSH_BRACE_EXPANSION code needs corresponding quoting on variable expansion side.
  * Currently, "v='{q,w}'; echo $v" erroneously expands braces in $v.
  * Apparently, on unquoted $v bash still does globbing
  * ("v='*.txt'; echo $v" prints all .txt files),
@@ -2030,7 +2019,7 @@ static void o_addblock_duplicate_backslash(o_string *o, const char *str, int len
  * We have only second one.
  */
 
-#ifdef HUSH_BRACE_EXP
+#if ENABLE_HUSH_BRACE_EXPANSION
 # define MAYBE_BRACES "{}"
 #else
 # define MAYBE_BRACES ""
@@ -2198,7 +2187,7 @@ static int o_get_last_ptr(o_string *o, int n)
         return ((int)(uintptr_t)list[n-1]) + string_start;
 }
 
-#ifdef HUSH_BRACE_EXP
+#if ENABLE_HUSH_BRACE_EXPANSION
 /* There in a GNU extension, GLOB_BRACE, but it is not usable:
  * first, it processes even {a} (no commas), second,
  * I didn't manage to make it return strings when they don't match
@@ -2394,7 +2383,7 @@ static int perform_glob(o_string *o, int n)
         return n;
 }
 
-#else /* !HUSH_BRACE_EXP */
+#else /* !HUSH_BRACE_EXPANSION */
 
 /* Helper */
 static int glob_needed(const char *s)
@@ -2471,7 +2460,7 @@ static int perform_glob(o_string *o, int n)
         return n;
 }
 
-#endif /* !HUSH_BRACE_EXP */
+#endif /* !HUSH_BRACE_EXPANSION */
 
 /* If o->o_expflags & EXP_FLAG_GLOB, glob the string so far remembered.
  * Otherwise, just finish current list[] and start new */
@@ -4388,6 +4377,37 @@ static int process_command_subs(o_string *dest, const char *s);
  * followed by strings themselves.
  * Caller can deallocate entire list by single free(list). */
 
+/* A horde of its helpers come first: */
+
+static void o_addblock_duplicate_backslash(o_string *o, const char *str, int len)
+{
+        while (--len >= 0) {
+                char c = *str++;
+
+#if ENABLE_HUSH_BRACE_EXPANSION
+                if (c == '{' || c == '}') {
+                        /* { -> \{, } -> \} */
+                        o_addchr(o, '\\');
+                        /* And now we want to add { or } and continue:
+                         *  o_addchr(o, c);
+                         *  continue;
+                         * luckily, just falling throught achieves this.
+                         */
+                }
+#endif
+                o_addchr(o, c);
+                if (c == '\\') {
+                        /* \z -> \\\z; \<eol> -> \\<eol> */
+                        o_addchr(o, '\\');
+                        if (len) {
+                                len--;
+                                o_addchr(o, '\\');
+                                o_addchr(o, *str++);
+                        }
+                }
+        }
+}
+
 /* Store given string, finalizing the word and starting new one whenever
  * we encounter IFS char(s). This is used for expanding variable values.
  * End-of-string does NOT finalize word: think about 'echo -$VAR-' */
@@ -4396,9 +4416,9 @@ static int expand_on_ifs(o_string *output, int n, const char *str)
         while (1) {
                 int word_len = strcspn(str, G.ifs);
                 if (word_len) {
-                        if (!(output->o_expflags & EXP_FLAG_GLOB))
+                        if (!(output->o_expflags & EXP_FLAG_GLOB)) {
                                 o_addblock(output, str, word_len);
-                        else {
+                        } else {
                                 /* Protect backslashes against globbing up :)
                                  * Example: "v='\*'; echo b$v" prints "b\*"
                                  * (and does not try to glob on "*")
@@ -4461,18 +4481,22 @@ static char *encode_then_expand_string(const char *str, int process_bkslash, int
 }
 
 #if ENABLE_SH_MATH_SUPPORT
-static arith_t expand_and_evaluate_arith(const char *arg, int *errcode_p)
+static arith_t expand_and_evaluate_arith(const char *arg, const char **errmsg_p)
 {
-        arith_eval_hooks_t hooks;
+        arith_state_t math_state;
         arith_t res;
         char *exp_str;
 
-        hooks.lookupvar = get_local_var_value;
-        hooks.setvar = set_local_var_from_halves;
-        //hooks.endofname = endofname;
+        math_state.lookupvar = get_local_var_value;
+        math_state.setvar = set_local_var_from_halves;
+        //math_state.endofname = endofname;
         exp_str = encode_then_expand_string(arg, /*process_bkslash:*/ 1, /*unbackslash:*/ 1);
-        res = arith(exp_str ? exp_str : arg, errcode_p, &hooks);
+        res = arith(&math_state, exp_str ? exp_str : arg);
         free(exp_str);
+        if (errmsg_p)
+                *errmsg_p = math_state.errmsg;
+        if (math_state.errmsg)
+                die_if_script(math_state.errmsg);
         return res;
 }
 #endif
@@ -4713,24 +4737,28 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
                          * var:N<SPECIAL_VAR_SYMBOL>M<SPECIAL_VAR_SYMBOL>
                          */
                         arith_t beg, len;
-                        int errcode = 0;
+                        const char *errmsg;
 
-                        beg = expand_and_evaluate_arith(exp_word, &errcode);
+                        beg = expand_and_evaluate_arith(exp_word, &errmsg);
+                        if (errmsg)
+                                goto arith_err;
                         debug_printf_varexp("beg:'%s'=%lld\n", exp_word, (long long)beg);
                         *p++ = SPECIAL_VAR_SYMBOL;
                         exp_word = p;
                         p = strchr(p, SPECIAL_VAR_SYMBOL);
                         *p = '\0';
-                        len = expand_and_evaluate_arith(exp_word, &errcode);
+                        len = expand_and_evaluate_arith(exp_word, &errmsg);
+                        if (errmsg)
+                                goto arith_err;
                         debug_printf_varexp("len:'%s'=%lld\n", exp_word, (long long)len);
-
-                        if (errcode >= 0 && len >= 0) { /* bash compat: len < 0 is illegal */
+                        if (len >= 0) { /* bash compat: len < 0 is illegal */
                                 if (beg < 0) /* bash compat */
                                         beg = 0;
                                 debug_printf_varexp("from val:'%s'\n", val);
-                                if (len == 0 || !val || beg >= strlen(val))
-                                        val = "";
-                                else {
+                                if (len == 0 || !val || beg >= strlen(val)) {
+ arith_err:
+                                        val = NULL;
+                                } else {
                                         /* Paranoia. What if user entered 9999999999999
                                          * which fits in arith_t but not int? */
                                         if (len >= INT_MAX)
@@ -4742,7 +4770,7 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
 #endif
                         {
                                 die_if_script("malformed ${%s:...}", var);
-                                val = "";
+                                val = NULL;
                         }
                 } else { /* one of "-=+?" */
                         /* Standard-mandated substitution ops:
@@ -4925,30 +4953,13 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg)
 #if ENABLE_SH_MATH_SUPPORT
                 case '+': { /* <SPECIAL_VAR_SYMBOL>+cmd<SPECIAL_VAR_SYMBOL> */
                         arith_t res;
-                        int errcode;
 
                         arg++; /* skip '+' */
                         *p = '\0'; /* replace trailing <SPECIAL_VAR_SYMBOL> */
                         debug_printf_subst("ARITH '%s' first_ch %x\n", arg, first_ch);
-                        res = expand_and_evaluate_arith(arg, &errcode);
-
-                        if (errcode < 0) {
-                                const char *msg = "error in arithmetic";
-                                switch (errcode) {
-                                case -3:
-                                        msg = "exponent less than 0";
-                                        break;
-                                case -2:
-                                        msg = "divide by 0";
-                                        break;
-                                case -5:
-                                        msg = "expression recursion loop detected";
-                                        break;
-                                }
-                                die_if_script(msg);
-                        }
-                        debug_printf_subst("ARITH RES '"arith_t_fmt"'\n", res);
-                        sprintf(arith_buf, arith_t_fmt, res);
+                        res = expand_and_evaluate_arith(arg, NULL);
+                        debug_printf_subst("ARITH RES '"ARITH_FMT"'\n", res);
+                        sprintf(arith_buf, ARITH_FMT, res);
                         val = arith_buf;
                         break;
                 }
@@ -7346,6 +7357,7 @@ int hush_main(int argc, char **argv)
         unsigned builtin_argc;
         char **e;
         struct variable *cur_var;
+        struct variable shell_ver;
 
         INIT_G();
         if (EXIT_SUCCESS) /* if EXIT_SUCCESS == 0, it is already done */
@@ -7354,12 +7366,13 @@ int hush_main(int argc, char **argv)
         G.argv0_for_re_execing = argv[0];
 #endif
         /* Deal with HUSH_VERSION */
-        G.shell_ver.flg_export = 1;
-        G.shell_ver.flg_read_only = 1;
+        memset(&shell_ver, 0, 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: */
-        G.shell_ver.varstr = xstrdup(hush_version_str),
-        G.top_var = &G.shell_ver;
+        shell_ver.varstr = xstrdup(hush_version_str),
+        G.top_var = &shell_ver;
         /* Create shell local variables from the values
          * currently living in the environment */
         debug_printf_env("unsetenv '%s'\n", "HUSH_VERSION");
@@ -7378,8 +7391,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", G.shell_ver.varstr);
-        putenv(G.shell_ver.varstr);
+        debug_printf_env("putenv '%s'\n", shell_ver.varstr);
+        putenv(shell_ver.varstr);
 
         /* Export PWD */
         set_pwd_var(/*exp:*/ 1);
diff --git a/shell/hush_test/hush-arith/arith.right b/shell/hush_test/hush-arith/arith.right
index 718c26ad0..8a201fb3b 100644
--- a/shell/hush_test/hush-arith/arith.right
+++ b/shell/hush_test/hush-arith/arith.right
@@ -61,7 +61,7 @@ check that the unevaluated part of the ternary operator does not do evaluation o
 20 20
 30 30
 check precedence of assignment vs. conditional operator
-hush: error in arithmetic
+hush: arithmetic syntax error
 check precedence of assignment vs. conditional operator
 associativity of assignment-operator operator
 6 6
@@ -70,22 +70,22 @@ octal, hex
 263 263
 255 255
 40 40
-hush: error in arithmetic
-hush: divide by 0
+hush: arithmetic syntax error
+hush: divide by zero
 hush: can't execute 'let': No such file or directory
-hush: error in arithmetic
+hush: arithmetic syntax error
 hush: can't execute 'let': No such file or directory
 abc
 def
 ghi
-hush: error in arithmetic
+hush: arithmetic syntax error
 16 16
-hush: error in arithmetic
-hush: error in arithmetic
-hush: error in arithmetic
+hush: arithmetic syntax error
+hush: malformed ?: operator
+hush: arithmetic syntax error
 9 9
-hush: error in arithmetic
-hush: error in arithmetic
+hush: arithmetic syntax error
+hush: arithmetic syntax error
 9 9
 9 9
 9 9
@@ -106,18 +106,18 @@ hush: error in arithmetic
 3 3
 4 4
 4 4
-hush: error in arithmetic
-hush: error in arithmetic
-hush: error in arithmetic
-hush: error in arithmetic
-hush: error in arithmetic
+hush: arithmetic syntax error
+hush: arithmetic syntax error
+hush: arithmetic syntax error
+hush: arithmetic syntax error
+hush: arithmetic syntax error
 4 4
 7 7
 -7 -7
-hush: error in arithmetic
-hush: error in arithmetic
-hush: error in arithmetic
-hush: error in arithmetic
+hush: arithmetic syntax error
+hush: arithmetic syntax error
+hush: arithmetic syntax error
+hush: arithmetic syntax error
 6 6
 3 3
 7 7
@@ -128,19 +128,19 @@ hush: error in arithmetic
 2 2
 -2 -2
 1 1
-hush: error in arithmetic
-hush: error in arithmetic
-hush: error in arithmetic
-hush: error in arithmetic
-hush: error in arithmetic
+hush: arithmetic syntax error
+hush: arithmetic syntax error
+hush: arithmetic syntax error
+hush: arithmetic syntax error
+hush: arithmetic syntax error
 5 5
 1 1
 4 4
 0 0
-hush: error in arithmetic
-hush: error in arithmetic
+hush: arithmetic syntax error
+hush: arithmetic syntax error
 8 12
-hush: error in arithmetic
+hush: arithmetic syntax error
 42
 42
 42
diff --git a/shell/hush_test/hush-glob/bash_brace1.right b/shell/hush_test/hush-glob/bash_brace1.right
new file mode 100644
index 000000000..63365c9e4
--- /dev/null
+++ b/shell/hush_test/hush-glob/bash_brace1.right
@@ -0,0 +1,4 @@
+bash_brace1.tests
+*{b,b}race1.t*
+bash_brace1.tests bash_brace1.tests
+Done: 0
diff --git a/shell/hush_test/hush-glob/bash_brace1.tests b/shell/hush_test/hush-glob/bash_brace1.tests
new file mode 100755
index 000000000..eb2f0e974
--- /dev/null
+++ b/shell/hush_test/hush-glob/bash_brace1.tests
@@ -0,0 +1,10 @@
+# unquoted $v should be globbed:
+v='*brace1.t*'; echo $v
+
+# ...but not brace expanded:
+v='*{b,b}race1.t*'; echo $v
+
+# whereas direct brces are expanded:
+echo *{b,b}race1.t*
+
+echo Done: $?
diff --git a/shell/math.c b/shell/math.c
index a4c55a4d0..760645d0f 100644
--- a/shell/math.c
+++ b/shell/math.c
@@ -1,5 +1,5 @@
 /*
- * arithmetic code ripped out of ash shell for code sharing
+ * Arithmetic code ripped out of ash shell for code sharing.
  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
@@ -26,43 +26,41 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 /* Copyright (c) 2001 Aaron Lehmann <aaronl@vitelus.com>
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   "Software"), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject to
-   the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 /* This is my infix parser/evaluator. It is optimized for size, intended
  * as a replacement for yacc-based parsers. However, it may well be faster
  * than a comparable parser written in yacc. The supported operators are
  * listed in #defines below. Parens, order of operations, and error handling
  * are supported. This code is thread safe. The exact expression format should
- * be that which POSIX specifies for shells. */
-
-/* The code uses a simple two-stack algorithm. See
+ * be that which POSIX specifies for shells.
+ *
+ * The code uses a simple two-stack algorithm. See
  * http://www.onthenet.com.au/~grahamis/int2008/week02/lect02.html
  * for a detailed explanation of the infix-to-postfix algorithm on which
  * this is based (this code differs in that it applies operators immediately
  * to the stack instead of adding them to a queue to end up with an
- * expression). */
-
-/* To use the routine, call it with an expression string and error return
- * pointer */
+ * expression).
+ */
 
 /*
  * Aug 24, 2001              Manuel Novoa III
@@ -104,28 +102,23 @@
  *  (C) 2003 Vladimir Oleynik <dzo@simtreas.ru>
  *
  * - allow access to variable,
- *   used recursive find value indirection (c=2*2; a="c"; $((a+=2)) produce 6)
- * - realize assign syntax (VAR=expr, +=, *= etc)
- * - realize exponentiation (** operator)
- * - realize comma separated - expr, expr
- * - realise ++expr --expr expr++ expr--
- * - realise expr ? expr : expr (but, second expr calculate always)
+ *   use recursive value indirection: c="2*2"; a="c"; echo $((a+=2)) produce 6
+ * - implement assign syntax (VAR=expr, +=, *= etc)
+ * - implement exponentiation (** operator)
+ * - implement comma separated - expr, expr
+ * - implement ++expr --expr expr++ expr--
+ * - implement expr ? expr : expr (but second expr is always calculated)
  * - allow hexadecimal and octal numbers
- * - was restored loses XOR operator
- * - remove one goto label, added three ;-)
- * - protect $((num num)) as true zero expr (Manuel`s error)
+ * - restore lost XOR operator
+ * - protect $((num num)) as true zero expr (Manuel's error)
  * - always use special isspace(), see comment from bash ;-)
  */
 #include "libbb.h"
 #include "math.h"
 
-#define a_e_h_t arith_eval_hooks_t
-#define lookupvar (math_hooks->lookupvar)
-#define setvar    (math_hooks->setvar   )
-//#define endofname (math_hooks->endofname)
-
-#define arith_isspace(arithval) \
-        (arithval == ' ' || arithval == '\n' || arithval == '\t')
+#define lookupvar (math_state->lookupvar)
+#define setvar    (math_state->setvar   )
+//#define endofname (math_state->endofname)
 
 typedef unsigned char operator;
 
@@ -133,181 +126,199 @@ typedef unsigned char operator;
  * precedence, and 3 high bits are an ID unique across operators of that
  * precedence. The ID portion is so that multiple operators can have the
  * same precedence, ensuring that the leftmost one is evaluated first.
- * Consider * and /. */
-
-#define tok_decl(prec,id) (((id)<<5)|(prec))
-#define PREC(op) ((op) & 0x1F)
-
-#define TOK_LPAREN tok_decl(0,0)
+ * Consider * and /
+ */
+#define tok_decl(prec,id)       (((id)<<5) | (prec))
+#define PREC(op)                ((op) & 0x1F)
 
-#define TOK_COMMA tok_decl(1,0)
+#define TOK_LPAREN              tok_decl(0,0)
 
-#define TOK_ASSIGN tok_decl(2,0)
-#define TOK_AND_ASSIGN tok_decl(2,1)
-#define TOK_OR_ASSIGN tok_decl(2,2)
-#define TOK_XOR_ASSIGN tok_decl(2,3)
-#define TOK_PLUS_ASSIGN tok_decl(2,4)
-#define TOK_MINUS_ASSIGN tok_decl(2,5)
-#define TOK_LSHIFT_ASSIGN tok_decl(2,6)
-#define TOK_RSHIFT_ASSIGN tok_decl(2,7)
+#define TOK_COMMA               tok_decl(1,0)
 
-#define TOK_MUL_ASSIGN tok_decl(3,0)
-#define TOK_DIV_ASSIGN tok_decl(3,1)
-#define TOK_REM_ASSIGN tok_decl(3,2)
+/* All assignments are right associative and have the same precedence,
+ * but there are 11 of them, which doesn't fit into 3 bits for unique id.
+ * Abusing another precedence level:
+ */
+#define TOK_ASSIGN              tok_decl(2,0)
+#define TOK_AND_ASSIGN          tok_decl(2,1)
+#define TOK_OR_ASSIGN           tok_decl(2,2)
+#define TOK_XOR_ASSIGN          tok_decl(2,3)
+#define TOK_PLUS_ASSIGN         tok_decl(2,4)
+#define TOK_MINUS_ASSIGN        tok_decl(2,5)
+#define TOK_LSHIFT_ASSIGN       tok_decl(2,6)
+#define TOK_RSHIFT_ASSIGN       tok_decl(2,7)
 
-/* all assign is right associativity and precedence eq, but (7+3)<<5 > 256 */
-#define convert_prec_is_assing(prec) do { if (prec == 3) prec = 2; } while (0)
+#define TOK_MUL_ASSIGN          tok_decl(3,0)
+#define TOK_DIV_ASSIGN          tok_decl(3,1)
+#define TOK_REM_ASSIGN          tok_decl(3,2)
 
-/* conditional is right associativity too */
-#define TOK_CONDITIONAL tok_decl(4,0)
-#define TOK_CONDITIONAL_SEP tok_decl(4,1)
+#define fix_assignment_prec(prec) do { if (prec == 3) prec = 2; } while (0)
 
-#define TOK_OR tok_decl(5,0)
+/* Ternary conditional operator is right associative too */
+#define TOK_CONDITIONAL         tok_decl(4,0)
+#define TOK_CONDITIONAL_SEP     tok_decl(4,1)
 
-#define TOK_AND tok_decl(6,0)
+#define TOK_OR                  tok_decl(5,0)
 
-#define TOK_BOR tok_decl(7,0)
+#define TOK_AND                 tok_decl(6,0)
 
-#define TOK_BXOR tok_decl(8,0)
+#define TOK_BOR                 tok_decl(7,0)
 
-#define TOK_BAND tok_decl(9,0)
+#define TOK_BXOR                tok_decl(8,0)
 
-#define TOK_EQ tok_decl(10,0)
-#define TOK_NE tok_decl(10,1)
+#define TOK_BAND                tok_decl(9,0)
 
-#define TOK_LT tok_decl(11,0)
-#define TOK_GT tok_decl(11,1)
-#define TOK_GE tok_decl(11,2)
-#define TOK_LE tok_decl(11,3)
+#define TOK_EQ                  tok_decl(10,0)
+#define TOK_NE                  tok_decl(10,1)
 
-#define TOK_LSHIFT tok_decl(12,0)
-#define TOK_RSHIFT tok_decl(12,1)
+#define TOK_LT                  tok_decl(11,0)
+#define TOK_GT                  tok_decl(11,1)
+#define TOK_GE                  tok_decl(11,2)
+#define TOK_LE                  tok_decl(11,3)
 
-#define TOK_ADD tok_decl(13,0)
-#define TOK_SUB tok_decl(13,1)
+#define TOK_LSHIFT              tok_decl(12,0)
+#define TOK_RSHIFT              tok_decl(12,1)
 
-#define TOK_MUL tok_decl(14,0)
-#define TOK_DIV tok_decl(14,1)
-#define TOK_REM tok_decl(14,2)
+#define TOK_ADD                 tok_decl(13,0)
+#define TOK_SUB                 tok_decl(13,1)
 
-/* exponent is right associativity */
-#define TOK_EXPONENT tok_decl(15,1)
+#define TOK_MUL                 tok_decl(14,0)
+#define TOK_DIV                 tok_decl(14,1)
+#define TOK_REM                 tok_decl(14,2)
 
-/* For now unary operators. */
-#define UNARYPREC 16
-#define TOK_BNOT tok_decl(UNARYPREC,0)
-#define TOK_NOT tok_decl(UNARYPREC,1)
+/* Exponent is right associative */
+#define TOK_EXPONENT            tok_decl(15,1)
 
-#define TOK_UMINUS tok_decl(UNARYPREC+1,0)
-#define TOK_UPLUS tok_decl(UNARYPREC+1,1)
+/* Unary operators */
+#define UNARYPREC               16
+#define TOK_BNOT                tok_decl(UNARYPREC,0)
+#define TOK_NOT                 tok_decl(UNARYPREC,1)
 
-#define PREC_PRE (UNARYPREC+2)
+#define TOK_UMINUS              tok_decl(UNARYPREC+1,0)
+#define TOK_UPLUS               tok_decl(UNARYPREC+1,1)
 
-#define TOK_PRE_INC tok_decl(PREC_PRE, 0)
-#define TOK_PRE_DEC tok_decl(PREC_PRE, 1)
+#define PREC_PRE                (UNARYPREC+2)
 
-#define PREC_POST (UNARYPREC+3)
+#define TOK_PRE_INC             tok_decl(PREC_PRE, 0)
+#define TOK_PRE_DEC             tok_decl(PREC_PRE, 1)
 
-#define TOK_POST_INC tok_decl(PREC_POST, 0)
-#define TOK_POST_DEC tok_decl(PREC_POST, 1)
+#define PREC_POST               (UNARYPREC+3)
 
-#define SPEC_PREC (UNARYPREC+4)
+#define TOK_POST_INC            tok_decl(PREC_POST, 0)
+#define TOK_POST_DEC            tok_decl(PREC_POST, 1)
 
-#define TOK_NUM tok_decl(SPEC_PREC, 0)
-#define TOK_RPAREN tok_decl(SPEC_PREC, 1)
+#define SPEC_PREC               (UNARYPREC+4)
 
-#define NUMPTR (*numstackptr)
+#define TOK_NUM                 tok_decl(SPEC_PREC, 0)
+#define TOK_RPAREN              tok_decl(SPEC_PREC, 1)
 
 static int
-tok_have_assign(operator op)
+is_assign_op(operator op)
 {
         operator prec = PREC(op);
-
-        convert_prec_is_assing(prec);
-        return (prec == PREC(TOK_ASSIGN) ||
-                        prec == PREC_PRE || prec == PREC_POST);
+        fix_assignment_prec(prec);
+        return prec == PREC(TOK_ASSIGN)
+        || prec == PREC_PRE
+        || prec == PREC_POST;
 }
 
 static int
-is_right_associativity(operator prec)
+is_right_associative(operator prec)
 {
-        return (prec == PREC(TOK_ASSIGN) || prec == PREC(TOK_EXPONENT)
-                || prec == PREC(TOK_CONDITIONAL));
+        return prec == PREC(TOK_ASSIGN)
+        || prec == PREC(TOK_EXPONENT)
+        || prec == PREC(TOK_CONDITIONAL);
 }
 
+
 typedef struct {
         arith_t val;
-        arith_t contidional_second_val;
-        char contidional_second_val_initialized;
-        char *var;      /* if NULL then is regular number,
-                           else is variable name */
-} v_n_t;
-
-typedef struct chk_var_recursive_looped_t {
+        /* We acquire second_val only when "expr1 : expr2" part
+         * of ternary ?: op is evaluated.
+         * We treat ?: as two binary ops: (expr ? (expr1 : expr2)).
+         * ':' produces a new value which has two parts, val and second_val;
+         * then '?' selects one of them based on its left side.
+         */
+        arith_t second_val;
+        char second_val_present;
+        /* If NULL then it's just a number, else it's a named variable */
+        char *var;
+} var_or_num_t;
+
+typedef struct remembered_name {
+        struct remembered_name *next;
         const char *var;
-        struct chk_var_recursive_looped_t *next;
-} chk_var_recursive_looped_t;
+} remembered_name;
 
-static chk_var_recursive_looped_t *prev_chk_var_recursive;
 
-static int
-arith_lookup_val(v_n_t *t, a_e_h_t *math_hooks)
+static arith_t FAST_FUNC
+evaluate_string(arith_state_t *math_state, const char *expr);
+
+static const char*
+arith_lookup_val(arith_state_t *math_state, var_or_num_t *t)
 {
         if (t->var) {
                 const char *p = lookupvar(t->var);
-
                 if (p) {
-                        int errcode;
-
-                        /* recursive try as expression */
-                        chk_var_recursive_looped_t *cur;
-                        chk_var_recursive_looped_t cur_save;
+                        remembered_name *cur;
+                        remembered_name cur_save;
 
-                        for (cur = prev_chk_var_recursive; cur; cur = cur->next) {
+                        /* did we already see this name?
+                         * testcase: a=b; b=a; echo $((a))
+                         */
+                        for (cur = math_state->list_of_recursed_names; cur; cur = cur->next) {
                                 if (strcmp(cur->var, t->var) == 0) {
-                                        /* expression recursion loop detected */
-                                        return -5;
+                                        /* Yes */
+                                        return "expression recursion loop detected";
                                 }
                         }
-                        /* save current lookuped var name */
-                        cur = prev_chk_var_recursive;
+
+                        /* push current var name */
+                        cur = math_state->list_of_recursed_names;
                         cur_save.var = t->var;
                         cur_save.next = cur;
-                        prev_chk_var_recursive = &cur_save;
+                        math_state->list_of_recursed_names = &cur_save;
+
+                        /* recursively evaluate p as expression */
+                        t->val = evaluate_string(math_state, p);
 
-                        t->val = arith (p, &errcode, math_hooks);
-                        /* restore previous ptr after recursiving */
-                        prev_chk_var_recursive = cur;
-                        return errcode;
+                        /* pop current var name */
+                        math_state->list_of_recursed_names = cur;
+
+                        return math_state->errmsg;
                 }
-                /* allow undefined var as 0 */
+                /* treat undefined var as 0 */
                 t->val = 0;
         }
         return 0;
 }
 
-/* "applying" a token means performing it on the top elements on the integer
- * stack. For a unary operator it will only change the top element, but a
- * binary operator will pop two arguments and push a result */
-static NOINLINE int
-arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr, a_e_h_t *math_hooks)
+/* "Applying" a token means performing it on the top elements on the integer
+ * stack. For an unary operator it will only change the top element, but a
+ * binary operator will pop two arguments and push the result */
+static NOINLINE const char*
+arith_apply(arith_state_t *math_state, operator op, var_or_num_t *numstack, var_or_num_t **numstackptr)
 {
-        v_n_t *numptr_m1;
-        arith_t numptr_val, rez;
-        int ret_arith_lookup_val;
+#define NUMPTR (*numstackptr)
+
+        var_or_num_t *top_of_stack;
+        arith_t rez;
+        const char *err;
 
         /* There is no operator that can work without arguments */
-        if (NUMPTR == numstack) goto err;
-        numptr_m1 = NUMPTR - 1;
+        if (NUMPTR == numstack)
+                goto err;
+
+        top_of_stack = NUMPTR - 1;
 
-        /* check operand is var with noninteger value */
-        ret_arith_lookup_val = arith_lookup_val(numptr_m1, math_hooks);
-        if (ret_arith_lookup_val)
-                return ret_arith_lookup_val;
+        /* Resolve name to value, if needed */
+        err = arith_lookup_val(math_state, top_of_stack);
+        if (err)
+                return err;
 
-        rez = numptr_m1->val;
+        rez = top_of_stack->val;
         if (op == TOK_UMINUS)
-                rez *= -1;
+                rez = -rez;
         else if (op == TOK_NOT)
                 rez = !rez;
         else if (op == TOK_BNOT)
@@ -318,118 +329,123 @@ arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr, a_e_h_t *math_hoo
                 rez--;
         else if (op != TOK_UPLUS) {
                 /* Binary operators */
+                arith_t right_side_val;
+                char bad_second_val;
 
-                /* check and binary operators need two arguments */
-                if (numptr_m1 == numstack) goto err;
-
-                /* ... and they pop one */
-                --NUMPTR;
-                numptr_val = rez;
-                if (op == TOK_CONDITIONAL) {
-                        if (!numptr_m1->contidional_second_val_initialized) {
-                                /* protect $((expr1 ? expr2)) without ": expr" */
-                                goto err;
-                        }
-                        rez = numptr_m1->contidional_second_val;
-                } else if (numptr_m1->contidional_second_val_initialized) {
-                        /* protect $((expr1 : expr2)) without "expr ? " */
+                /* Binary operators need two arguments */
+                if (top_of_stack == numstack)
                         goto err;
+                /* ...and they pop one */
+                NUMPTR = top_of_stack; /* this decrements NUMPTR */
+
+                bad_second_val = top_of_stack->second_val_present;
+                if (op == TOK_CONDITIONAL) { /* ? operation */
+                        /* Make next if (...) protect against
+                         * $((expr1 ? expr2)) - that is, missing ": expr" */
+                        bad_second_val = !bad_second_val;
+                }
+                if (bad_second_val) {
+                        /* Protect against $((expr <not_?_op> expr1 : expr2)) */
+                        return "malformed ?: operator";
                 }
-                numptr_m1 = NUMPTR - 1;
+
+                top_of_stack--; /* now points to left side */
+
                 if (op != TOK_ASSIGN) {
-                        /* check operand is var with noninteger value for not '=' */
-                        ret_arith_lookup_val = arith_lookup_val(numptr_m1, math_hooks);
-                        if (ret_arith_lookup_val)
-                                return ret_arith_lookup_val;
+                        /* Resolve left side value (unless the op is '=') */
+                        err = arith_lookup_val(math_state, top_of_stack);
+                        if (err)
+                                return err;
                 }
-                if (op == TOK_CONDITIONAL) {
-                        numptr_m1->contidional_second_val = rez;
+
+                right_side_val = rez;
+                rez = top_of_stack->val;
+                if (op == TOK_CONDITIONAL) /* ? operation */
+                        rez = (rez ? right_side_val : top_of_stack[1].second_val);
+                else if (op == TOK_CONDITIONAL_SEP) { /* : operation */
+                        if (top_of_stack == numstack) {
+                                /* Protect against $((expr : expr)) */
+                                return "malformed ?: operator";
+                        }
+                        top_of_stack->second_val_present = op;
+                        top_of_stack->second_val = right_side_val;
                 }
-                rez = numptr_m1->val;
-                if (op == TOK_BOR || op == TOK_OR_ASSIGN)
-                        rez |= numptr_val;
+                else if (op == TOK_BOR || op == TOK_OR_ASSIGN)
+                        rez |= right_side_val;
                 else if (op == TOK_OR)
-                        rez = numptr_val || rez;
+                        rez = right_side_val || rez;
                 else if (op == TOK_BAND || op == TOK_AND_ASSIGN)
-                        rez &= numptr_val;
+                        rez &= right_side_val;
                 else if (op == TOK_BXOR || op == TOK_XOR_ASSIGN)
-                        rez ^= numptr_val;
+                        rez ^= right_side_val;
                 else if (op == TOK_AND)
-                        rez = rez && numptr_val;
+                        rez = rez && right_side_val;
                 else if (op == TOK_EQ)
-                        rez = (rez == numptr_val);
+                        rez = (rez == right_side_val);
                 else if (op == TOK_NE)
-                        rez = (rez != numptr_val);
+                        rez = (rez != right_side_val);
                 else if (op == TOK_GE)
-                        rez = (rez >= numptr_val);
+                        rez = (rez >= right_side_val);
                 else if (op == TOK_RSHIFT || op == TOK_RSHIFT_ASSIGN)
-                        rez >>= numptr_val;
+                        rez >>= right_side_val;
                 else if (op == TOK_LSHIFT || op == TOK_LSHIFT_ASSIGN)
-                        rez <<= numptr_val;
+                        rez <<= right_side_val;
                 else if (op == TOK_GT)
-                        rez = (rez > numptr_val);
+                        rez = (rez > right_side_val);
                 else if (op == TOK_LT)
-                        rez = (rez < numptr_val);
+                        rez = (rez < right_side_val);
                 else if (op == TOK_LE)
-                        rez = (rez <= numptr_val);
+                        rez = (rez <= right_side_val);
                 else if (op == TOK_MUL || op == TOK_MUL_ASSIGN)
-                        rez *= numptr_val;
+                        rez *= right_side_val;
                 else if (op == TOK_ADD || op == TOK_PLUS_ASSIGN)
-                        rez += numptr_val;
+                        rez += right_side_val;
                 else if (op == TOK_SUB || op == TOK_MINUS_ASSIGN)
-                        rez -= numptr_val;
+                        rez -= right_side_val;
                 else if (op == TOK_ASSIGN || op == TOK_COMMA)
-                        rez = numptr_val;
-                else if (op == TOK_CONDITIONAL_SEP) {
-                        if (numptr_m1 == numstack) {
-                                /* protect $((expr : expr)) without "expr ? " */
-                                goto err;
-                        }
-                        numptr_m1->contidional_second_val_initialized = op;
-                        numptr_m1->contidional_second_val = numptr_val;
-                } else if (op == TOK_CONDITIONAL) {
-                        rez = rez ?
-                                numptr_val : numptr_m1->contidional_second_val;
-                } else if (op == TOK_EXPONENT) {
-                        if (numptr_val < 0)
-                                return -3;      /* exponent less than 0 */
-                        else {
-                                arith_t c = 1;
-
-                                if (numptr_val)
-                                        while (numptr_val--)
-                                                c *= rez;
-                                rez = c;
-                        }
-                } else if (numptr_val==0)          /* zero divisor check */
-                        return -2;
+                        rez = right_side_val;
+                else if (op == TOK_EXPONENT) {
+                        arith_t c;
+                        if (right_side_val < 0)
+                                return "exponent less than 0";
+                        c = 1;
+                        while (--right_side_val >= 0)
+                            c *= rez;
+                        rez = c;
+                }
+                else if (right_side_val == 0)
+                        return "divide by zero";
                 else if (op == TOK_DIV || op == TOK_DIV_ASSIGN)
-                        rez /= numptr_val;
+                        rez /= right_side_val;
                 else if (op == TOK_REM || op == TOK_REM_ASSIGN)
-                        rez %= numptr_val;
+                        rez %= right_side_val;
         }
-        if (tok_have_assign(op)) {
+
+        if (is_assign_op(op)) {
                 char buf[sizeof(arith_t)*3 + 2];
 
-                if (numptr_m1->var == NULL) {
+                if (top_of_stack->var == NULL) {
                         /* Hmm, 1=2 ? */
+//TODO: actually, bash allows ++7 but for some reason it evals to 7, not 8
                         goto err;
                 }
-                /* save to shell variable */
-                sprintf(buf, arith_t_fmt, rez);
-                setvar(numptr_m1->var, buf);
-                /* after saving, make previous value for v++ or v-- */
+                /* Save to shell variable */
+                sprintf(buf, ARITH_FMT, rez);
+                setvar(top_of_stack->var, buf);
+                /* After saving, make previous value for v++ or v-- */
                 if (op == TOK_POST_INC)
                         rez--;
                 else if (op == TOK_POST_DEC)
                         rez++;
         }
-        numptr_m1->val = rez;
-        /* protect geting var value, is number now */
-        numptr_m1->var = NULL;
-        return 0;
+
+        top_of_stack->val = rez;
+        /* Erase var name, it is just a number now */
+        top_of_stack->var = NULL;
+        return NULL;
  err:
-        return -1;
+        return "arithmetic syntax error";
+#undef NUMPTR
 }
 
 /* longest must be first */
@@ -476,8 +492,7 @@ static const char op_tokens[] ALIGN1 = {
         '(',        0, TOK_LPAREN,
         0
 };
-/* ptr to ")" */
-#define endexpression (&op_tokens[sizeof(op_tokens)-7])
+#define ptr_to_rparen (&op_tokens[sizeof(op_tokens)-7])
 
 const char* FAST_FUNC
 endofname(const char *name)
@@ -491,35 +506,40 @@ endofname(const char *name)
         return name;
 }
 
-arith_t
-arith(const char *expr, int *perrcode, a_e_h_t *math_hooks)
+static arith_t FAST_FUNC
+evaluate_string(arith_state_t *math_state, const char *expr)
 {
-        char arithval; /* Current character under analysis */
-        operator lasttok, op;
-        operator prec;
-        operator *stack, *stackptr;
-        const char *p = endexpression;
-        int errcode;
-        v_n_t *numstack, *numstackptr;
-        unsigned datasizes = strlen(expr) + 2;
-
+        operator lasttok;
+        const char *errmsg;
+        const char *start_expr = expr = skip_whitespace(expr);
+        unsigned expr_len = strlen(expr) + 2;
         /* Stack of integers */
-        /* The proof that there can be no more than strlen(startbuf)/2+1 integers
-         * in any given correct or incorrect expression is left as an exercise to
-         * the reader. */
-        numstackptr = numstack = alloca((datasizes / 2) * sizeof(numstack[0]));
+        /* The proof that there can be no more than strlen(startbuf)/2+1
+         * integers in any given correct or incorrect expression
+         * is left as an exercise to the reader. */
+        var_or_num_t *const numstack = alloca((expr_len / 2) * sizeof(numstack[0]));
+        var_or_num_t *numstackptr = numstack;
         /* Stack of operator tokens */
-        stackptr = stack = alloca(datasizes * sizeof(stack[0]));
+        operator *const stack = alloca(expr_len * sizeof(stack[0]));
+        operator *stackptr = stack;
 
-        *stackptr++ = lasttok = TOK_LPAREN;     /* start off with a left paren */
-        *perrcode = errcode = 0;
+        /* Start with a left paren */
+        *stackptr++ = lasttok = TOK_LPAREN;
+        errmsg = NULL;
 
         while (1) {
+                const char *p;
+                operator op;
+                operator prec;
+                char arithval;
+
+                expr = skip_whitespace(expr);
                 arithval = *expr;
-                if (arithval == 0) {
-                        if (p == endexpression) {
-                                /* Null expression. */
-                                return 0;
+                if (arithval == '\0') {
+                        if (expr == start_expr) {
+                                /* Null expression */
+                                numstack->val = 0;
+                                goto ret;
                         }
 
                         /* This is only reached after all tokens have been extracted from the
@@ -527,77 +547,80 @@ arith(const char *expr, int *perrcode, a_e_h_t *math_hooks)
                          * are to be applied in order. At the end, there should be a final
                          * result on the integer stack */
 
-                        if (expr != endexpression + 1) {
-                                /* If we haven't done so already, */
-                                /* append a closing right paren */
-                                expr = endexpression;
-                                /* and let the loop process it. */
+                        if (expr != ptr_to_rparen + 1) {
+                                /* If we haven't done so already,
+                                 * append a closing right paren
+                                 * and let the loop process it */
+                                expr = ptr_to_rparen;
                                 continue;
                         }
-                        /* At this point, we're done with the expression. */
-                        if (numstackptr != numstack+1) {
-                                /* ... but if there isn't, it's bad */
- err:
-                                *perrcode = -1;
-                                return *perrcode;
+                        /* At this point, we're done with the expression */
+                        if (numstackptr != numstack + 1) {
+                                /* ...but if there isn't, it's bad */
+                                goto err;
                         }
                         if (numstack->var) {
                                 /* expression is $((var)) only, lookup now */
-                                errcode = arith_lookup_val(numstack, math_hooks);
+                                errmsg = arith_lookup_val(math_state, numstack);
                         }
- ret:
-                        *perrcode = errcode;
-                        return numstack->val;
+                        goto ret;
                 }
 
-                /* Continue processing the expression. */
-                if (arith_isspace(arithval)) {
-                        /* Skip whitespace */
-                        goto prologue;
-                }
                 p = endofname(expr);
                 if (p != expr) {
-                        size_t var_name_size = (p-expr) + 1;  /* trailing zero */
-
+                        /* Name */
+                        size_t var_name_size = (p-expr) + 1;  /* +1 for NUL */
                         numstackptr->var = alloca(var_name_size);
                         safe_strncpy(numstackptr->var, expr, var_name_size);
                         expr = p;
  num:
-                        numstackptr->contidional_second_val_initialized = 0;
+                        numstackptr->second_val_present = 0;
                         numstackptr++;
                         lasttok = TOK_NUM;
                         continue;
                 }
+
                 if (isdigit(arithval)) {
+                        /* Number */
                         numstackptr->var = NULL;
                         errno = 0;
-                        /* call strtoul[l]: */
-                        numstackptr->val = strto_arith_t(expr, (char **) &expr, 0);
+                        numstackptr->val = strto_arith_t(expr, (char**) &expr, 0);
                         if (errno)
                                 numstackptr->val = 0; /* bash compat */
                         goto num;
                 }
-                for (p = op_tokens; ; p++) {
-                        const char *o;
 
-                        if (*p == 0) {
-                                /* strange operator not found */
-                                goto err;
-                        }
-                        for (o = expr; *p && *o == *p; p++)
-                                o++;
-                        if (!*p) {
-                                /* found */
-                                expr = o - 1;
-                                break;
+                /* Should be an operator */
+                p = op_tokens;
+                while (1) {
+// TODO: bash allows 7+++v, treats it as 7 + ++v
+// we treat it as 7++ + v and reject
+                        /* Compare expr to current op_tokens[] element */
+                        const char *e = expr;
+                        while (1) {
+                                if (*p == '\0') {
+                                        /* Match: operator is found */
+                                        expr = e;
+                                        goto tok_found;
+                                }
+                                if (*p != *e)
+                                        break;
+                                p++;
+                                e++;
                         }
-                        /* skip tail uncompared token */
+                        /* No match, go to next element of op_tokens[] */
                         while (*p)
                                 p++;
-                        /* skip zero delim */
-                        p++;
+                        p += 2; /* skip NUL and TOK_foo bytes */
+                        if (*p == '\0') {
+                                /* No next element, operator not found */
+                                //math_state->syntax_error_at = expr;
+                                goto err;
+                        }
                 }
-                op = p[1];
+ tok_found:
+                op = p[1]; /* fetch TOK_foo value */
+                /* NB: expr now points past the operator */
 
                 /* post grammar: a++ reduce to num */
                 if (lasttok == TOK_POST_INC || lasttok == TOK_POST_DEC)
@@ -626,13 +649,13 @@ arith(const char *expr, int *perrcode, a_e_h_t *math_hooks)
                 /* We don't want an unary operator to cause recursive descent on the
                  * stack, because there can be many in a row and it could cause an
                  * operator to be evaluated before its argument is pushed onto the
-                 * integer stack. */
-                /* But for binary operators, "apply" everything on the operator
+                 * integer stack.
+                 * But for binary operators, "apply" everything on the operator
                  * stack until we find an operator with a lesser priority than the
-                 * one we have just extracted. */
-                /* Left paren is given the lowest priority so it will never be
+                 * one we have just extracted. If op is right-associative,
+                 * then stop "applying" on the equal priority too.
+                 * Left paren is given the lowest priority so it will never be
                  * "applied" in this way.
-                 * if associativity is right and priority eq, applied also skip
                  */
                 prec = PREC(op);
                 if ((prec > 0 && prec < UNARYPREC) || prec == SPEC_PREC) {
@@ -642,41 +665,56 @@ arith(const char *expr, int *perrcode, a_e_h_t *math_hooks)
                                 goto err;
                         }
                         while (stackptr != stack) {
+                                operator prev_op = *--stackptr;
                                 if (op == TOK_RPAREN) {
                                         /* The algorithm employed here is simple: while we don't
                                          * hit an open paren nor the bottom of the stack, pop
                                          * tokens and apply them */
-                                        if (stackptr[-1] == TOK_LPAREN) {
-                                                --stackptr;
-                                                /* Any operator directly after a */
+                                        if (prev_op == TOK_LPAREN) {
+                                                /* Any operator directly after a
+                                                 * close paren should consider itself binary */
                                                 lasttok = TOK_NUM;
-                                                /* close paren should consider itself binary */
-                                                goto prologue;
+                                                goto next;
                                         }
                                 } else {
-                                        operator prev_prec = PREC(stackptr[-1]);
-
-                                        convert_prec_is_assing(prec);
-                                        convert_prec_is_assing(prev_prec);
-                                        if (prev_prec < prec)
-                                                break;
-                                        /* check right assoc */
-                                        if (prev_prec == prec && is_right_associativity(prec))
+                                        operator prev_prec = PREC(prev_op);
+                                        fix_assignment_prec(prec);
+                                        fix_assignment_prec(prev_prec);
+                                        if (prev_prec < prec
+                                         || (prev_prec == prec && is_right_associative(prec))
+                                        ) {
+                                                stackptr++;
                                                 break;
+                                        }
                                 }
-                                errcode = arith_apply(*--stackptr, numstack, &numstackptr, math_hooks);
-                                if (errcode) goto ret;
+                                errmsg = arith_apply(math_state, prev_op, numstack, &numstackptr);
+                                if (errmsg)
+                                        goto err_with_custom_msg;
                         }
-                        if (op == TOK_RPAREN) {
+                        if (op == TOK_RPAREN)
                                 goto err;
-                        }
                 }
 
-                /* Push this operator to the stack and remember it. */
+                /* Push this operator to the stack and remember it */
                 *stackptr++ = lasttok = op;
- prologue:
-                ++expr;
-        } /* while */
+ next: ;
+        } /* while (1) */
+
+ err:
+        errmsg = "arithmetic syntax error";
+ err_with_custom_msg:
+        numstack->val = -1;
+ ret:
+        math_state->errmsg = errmsg;
+        return numstack->val;
+}
+
+arith_t FAST_FUNC
+arith(arith_state_t *math_state, const char *expr)
+{
+        math_state->errmsg = NULL;
+        math_state->list_of_recursed_names = NULL;
+        return evaluate_string(math_state, expr);
 }
 
 /*
diff --git a/shell/math.h b/shell/math.h
index 96088b4d2..2d305eb12 100644
--- a/shell/math.h
+++ b/shell/math.h
@@ -9,67 +9,53 @@
 
 /* The math library has just one function:
  *
- *      arith_t arith(const char *expr, int *perrcode, arith_eval_hooks_t *hooks);
+ * arith_t arith(arith_state_t *state, const char *expr);
  *
- *      The first argument is the math string to parse.  All normal expansions must
- *      be done already.  i.e. no dollar symbols should be present.
+ * The expr argument is the math string to parse.  All normal expansions must
+ * be done already.  i.e. no dollar symbols should be present.
  *
- *      The second argument is a semi-detailed error description in case something
- *      goes wrong in the parsing steps.  Currently, those values are (for
- *      compatibility, you should assume all negative values are errors):
- *               0 - no errors (yay!)
- *              -1 - unspecified problem
- *              -2 - divide by zero
- *              -3 - exponent less than 0
- *              -5 - expression recursion loop detected
+ * The state argument is a pointer to a struct of hooks for your shell (see below),
+ * and an error message string (NULL if no error).
  *
- *      The third argument is a struct pointer of hooks for your shell (see below).
- *
- *      The function returns the answer to the expression.  So if you called it
- *      with the expression:
- *              "1 + 2 + 3"
- *      You would obviously get back 6.
+ * The function returns the answer to the expression.  So if you called it
+ * with the expression:
+ * "1 + 2 + 3"
+ * you would obviously get back 6.
  */
 
 /* To add support to a shell, you need to implement three functions:
  *
- *      lookupvar() - look up and return the value of a variable
+ * lookupvar() - look up and return the value of a variable
  *
- *              If the shell does:
- *                      foo=123
- *              Then the code:
- *                      const char *val = lookupvar("foo");
- *              Will result in val pointing to "123"
+ *      If the shell does:
+ *              foo=123
+ *      Then the code:
+ *              const char *val = lookupvar("foo");
+ *      will result in val pointing to "123"
  *
- *      setvar() - set a variable to some value
+ * setvar() - set a variable to some value
  *
- *              If the arithmetic expansion does something like:
- *                      $(( i = 1))
- *              Then the math code will make a call like so:
- *                      setvar("i", "1", 0);
- *              The storage for the first two parameters are not allocated, so your
- *              shell implementation will most likely need to strdup() them to save.
+ *      If the arithmetic expansion does something like:
+ *              $(( i = 1))
+ *      then the math code will make a call like so:
+ *              setvar("i", "1", 0);
+ *      The storage for the first two parameters are not allocated, so your
+ *      shell implementation will most likely need to strdup() them to save.
  *
- *      endofname() - return the end of a variable name from input
+ * endofname() - return the end of a variable name from input
  *
- *              The arithmetic code does not know about variable naming conventions.
- *              So when it is given an experession, it knows something is not numeric,
- *              but it is up to the shell to dictate what is a valid identifiers.
- *              So when it encounters something like:
- *                      $(( some_var + 123 ))
- *              It will make a call like so:
- *                      end = endofname("some_var + 123");
- *              So the shell needs to scan the input string and return a pointer to the
- *              first non-identifier string.  In this case, it should return the input
- *              pointer with an offset pointing to the first space.  The typical
- *              implementation will return the offset of first char that does not match
- *              the regex (in C locale): ^[a-zA-Z_][a-zA-Z_0-9]*
- */
-
-/* To make your life easier when dealing with optional 64bit math support,
- * rather than assume that the type is "signed long" and you can always
- * use "%ld" to scan/print the value, use the arith_t helper defines.  See
- * below for the exact things that are available.
+ *      The arithmetic code does not know about variable naming conventions.
+ *      So when it is given an experession, it knows something is not numeric,
+ *      but it is up to the shell to dictate what is a valid identifiers.
+ *      So when it encounters something like:
+ *              $(( some_var + 123 ))
+ *      It will make a call like so:
+ *              end = endofname("some_var + 123");
+ *      So the shell needs to scan the input string and return a pointer to the
+ *      first non-identifier string.  In this case, it should return the input
+ *      pointer with an offset pointing to the first space.  The typical
+ *      implementation will return the offset of first char that does not match
+ *      the regex (in C locale): ^[a-zA-Z_][a-zA-Z_0-9]*
  */
 
 #ifndef SHELL_MATH_H
@@ -79,11 +65,11 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
 #if ENABLE_SH_MATH_SUPPORT_64
 typedef long long arith_t;
-#define arith_t_fmt "%lld"
+#define ARITH_FMT "%lld"
 #define strto_arith_t strtoull
 #else
 typedef long arith_t;
-#define arith_t_fmt "%ld"
+#define ARITH_FMT "%ld"
 #define strto_arith_t strtoul
 #endif
 
@@ -96,13 +82,15 @@ typedef const char* FAST_FUNC (*arith_var_lookup_t)(const char *name);
 typedef void        FAST_FUNC (*arith_var_set_t)(const char *name, const char *val);
 //typedef const char* FAST_FUNC (*arith_var_endofname_t)(const char *name);
 
-typedef struct arith_eval_hooks {
+typedef struct arith_state_t {
+        const char           *errmsg;
         arith_var_lookup_t    lookupvar;
         arith_var_set_t       setvar;
 //      arith_var_endofname_t endofname;
-} arith_eval_hooks_t;
+        void                 *list_of_recursed_names;
+} arith_state_t;
 
-arith_t arith(const char *expr, int *perrcode, arith_eval_hooks_t*);
+arith_t FAST_FUNC arith(arith_state_t *state, const char *expr);
 
 POP_SAVED_FUNCTION_VISIBILITY
 
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index 9e5e5a0f1..56b11ca46 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -24,6 +24,12 @@ testing "awk hex const 2" "awk '{ print or(0x80000000,1) }'" "2.14748e+09\n" ""
 testing "awk oct const"   "awk '{ print or(01234,1) }'"      "669\n"         "" "\n"
 SKIP=
 
+# check that "hex/oct integer" heuristic doesn't kick in on 00NN.NNN
+testing "awk floating const with leading zeroes" \
+        "awk '{ printf \"%f %f\n\", \"000.123\", \"009.123\" }'" \
+        "0.123000 9.123000\n" \
+        "" "\n"
+
 # long field seps requiring regex
 testing "awk long field sep" "awk -F-- '{ print NF, length(\$NF), \$NF }'" \
         "2 0 \n3 0 \n4 0 \n5 0 \n" \
diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
index 05b92dbe4..4cd441a60 100755
--- a/testsuite/cpio.tests
+++ b/testsuite/cpio.tests
@@ -116,6 +116,16 @@ link
 " "" ""
 SKIP=
 
+# avoid 'not created: newer or same age file exists' message for directories
+rm -rf cpio.testdir cpio.testdir2 2>/dev/null
+mkdir cpio.testdir
+testing "cpio extracts in existing directory" \
+"$ECHO -ne '$hexdump' | bzcat | cpio -id 2>&1; echo \$?" \
+"\
+1 blocks
+0
+" "" ""
+SKIP=
 
 # Clean up
 rm -rf cpio.testdir cpio.testdir2 2>/dev/null
diff --git a/testsuite/gunzip.tests b/testsuite/gunzip.tests
index d7810044f..68c07555d 100755
--- a/testsuite/gunzip.tests
+++ b/testsuite/gunzip.tests
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-. bunzip2.tests
+. ./bunzip2.tests
diff --git a/testsuite/md5sum.tests b/testsuite/md5sum.tests
new file mode 100755
index 000000000..35ec67cb4
--- /dev/null
+++ b/testsuite/md5sum.tests
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Used by {ms5,shaN}sum
+
+# We pipe texts 0...999 bytes long, {md5,shaN}sum them,
+# then {md5,shaN}sum the resulting list.
+# Then we compare the result with expected result.
+#
+# Here are the expected results:
+# efe30c482e0b687e0cca0612f42ca29b
+# d41337e834377140ae7f98460d71d908598ef04f
+# 8e1d3ed57ebc130f0f72508446559eeae06451ae6d61b1e8ce46370cfb8963c3
+# fe413e0f177324d1353893ca0772ceba83fd41512ba63895a0eebb703ef9feac2fb4e92b2cb430b3bda41b46b0cb4ea8307190a5cc795157cfb680a9cd635d0f
+
+if ! test "$1"; then
+        set -- md5sum efe30c482e0b687e0cca0612f42ca29b
+fi
+
+sum="$1"
+expected="$2"
+
+text="The quick brown fox jumps over the lazy dog"
+text=`yes "$text" | head -c 9999`
+
+result=`(
+n=0
+while test $n -le 999; do
+        echo "$text" | head -c $n | "$sum"
+        : $((n++))
+done | "$sum"
+)`
+
+if test x"$result" = x"$expected  -"; then
+    echo "PASS: $sum"
+    exit 0
+fi
+
+echo "FAIL: $sum (r:$result exp:$expected)"
+exit 1
diff --git a/testsuite/sha1sum.tests b/testsuite/sha1sum.tests
new file mode 100755
index 000000000..a968fa87c
--- /dev/null
+++ b/testsuite/sha1sum.tests
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+. ./md5sum.tests sha1sum d41337e834377140ae7f98460d71d908598ef04f
diff --git a/testsuite/sha256sum.tests b/testsuite/sha256sum.tests
new file mode 100755
index 000000000..d2dd78f2a
--- /dev/null
+++ b/testsuite/sha256sum.tests
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+. ./md5sum.tests sha256sum 8e1d3ed57ebc130f0f72508446559eeae06451ae6d61b1e8ce46370cfb8963c3
diff --git a/testsuite/sha512sum.tests b/testsuite/sha512sum.tests
new file mode 100755
index 000000000..3bc7cae4f
--- /dev/null
+++ b/testsuite/sha512sum.tests
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+. ./md5sum.tests sha512sum fe413e0f177324d1353893ca0772ceba83fd41512ba63895a0eebb703ef9feac2fb4e92b2cb430b3bda41b46b0cb4ea8307190a5cc795157cfb680a9cd635d0f
diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index c3b3c8b0b..5a3bd5a6a 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -7,27 +7,58 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-
+#include <syslog.h>
 #include <linux/input.h>
-#ifndef EV_SW
-# define EV_SW         0x05
-#endif
-#ifndef EV_KEY
-# define EV_KEY        0x01
-#endif
-#ifndef SW_LID
-# define SW_LID        0x00
-#endif
-#ifndef SW_RFKILL_ALL
-# define SW_RFKILL_ALL 0x03
-#endif
-#ifndef KEY_POWER
-# define KEY_POWER     116     /* SC System Power Down */
-#endif
-#ifndef KEY_SLEEP
-# define KEY_SLEEP     142     /* SC System Sleep */
-#endif
 
+enum {
+        OPT_c = (1 << 0),
+        OPT_d = (1 << 1),
+        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),
+};
+
+struct acpi_event {
+        const char *s_type;
+        uint16_t n_type;
+        const char *s_code;
+        uint16_t n_code;
+        uint32_t value;
+        const char *desc;
+};
+
+static const struct acpi_event f_evt_tab[] = {
+        { "EV_KEY", 0x01, "KEY_POWER", 116, 1, "button/power PWRF 00000080" },
+        { "EV_KEY", 0x01, "KEY_POWER", 116, 1, "button/power PWRB 00000080" },
+};
+
+struct acpi_action {
+        const char *key;
+        const char *action;
+};
+
+static const struct acpi_action f_act_tab[] = {
+        { "PWRF", "PWRF/00000080" },
+        { "LID0", "LID/00000080" },
+};
+
+struct globals {
+        struct acpi_action *act_tab;
+        int n_act;
+        struct acpi_event *evt_tab;
+        int n_evt;
+} FIX_ALIASING;
+#define G (*ptr_to_globals)
+#define act_tab         (G.act_tab)
+#define n_act           (G.n_act  )
+#define evt_tab         (G.evt_tab)
+#define n_evt           (G.n_evt  )
+#define INIT_G() do { \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
 
 /*
  * acpid listens to ACPI events coming either in textual form
@@ -48,7 +79,7 @@ static void process_event(const char *event)
         const char *args[] = { "run-parts", handler, NULL };
 
         // debug info
-        if (option_mask32 & 8) { // -d
+        if (option_mask32 & OPT_d) {
                 bb_error_msg("%s", event);
         }
 
@@ -60,125 +91,204 @@ static void process_event(const char *event)
                 spawn((char **)args + (0==(st.st_mode & S_IFDIR)));
         else
                 bb_simple_perror_msg(event);
+
         free(handler);
 }
 
+static const char *find_action(struct input_event *ev, const char *buf)
+{
+        const char *action = NULL;
+        int i;
+
+        // map event
+        for (i = 0; i < n_evt; i++) {
+                if (ev) {
+                        if (ev->type == evt_tab[i].n_type && ev->code == evt_tab[i].n_code && ev->value == evt_tab[i].value) {
+                                action = evt_tab[i].desc;
+                                break;
+                        }
+                }
+
+                if (buf) {
+                        if (strncmp(buf, evt_tab[i].desc, strlen(buf)) == 0) {
+                                action = evt_tab[i].desc;
+                                break;
+                        }
+                }
+        }
+
+        // get action
+        if (action) {
+                for (i = 0; i < n_act; i++) {
+                        if (strstr(action, act_tab[i].key)) {
+                                action = act_tab[i].action;
+                                break;
+                        }
+                }
+        }
+
+        return action;
+}
+
+static void parse_conf_file(const char *filename)
+{
+        parser_t *parser;
+        char *tokens[2];
+
+        parser = config_open2(filename, fopen_for_read);
+
+        if (parser) {
+                while (config_read(parser, tokens, 2, 2, "# \t", PARSE_NORMAL)) {
+                        act_tab = xrealloc_vector(act_tab, 1, n_act);
+                        act_tab[n_act].key = xstrdup(tokens[0]);
+                        act_tab[n_act].action = xstrdup(tokens[1]);
+                        n_act++;
+                }
+                config_close(parser);
+        } else {
+                act_tab = (void*)f_act_tab;
+                n_act = ARRAY_SIZE(f_act_tab);
+        }
+}
+
+static void parse_map_file(const char *filename)
+{
+        parser_t *parser;
+        char *tokens[6];
+
+        parser = config_open2(filename, fopen_for_read);
+
+        if (parser) {
+                while (config_read(parser, tokens, 6, 6, "# \t", PARSE_NORMAL)) {
+                        evt_tab = xrealloc_vector(evt_tab, 1, n_evt);
+                        evt_tab[n_evt].s_type = xstrdup(tokens[0]);
+                        evt_tab[n_evt].n_type = xstrtou(tokens[1], 16);
+                        evt_tab[n_evt].s_code = xstrdup(tokens[2]);
+                        evt_tab[n_evt].n_code = xatou16(tokens[3]);
+                        evt_tab[n_evt].value = xatoi_positive(tokens[4]);
+                        evt_tab[n_evt].desc = xstrdup(tokens[5]);
+                        n_evt++;
+                }
+                config_close(parser);
+        } else {
+                evt_tab = (void*)f_evt_tab;
+                n_evt = ARRAY_SIZE(f_evt_tab);
+        }
+}
+
 /*
- * acpid [-c conf_dir] [-l log_file] [-e proc_event_file] [evdev_event_file...]
-*/
+ * acpid [-c conf_dir] [-r conf_file ] [-a map_file ] [-l log_file] [-e proc_event_file]
+ */
 
 int acpid_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int acpid_main(int argc, char **argv)
+int acpid_main(int argc UNUSED_PARAM, char **argv)
 {
+        struct input_event ev;
+        int nfd;
+        int opts;
         struct pollfd *pfd;
-        int i, nfd;
-        const char *opt_conf = "/etc/acpi";
-        const char *opt_input = "/proc/acpi/event";
+        const char *opt_dir = "/etc/acpi";
+        const char *opt_input = "/dev/input/event";
         const char *opt_logfile = "/var/log/acpid.log";
+        const char *opt_action = "/etc/acpid.conf";
+        const char *opt_map = "/etc/acpi.map";
+#if ENABLE_FEATURE_PIDFILE
+        const char *opt_pidfile = "/var/run/acpid.pid";
+#endif
+
+        INIT_G();
 
-        getopt32(argv, "c:e:l:d"
-                IF_FEATURE_ACPID_COMPAT("g:m:s:S:v"),
-                &opt_conf, &opt_input, &opt_logfile
-                IF_FEATURE_ACPID_COMPAT(, NULL, NULL, NULL, NULL, NULL)
+        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
+                IF_FEATURE_ACPID_COMPAT(, NULL, NULL, NULL, NULL)
         );
 
-        // daemonize unless -d given
-        if (!(option_mask32 & 8)) { // ! -d
-                bb_daemonize_or_rexec(0, argv);
-                close(2);
-                xopen(opt_logfile, O_WRONLY | O_CREAT | O_TRUNC);
+        if (!(opts & OPT_f)) {
+                bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS, argv);
         }
 
-        argv += optind;
-        argc -= optind;
+        if (!(opts & OPT_d)) {
+                openlog(applet_name, LOG_PID, LOG_DAEMON);
+                logmode = LOGMODE_SYSLOG | LOGMODE_STDIO;
+        } else {
+                xmove_fd(xopen(opt_logfile, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
+        }
 
-        // goto configuration directory
-        xchdir(opt_conf);
+        parse_conf_file(opt_action);
+        parse_map_file(opt_map);
 
-        // prevent zombies
-        signal(SIGCHLD, SIG_IGN);
+        xchdir(opt_dir);
 
-        // no explicit evdev files given? -> use proc event interface
-        if (!*argv) {
-                // proc_event file is just a "config" :)
-                char *token[4];
-                parser_t *parser = config_open(opt_input);
+        bb_signals((1 << SIGCHLD), SIG_IGN);
+        bb_signals(BB_FATAL_SIGS, record_signo);
 
-                // dispatch events
-                while (config_read(parser, token, 4, 4, "\0 ", PARSE_NORMAL)) {
-                        char *event = xasprintf("%s/%s", token[1], token[2]);
-                        process_event(event);
-                        free(event);
-                }
+        pfd = NULL;
+        nfd = 0;
+        while (1) {
+                int fd;
+                char *dev_event;
 
-                if (ENABLE_FEATURE_CLEAN_UP)
-                        config_close(parser);
-                return EXIT_SUCCESS;
+                dev_event = xasprintf((option_mask32 & OPT_e) ? "%s" : "%s%u", opt_input, nfd);
+                fd = open(dev_event, O_RDONLY | O_NONBLOCK);
+                if (fd < 0) {
+                        if (nfd == 0)
+                                bb_simple_perror_msg_and_die(dev_event);
+                        break;
+                }
+                pfd = xrealloc_vector(pfd, 1, nfd);
+                pfd[nfd].fd = fd;
+                pfd[nfd].events = POLLIN;
+                nfd++;
         }
 
-        // evdev files given, use evdev interface
-
-        // open event devices
-        pfd = xzalloc(sizeof(*pfd) * argc);
-        nfd = 0;
-        while (*argv) {
-                pfd[nfd].fd = open_or_warn(*argv++, O_RDONLY | O_NONBLOCK);
-                if (pfd[nfd].fd >= 0)
-                        pfd[nfd++].events = POLLIN;
-        }
+        write_pidfile(opt_pidfile);
 
-        // dispatch events
-        while (/* !bb_got_signal && */ poll(pfd, nfd, -1) > 0) {
+        while (poll(pfd, nfd, -1) > 0) {
+                int i;
                 for (i = 0; i < nfd; i++) {
-                        const char *event;
-                        struct input_event ev;
+                        const char *event = NULL;
 
-                        if (!(pfd[i].revents & POLLIN))
-                                continue;
+                        memset(&ev, 0, sizeof(ev));
 
-                        if (sizeof(ev) != full_read(pfd[i].fd, &ev, sizeof(ev)))
-                                continue;
-//bb_info_msg("%d: %d %d %4d", i, ev.type, ev.code, ev.value);
-
-                        // filter out unneeded events
-                        if (ev.value != 1)
+                        if (!(pfd[i].revents & POLLIN))
                                 continue;
 
-                        event = NULL;
+                        if (option_mask32 & OPT_e) {
+                                char *buf;
+                                int len;
 
-                        // N.B. we will conform to /proc/acpi/event
-                        // naming convention when assigning event names
+                                buf = xmalloc_reads(pfd[i].fd, NULL, NULL);
+                                /* buf = "button/power PWRB 00000080 00000000" */
+                                len = strlen(buf) - 9;
+                                if (len >= 0)
+                                        buf[len] = '\0';
+                                event = find_action(NULL, buf);
+                        } else {
+                                if (sizeof(ev) != full_read(pfd[i].fd, &ev, sizeof(ev)))
+                                        continue;
 
-                        // TODO: do we want other events?
+                                if (ev.value != 1 && ev.value != 0)
+                                        continue;
 
-                        // power and sleep buttons delivered as keys pressed
-                        if (EV_KEY == ev.type) {
-                                if (KEY_POWER == ev.code)
-                                        event = "PWRF/00000080";
-                                else if (KEY_SLEEP == ev.code)
-                                        event = "SLPB/00000080";
-                        }
-                        // switches
-                        else if (EV_SW == ev.type) {
-                                if (SW_LID == ev.code)
-                                        event = "LID/00000080";
-                                else if (SW_RFKILL_ALL == ev.code)
-                                        event = "RFKILL";
+                                event = find_action(&ev, NULL);
                         }
-                        // filter out unneeded events
                         if (!event)
                                 continue;
-
                         // spawn event handler
                         process_event(event);
                 }
         }
 
         if (ENABLE_FEATURE_CLEAN_UP) {
-                for (i = 0; i < nfd; i++)
-                        close(pfd[i].fd);
+                while (nfd--) {
+                        if (pfd[nfd].fd) {
+                                close(pfd[nfd].fd);
+                        }
+                }
                 free(pfd);
         }
+        remove_pidfile(opt_pidfile);
 
         return EXIT_SUCCESS;
 }