Merge branch 'busybox' into merge

59 files changed, 1260 insertions, 718 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 66a046052..f77ac8383 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -7,13 +7,16 @@
 #include "libbb.h"
 #include "bb_archive.h"
 
+/* Note: must be kept in sync with archival/lzop.c */
 enum {
         OPT_STDOUT     = 1 << 0,
         OPT_FORCE      = 1 << 1,
         /* only some decompressors: */
         OPT_VERBOSE    = 1 << 2,
-        OPT_DECOMPRESS = 1 << 3,
-        OPT_TEST       = 1 << 4,
+        OPT_QUIET      = 1 << 3,
+        OPT_DECOMPRESS = 1 << 4,
+        OPT_TEST       = 1 << 5,
+        SEAMLESS_MAGIC = (1 << 31) * SEAMLESS_COMPRESSION,
 };
 
 static
@@ -39,7 +42,7 @@ int FAST_FUNC bbunpack(char **argv,
 )
 {
         struct stat stat_buf;
-        IF_DESKTOP(long long) int status;
+        IF_DESKTOP(long long) int status = 0;
         char *filename, *new_name;
         smallint exitcode = 0;
         transformer_aux_data_t aux;
@@ -54,13 +57,27 @@ int FAST_FUNC bbunpack(char **argv,
 
                 /* Open src */
                 if (filename) {
-                        if (stat(filename, &stat_buf) != 0) {
-                                bb_simple_perror_msg(filename);
+                        if (!(option_mask32 & SEAMLESS_MAGIC)) {
+                                if (stat(filename, &stat_buf) != 0) {
+ err_name:
+                                        bb_simple_perror_msg(filename);
  err:
-                                exitcode = 1;
-                                goto free_name;
+                                        exitcode = 1;
+                                        goto free_name;
+                                }
+                                if (open_to_or_warn(STDIN_FILENO, filename, O_RDONLY, 0))
+                                        goto err;
+                        } else {
+                                /* "clever zcat" with FILE */
+                                int fd = open_zipped(filename);
+                                if (fd < 0)
+                                        goto err_name;
+                                xmove_fd(fd, STDIN_FILENO);
                         }
-                        if (open_to_or_warn(STDIN_FILENO, filename, O_RDONLY, 0))
+                } else
+                if (option_mask32 & SEAMLESS_MAGIC) {
+                        /* "clever zcat" on stdin */
+                        if (setup_unzip_on_fd(STDIN_FILENO, /*fail_if_not_detected*/ 0))
                                 goto err;
                 }
 
@@ -68,7 +85,7 @@ int FAST_FUNC bbunpack(char **argv,
                 if (option_mask32 & (OPT_STDOUT|OPT_TEST)) {
                         if (option_mask32 & OPT_TEST)
                                 if (open_to_or_warn(STDOUT_FILENO, bb_dev_null, O_WRONLY, 0))
-                                        goto err;
+                                        xfunc_die();
                         filename = NULL;
                 }
 
@@ -93,16 +110,22 @@ int FAST_FUNC bbunpack(char **argv,
                 }
 
                 /* Check that the input is sane */
-                if (isatty(STDIN_FILENO) && (option_mask32 & OPT_FORCE) == 0) {
+                if (!(option_mask32 & OPT_FORCE) && isatty(STDIN_FILENO)) {
                         bb_error_msg_and_die("compressed data not read from terminal, "
                                         "use -f to force it");
                 }
 
-                init_transformer_aux_data(&aux);
-                aux.check_signature = 1;
-                status = unpacker(&aux);
-                if (status < 0)
-                        exitcode = 1;
+                if (!(option_mask32 & SEAMLESS_MAGIC)) {
+                        init_transformer_aux_data(&aux);
+                        aux.check_signature = 1;
+                        status = unpacker(&aux);
+                        if (status < 0)
+                                exitcode = 1;
+                } else {
+                        if (bb_copyfd_eof(STDIN_FILENO, STDOUT_FILENO) < 0)
+                                /* Disk full, tty closed, etc. No point in continuing */
+                                xfunc_die();
+                }
 
                 if (!(option_mask32 & OPT_STDOUT))
                         xclose(STDOUT_FILENO); /* with error check! */
@@ -243,7 +266,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "-rw-rw-r--    1 andersen andersen  1761280 Apr 14 17:47 /tmp/BusyBox-0.43.tar\n"
 //usage:
 //usage:#define zcat_trivial_usage
-//usage:       "FILE"
+//usage:       "[FILE]..."
 //usage:#define zcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
 
@@ -294,11 +317,15 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(transformer_aux_data_t *aux)
 int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int gunzip_main(int argc UNUSED_PARAM, char **argv)
 {
-        getopt32(argv, "cfvdtn");
+        getopt32(argv, "cfvqdtn");
         argv += optind;
-        /* if called as zcat */
+
+        /* If called as zcat...
+         * Normally, "zcat" is just "gunzip -c".
+         * But if seamless magic is enabled, then we are much more clever.
+         */
         if (applet_name[1] == 'c')
-                option_mask32 |= OPT_STDOUT;
+                option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC;
 
         return bbunpack(argv, unpack_gunzip, make_new_name_gunzip, /*unused:*/ NULL);
 }
@@ -318,7 +345,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:#define bzcat_trivial_usage
-//usage:       "FILE"
+//usage:       "[FILE]..."
 //usage:#define bzcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
 //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -332,7 +359,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_aux_data_t *aux)
 int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 {
-        getopt32(argv, "cfvdt");
+        getopt32(argv, "cfvqdt");
         argv += optind;
         if (applet_name[2] == 'c') /* bzcat */
                 option_mask32 |= OPT_STDOUT;
@@ -367,7 +394,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -f      Force"
 //usage:
 //usage:#define lzcat_trivial_usage
-//usage:       "FILE"
+//usage:       "[FILE]..."
 //usage:#define lzcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
 //usage:
@@ -387,7 +414,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -f      Force"
 //usage:
 //usage:#define xzcat_trivial_usage
-//usage:       "FILE"
+//usage:       "[FILE]..."
 //usage:#define xzcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
 
@@ -400,7 +427,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_aux_data_t *aux)
 int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int unlzma_main(int argc UNUSED_PARAM, char **argv)
 {
-        IF_LZMA(int opts =) getopt32(argv, "cfvdt");
+        IF_LZMA(int opts =) getopt32(argv, "cfvqdt");
 # if ENABLE_LZMA
         /* lzma without -d or -t? */
         if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
@@ -425,7 +452,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(transformer_aux_data_t *aux)
 int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int unxz_main(int argc UNUSED_PARAM, char **argv)
 {
-        IF_XZ(int opts =) getopt32(argv, "cfvdt");
+        IF_XZ(int opts =) getopt32(argv, "cfvqdt");
 # if ENABLE_XZ
         /* xz without -d or -t? */
         if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 3f67b835f..45776dcbe 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -106,15 +106,28 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         switch (file_header->mode & S_IFMT) {
         case S_IFREG: {
                 /* Regular file */
+                char *dst_name;
                 int flags = O_WRONLY | O_CREAT | O_EXCL;
                 if (archive_handle->ah_flags & ARCHIVE_O_TRUNC)
                         flags = O_WRONLY | O_CREAT | O_TRUNC;
-                dst_fd = xopen3(file_header->name,
+                dst_name = file_header->name;
+#ifdef ARCHIVE_REPLACE_VIA_RENAME
+                if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME)
+                        /* rpm-style temp file name */
+                        dst_name = xasprintf("%s;%x", dst_name, (int)getpid());
+#endif
+                dst_fd = xopen3(dst_name,
                         flags,
                         file_header->mode
                         );
                 bb_copyfd_exact_size(archive_handle->src_fd, dst_fd, file_header->size);
                 close(dst_fd);
+#ifdef ARCHIVE_REPLACE_VIA_RENAME
+                if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME) {
+                        xrename(dst_name, file_header->name);
+                        free(dst_name);
+                }
+#endif
                 break;
         }
         case S_IFDIR:
diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index cfde8ea56..ca32bd82c 100644
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -45,16 +45,16 @@ typedef struct {
 #define RC_MODEL_TOTAL_BITS 11
 
 
-/* Called twice: once at startup (LZMA_FAST only) and once in rc_normalize() */
-static size_inline void rc_read(rc_t *rc)
+/* Called once in rc_do_normalize() */
+static void rc_read(rc_t *rc)
 {
         int buffer_size = safe_read(rc->fd, RC_BUFFER, RC_BUFFER_SIZE);
 //TODO: return -1 instead
 //This will make unlzma delete broken unpacked file on unpack errors
         if (buffer_size <= 0)
                 bb_error_msg_and_die("unexpected EOF");
-        rc->ptr = RC_BUFFER;
         rc->buffer_end = RC_BUFFER + buffer_size;
+        rc->ptr = RC_BUFFER;
 }
 
 /* Called twice, but one callsite is in speed_inline'd rc_is_bit_1() */
@@ -65,6 +65,12 @@ static void rc_do_normalize(rc_t *rc)
         rc->range <<= 8;
         rc->code = (rc->code << 8) | *rc->ptr++;
 }
+static ALWAYS_INLINE void rc_normalize(rc_t *rc)
+{
+        if (rc->range < (1 << RC_TOP_BITS)) {
+                rc_do_normalize(rc);
+        }
+}
 
 /* Called once */
 static ALWAYS_INLINE rc_t* rc_init(int fd) /*, int buffer_size) */
@@ -78,15 +84,9 @@ static ALWAYS_INLINE rc_t* rc_init(int fd) /*, int buffer_size) */
         /* rc->ptr = rc->buffer_end; */
 
         for (i = 0; i < 5; i++) {
-#if ENABLE_FEATURE_LZMA_FAST
-                if (rc->ptr >= rc->buffer_end)
-                        rc_read(rc);
-                rc->code = (rc->code << 8) | *rc->ptr++;
-#else
                 rc_do_normalize(rc);
-#endif
         }
-        rc->range = 0xFFFFFFFF;
+        rc->range = 0xffffffff;
         return rc;
 }
 
@@ -96,13 +96,6 @@ static ALWAYS_INLINE void rc_free(rc_t *rc)
         free(rc);
 }
 
-static ALWAYS_INLINE void rc_normalize(rc_t *rc)
-{
-        if (rc->range < (1 << RC_TOP_BITS)) {
-                rc_do_normalize(rc);
-        }
-}
-
 /* rc_is_bit_1 is called 9 times */
 static speed_inline int rc_is_bit_1(rc_t *rc, uint16_t *p)
 {
@@ -120,7 +113,7 @@ static speed_inline int rc_is_bit_1(rc_t *rc, uint16_t *p)
 }
 
 /* Called 4 times in unlzma loop */
-static speed_inline int rc_get_bit(rc_t *rc, uint16_t *p, int *symbol)
+static ALWAYS_INLINE int rc_get_bit(rc_t *rc, uint16_t *p, int *symbol)
 {
         int ret = rc_is_bit_1(rc, p);
         *symbol = *symbol * 2 + ret;
diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index 79b48a152..986b7b191 100644
--- a/archival/libarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
 /* We use arch-optimized unaligned accessors */
 #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); })
 #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
-#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val))
-#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val))
+#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val))
+#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
 
 #include "unxz/xz_dec_bcj.c"
 #include "unxz/xz_dec_lzma2.c"
@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
 IF_DESKTOP(long long) int FAST_FUNC
 unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
 {
+        enum xz_ret xz_result;
         struct xz_buf iobuf;
         struct xz_dec *state;
         unsigned char *membuf;
@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
         /* Limit memory usage to about 64 MiB. */
         state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024);
 
+        xz_result = X_OK;
         while (1) {
-                enum xz_ret r;
-
                 if (iobuf.in_pos == iobuf.in_size) {
                         int rd = safe_read(src_fd, membuf, BUFSIZ);
                         if (rd < 0) {
@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
                                 total = -1;
                                 break;
                         }
+                        if (rd == 0 && xz_result == XZ_STREAM_END)
+                                break;
                         iobuf.in_size = rd;
                         iobuf.in_pos = 0;
                 }
+                if (xz_result == XZ_STREAM_END) {
+                        /*
+                         * Try to start decoding next concatenated stream.
+                         * Stream padding must always be a multiple of four
+                         * bytes to preserve four-byte alignment. To keep the
+                         * code slightly smaller, we aren't as strict here as
+                         * the .xz spec requires. We just skip all zero-bytes
+                         * without checking the alignment and thus can accept
+                         * files that aren't valid, e.g. the XZ utils test
+                         * files bad-0pad-empty.xz and bad-0catpad-empty.xz.
+                         */
+                        do {
+                                if (membuf[iobuf.in_pos] != 0) {
+                                        xz_dec_reset(state);
+                                        goto do_run;
+                                }
+                                iobuf.in_pos++;
+                        } while (iobuf.in_pos < iobuf.in_size);
+                }
+ do_run:
 //              bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
 //                              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
-                r = xz_dec_run(state, &iobuf);
+                xz_result = xz_dec_run(state, &iobuf);
 //              bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
-//                              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r);
+//                              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result);
                 if (iobuf.out_pos) {
                         xwrite(dst_fd, iobuf.out, iobuf.out_pos);
                         IF_DESKTOP(total += iobuf.out_pos;)
                         iobuf.out_pos = 0;
                 }
-                if (r == XZ_STREAM_END) {
-                        break;
+                if (xz_result == XZ_STREAM_END) {
+                        /*
+                         * Can just "break;" here, if not for concatenated
+                         * .xz streams.
+                         * Checking for padding may require buffer
+                         * replenishment. Can't do it here.
+                         */
+                        continue;
                 }
-                if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) {
+                if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) {
                         bb_error_msg("corrupted data");
                         total = -1;
                         break;
                 }
         }
+
         xz_dec_end(state);
         free(membuf);
 
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index f2edc2a2b..841e9dce9 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -35,6 +35,7 @@ void check_errors_in_children(int signo)
         if (!signo) {
                 /* block waiting for any child */
                 if (wait(&status) < 0)
+//FIXME: check EINTR?
                         return; /* probably there are no children */
                 goto check_status;
         }
@@ -42,14 +43,18 @@ void check_errors_in_children(int signo)
         /* Wait for any child without blocking */
         for (;;) {
                 if (wait_any_nohang(&status) < 0)
+//FIXME: check EINTR?
                         /* wait failed?! I'm confused... */
                         return;
  check_status:
-                if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+                /*if (WIFEXITED(status) && WEXITSTATUS(status) == 0)*/
+                /* On Linux, the above can be checked simply as: */
+                if (status == 0)
                         /* this child exited with 0 */
                         continue;
-                /* Cannot happen?
-                if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???; */
+                /* Cannot happen:
+                if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???;
+                 */
                 bb_got_signal = 1;
         }
 }
diff --git a/archival/libarchive/unxz/README b/archival/libarchive/unxz/README
index c5972f6b8..a84912035 100644
--- a/archival/libarchive/unxz/README
+++ b/archival/libarchive/unxz/README
@@ -7,7 +7,7 @@ XZ Embedded
 
     XZ Embedded was written for use in the Linux kernel, but the code can
     be easily used in other environments too, including regular userspace
-    applications.
+    applications. See userspace/xzminidec.c for an example program.
 
     This README contains information that is useful only when the copy
     of XZ Embedded isn't part of the Linux kernel tree. You should also
@@ -55,7 +55,7 @@ Compiler requirements
     code is modified not to support large files, which needs some more
     care than just using 32-bit integer instead of 64-bit).
 
-    If you use GCC, try to use a recent version. For example, on x86,
+    If you use GCC, try to use a recent version. For example, on x86-32,
     xz_dec_lzma2.c compiled with GCC 3.3.6 is 15-25 % slower than when
     compiled with GCC 4.3.3.
 
@@ -93,7 +93,7 @@ BCJ filter support
     them always #defined doesn't hurt either.
 
         #define             Instruction set     BCJ filter endianness
-        XZ_DEC_X86          x86 or x86-64       Little endian only
+        XZ_DEC_X86          x86-32 or x86-64    Little endian only
         XZ_DEC_POWERPC      PowerPC             Big endian only
         XZ_DEC_IA64         Itanium (IA-64)     Big or little endian
         XZ_DEC_ARM          ARM                 Little endian only
diff --git a/archival/libarchive/unxz/xz.h b/archival/libarchive/unxz/xz.h
index c6c071c4a..e0b22db56 100644
--- a/archival/libarchive/unxz/xz.h
+++ b/archival/libarchive/unxz/xz.h
@@ -19,6 +19,10 @@
 #       include <stdint.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* In Linux, this is used to make extern functions static when needed. */
 #ifndef XZ_EXTERN
 #       define XZ_EXTERN extern
@@ -70,7 +74,7 @@ enum xz_mode {
  * @XZ_UNSUPPORTED_CHECK:   Integrity check type is not supported. Decoding
  *                          is still possible in multi-call mode by simply
  *                          calling xz_dec_run() again.
- *                          NOTE: This return value is used only if
+ *                          Note that this return value is used only if
  *                          XZ_DEC_ANY_CHECK was defined at build time,
  *                          which is not used in the kernel. Unsupported
  *                          check types return XZ_OPTIONS_ERROR if
@@ -105,7 +109,7 @@ enum xz_mode {
  * stream that is truncated or otherwise corrupt.
  *
  * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
- * is too small, or the compressed input is corrupt in a way that makes the
+ * is too small or the compressed input is corrupt in a way that makes the
  * decoder produce more output than the caller expected. When it is
  * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
  * is used instead of XZ_BUF_ERROR.
@@ -207,8 +211,8 @@ XZ_EXTERN struct xz_dec * XZ_FUNC xz_dec_init(
  * The possible return values depend on build options and operation mode.
  * See enum xz_ret for details.
  *
- * NOTE: If an error occurs in single-call mode (return value is not
- * XZ_STREAM_END), b->in_pos and b->out_pos are not modified, and the
+ * Note that if an error occurs in single-call mode (return value is not
+ * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the
  * contents of the output buffer from b->out[b->out_pos] onward are
  * undefined. This is true even after XZ_BUF_ERROR, because with some filter
  * chains, there may be a second pass over the output buffer, and this pass
@@ -268,4 +272,9 @@ XZ_EXTERN void XZ_FUNC xz_crc32_init(void);
 XZ_EXTERN uint32_t XZ_FUNC xz_crc32(
                 const uint8_t *buf, size_t size, uint32_t crc);
 #endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/archival/libarchive/unxz/xz_dec_bcj.c b/archival/libarchive/unxz/xz_dec_bcj.c
index 09162b51f..e0f913a94 100644
--- a/archival/libarchive/unxz/xz_dec_bcj.c
+++ b/archival/libarchive/unxz/xz_dec_bcj.c
@@ -77,10 +77,13 @@ struct xz_dec_bcj {
 
 #ifdef XZ_DEC_X86
 /*
- * This is macro used to test the most significant byte of a memory address
+ * This is used to test the most significant byte of a memory address
  * in an x86 instruction.
  */
-#define bcj_x86_test_msbyte(b) ((b) == 0x00 || (b) == 0xFF)
+static inline int bcj_x86_test_msbyte(uint8_t b)
+{
+        return b == 0x00 || b == 0xFF;
+}
 
 static noinline_for_stack size_t XZ_FUNC bcj_x86(
                 struct xz_dec_bcj *s, uint8_t *buf, size_t size)
@@ -443,8 +446,12 @@ XZ_EXTERN enum xz_ret XZ_FUNC xz_dec_bcj_run(struct xz_dec_bcj *s,
          * next filter in the chain. Apply the BCJ filter on the new data
          * in the output buffer. If everything cannot be filtered, copy it
          * to temp and rewind the output buffer position accordingly.
+         *
+         * This needs to be always run when temp.size == 0 to handle a special
+         * case where the output buffer is full and the next filter has no
+         * more output coming but hasn't returned XZ_STREAM_END yet.
          */
-        if (s->temp.size < b->out_size - b->out_pos) {
+        if (s->temp.size < b->out_size - b->out_pos || s->temp.size == 0) {
                 out_start = b->out_pos;
                 memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size);
                 b->out_pos += s->temp.size;
@@ -467,16 +474,25 @@ XZ_EXTERN enum xz_ret XZ_FUNC xz_dec_bcj_run(struct xz_dec_bcj *s,
                 s->temp.size = b->out_pos - out_start;
                 b->out_pos -= s->temp.size;
                 memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size);
+
+                /*
+                 * If there wasn't enough input to the next filter to fill
+                 * the output buffer with unfiltered data, there's no point
+                 * to try decoding more data to temp.
+                 */
+                if (b->out_pos + s->temp.size < b->out_size)
+                        return XZ_OK;
         }
 
         /*
-         * If we have unfiltered data in temp, try to fill by decoding more
-         * data from the next filter. Apply the BCJ filter on temp. Then we
-         * hopefully can fill the actual output buffer by copying filtered
-         * data from temp. A mix of filtered and unfiltered data may be left
-         * in temp; it will be taken care on the next call to this function.
+         * We have unfiltered data in temp. If the output buffer isn't full
+         * yet, try to fill the temp buffer by decoding more data from the
+         * next filter. Apply the BCJ filter on temp. Then we hopefully can
+         * fill the actual output buffer by copying filtered data from temp.
+         * A mix of filtered and unfiltered data may be left in temp; it will
+         * be taken care on the next call to this function.
          */
-        if (s->temp.size > 0) {
+        if (b->out_pos < b->out_size) {
                 /* Make b->out{,_pos,_size} temporarily point to s->temp. */
                 s->out = b->out;
                 s->out_pos = b->out_pos;
diff --git a/archival/libarchive/unxz/xz_dec_lzma2.c b/archival/libarchive/unxz/xz_dec_lzma2.c
index da71cb4d4..3c2dc88b7 100644
--- a/archival/libarchive/unxz/xz_dec_lzma2.c
+++ b/archival/libarchive/unxz/xz_dec_lzma2.c
@@ -407,7 +407,6 @@ static void XZ_FUNC dict_uncompressed(
 
                 b->out_pos += copy_size;
                 b->in_pos += copy_size;
-
         }
 }
 
@@ -972,6 +971,9 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run(
                          */
                         tmp = b->in[b->in_pos++];
 
+                        if (tmp == 0x00)
+                                return XZ_STREAM_END;
+
                         if (tmp >= 0xE0 || tmp == 0x01) {
                                 s->lzma2.need_props = true;
                                 s->lzma2.need_dict_reset = false;
@@ -1004,9 +1006,6 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run(
                                                 lzma_reset(s);
                                 }
                         } else {
-                                if (tmp == 0x00)
-                                        return XZ_STREAM_END;
-
                                 if (tmp > 0x02)
                                         return XZ_DATA_ERROR;
 
diff --git a/archival/libarchive/unxz/xz_stream.h b/archival/libarchive/unxz/xz_stream.h
index 36f2a7cbf..66cb5a705 100644
--- a/archival/libarchive/unxz/xz_stream.h
+++ b/archival/libarchive/unxz/xz_stream.h
@@ -25,15 +25,20 @@
 
 #define STREAM_HEADER_SIZE 12
 
-#define HEADER_MAGIC "\3757zXZ\0"
+#define HEADER_MAGIC "\3757zXZ"
 #define HEADER_MAGIC_SIZE 6
 
 #define FOOTER_MAGIC "YZ"
 #define FOOTER_MAGIC_SIZE 2
 
 /*
- * Variable-length integer can hold a 63-bit unsigned integer, or a special
- * value to indicate that the value is unknown.
+ * Variable-length integer can hold a 63-bit unsigned integer or a special
+ * value indicating that the value is unknown.
+ *
+ * Experimental: vli_type can be defined to uint32_t to save a few bytes
+ * in code size (no effect on speed). Doing so limits the uncompressed and
+ * compressed size of the file to less than 256 MiB and may also weaken
+ * error detection slightly.
  */
 typedef uint64_t vli_type;
 
diff --git a/archival/lzop.c b/archival/lzop.c
index 56003d421..9b42e5fd3 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -436,25 +436,27 @@ struct globals {
 //#define LZOP_VERSION_STRING     "1.01"
 //#define LZOP_VERSION_DATE       "Apr 27th 2003"
 
-#define OPTION_STRING "cfvdt123456789CF"
+#define OPTION_STRING "cfvqdt123456789CF"
 
+/* Note: must be kept in sync with archival/bbunzip.c */
 enum {
         OPT_STDOUT      = (1 << 0),
         OPT_FORCE       = (1 << 1),
         OPT_VERBOSE     = (1 << 2),
-        OPT_DECOMPRESS  = (1 << 3),
-        OPT_TEST        = (1 << 4),
-        OPT_1           = (1 << 5),
-        OPT_2           = (1 << 6),
-        OPT_3           = (1 << 7),
-        OPT_4           = (1 << 8),
-        OPT_5           = (1 << 9),
-        OPT_6           = (1 << 10),
-        OPT_789         = (7 << 11),
-        OPT_7           = (1 << 11),
-        OPT_8           = (1 << 12),
-        OPT_C           = (1 << 14),
-        OPT_F           = (1 << 15),
+        OPT_QUIET       = (1 << 3),
+        OPT_DECOMPRESS  = (1 << 4),
+        OPT_TEST        = (1 << 5),
+        OPT_1           = (1 << 6),
+        OPT_2           = (1 << 7),
+        OPT_3           = (1 << 8),
+        OPT_4           = (1 << 9),
+        OPT_5           = (1 << 10),
+        OPT_6           = (1 << 11),
+        OPT_789         = (7 << 12),
+        OPT_7           = (1 << 13),
+        OPT_8           = (1 << 14),
+        OPT_C           = (1 << 15),
+        OPT_F           = (1 << 16),
 };
 
 /**********************************************************************/
@@ -1093,7 +1095,7 @@ int lzop_main(int argc UNUSED_PARAM, char **argv)
         if (applet_name[4] == 'c')
                 option_mask32 |= (OPT_STDOUT | OPT_DECOMPRESS);
         /* unlzop? */
-        if (applet_name[0] == 'u')
+        if (applet_name[4] == 'o')
                 option_mask32 |= OPT_DECOMPRESS;
 
         global_crc32_table = crc32_filltable(NULL, 0);
diff --git a/archival/rpm.c b/archival/rpm.c
index 6757a6ceb..86ba4dca4 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -14,10 +14,10 @@
 //usage:     "\nCommands:"
 //usage:     "\n        -i      Install package"
 //usage:     "\n        -qp     Query package"
-//usage:     "\n        -i      Show information"
-//usage:     "\n        -l      List contents"
-//usage:     "\n        -d      List documents"
-//usage:     "\n        -c      List config files"
+//usage:     "\n        -qpi    Show information"
+//usage:     "\n        -qpl    List contents"
+//usage:     "\n        -qpd    List documents"
+//usage:     "\n        -qpc    List config files"
 
 #include "libbb.h"
 #include "bb_archive.h"
@@ -79,136 +79,13 @@ typedef struct {
         uint32_t count; /* 4 byte count */
 } rpm_index;
 
-static void *map;
-static rpm_index **mytags;
-static int tagcount;
-
-static void extract_cpio(int fd, const char *source_rpm);
-static rpm_index **rpm_gettags(int fd, int *num_tags);
-static int bsearch_rpmtag(const void *key, const void *item);
-static char *rpm_getstr(int tag, int itemindex);
-static int rpm_getint(int tag, int itemindex);
-static int rpm_getcount(int tag);
-static void fileaction_dobackup(char *filename, int fileref);
-static void fileaction_setowngrp(char *filename, int fileref);
-static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref));
-
-int rpm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int rpm_main(int argc, char **argv)
-{
-        int opt = 0, func = 0, rpm_fd, offset;
-        const int pagesize = getpagesize();
-
-        while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
-                switch (opt) {
-                case 'i': /* First arg: Install mode, with q: Information */
-                        if (!func) func = rpm_install;
-                        else func |= rpm_query_info;
-                        break;
-                case 'q': /* First arg: Query mode */
-                        if (func) bb_show_usage();
-                        func = rpm_query;
-                        break;
-                case 'p': /* Query a package */
-                        func |= rpm_query_package;
-                        break;
-                case 'l': /* List files in a package */
-                        func |= rpm_query_list;
-                        break;
-                case 'd': /* List doc files in a package (implies list) */
-                        func |= rpm_query_list;
-                        func |= rpm_query_list_doc;
-                        break;
-                case 'c': /* List config files in a package (implies list) */
-                        func |= rpm_query_list;
-                        func |= rpm_query_list_config;
-                        break;
-                default:
-                        bb_show_usage();
-                }
-        }
-        argv += optind;
-        //argc -= optind;
-        if (!argv[0]) {
-                bb_show_usage();
-        }
-
-        while (*argv) {
-                const char *source_rpm;
-
-                rpm_fd = xopen(*argv++, O_RDONLY);
-                mytags = rpm_gettags(rpm_fd, &tagcount);
-                if (!mytags)
-                        bb_error_msg_and_die("error reading rpm header");
-                offset = xlseek(rpm_fd, 0, SEEK_CUR);
-                /* Mimimum is one page */
-                map = mmap(0, offset > pagesize ? (offset + offset % pagesize) : pagesize, PROT_READ, MAP_PRIVATE, rpm_fd, 0);
-
-                source_rpm = rpm_getstr(TAG_SOURCERPM, 0);
-
-                if (func & rpm_install) {
-                        /* Backup any config files */
-                        loop_through_files(TAG_BASENAMES, fileaction_dobackup);
-                        /* Extact the archive */
-                        extract_cpio(rpm_fd, source_rpm);
-                        /* Set the correct file uid/gid's */
-                        loop_through_files(TAG_BASENAMES, fileaction_setowngrp);
-                }
-                else if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) {
-                        if (!(func & (rpm_query_info|rpm_query_list))) {
-                                /* If just a straight query, just give package name */
-                                printf("%s-%s-%s\n", rpm_getstr(TAG_NAME, 0), rpm_getstr(TAG_VERSION, 0), rpm_getstr(TAG_RELEASE, 0));
-                        }
-                        if (func & rpm_query_info) {
-                                /* Do the nice printout */
-                                time_t bdate_time;
-                                struct tm *bdate_ptm;
-                                char bdatestring[50];
-                                const char *p;
-
-                                p = rpm_getstr(TAG_PREFIXS, 0);
-                                if (!p) p = "(not relocateable)";
-                                printf("Name        : %-29sRelocations: %s\n", rpm_getstr(TAG_NAME, 0), p);
-                                p = rpm_getstr(TAG_VENDOR, 0);
-                                if (!p) p = "(none)";
-                                printf("Version     : %-34sVendor: %s\n", rpm_getstr(TAG_VERSION, 0), p);
-                                bdate_time = rpm_getint(TAG_BUILDTIME, 0);
-                                bdate_ptm = localtime(&bdate_time);
-                                strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm);
-                                printf("Release     : %-30sBuild Date: %s\n", rpm_getstr(TAG_RELEASE, 0), bdatestring);
-                                printf("Install date: %-30sBuild Host: %s\n", "(not installed)", rpm_getstr(TAG_BUILDHOST, 0));
-                                printf("Group       : %-30sSource RPM: %s\n", rpm_getstr(TAG_GROUP, 0), source_rpm);
-                                printf("Size        : %-33dLicense: %s\n", rpm_getint(TAG_SIZE, 0), rpm_getstr(TAG_LICENSE, 0));
-                                printf("URL         : %s\n", rpm_getstr(TAG_URL, 0));
-                                printf("Summary     : %s\n", rpm_getstr(TAG_SUMMARY, 0));
-                                printf("Description :\n%s\n", rpm_getstr(TAG_DESCRIPTION, 0));
-                        }
-                        if (func & rpm_query_list) {
-                                int count, it, flags;
-                                count = rpm_getcount(TAG_BASENAMES);
-                                for (it = 0; it < count; it++) {
-                                        flags = rpm_getint(TAG_FILEFLAGS, it);
-                                        switch (func & (rpm_query_list_doc|rpm_query_list_config)) {
-                                        case rpm_query_list_doc:
-                                                if (!(flags & RPMFILE_DOC)) continue;
-                                                break;
-                                        case rpm_query_list_config:
-                                                if (!(flags & RPMFILE_CONFIG)) continue;
-                                                break;
-                                        case rpm_query_list_doc|rpm_query_list_config:
-                                                if (!(flags & (RPMFILE_CONFIG|RPMFILE_DOC))) continue;
-                                                break;
-                                        }
-                                        printf("%s%s\n",
-                                                rpm_getstr(TAG_DIRNAMES, rpm_getint(TAG_DIRINDEXES, it)),
-                                                rpm_getstr(TAG_BASENAMES, it));
-                                }
-                        }
-                }
-                free(mytags);
-        }
-        return 0;
-}
+struct globals {
+        void *map;
+        rpm_index **mytags;
+        int tagcount;
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define INIT_G() do { } while (0)
 
 static void extract_cpio(int fd, const char *source_rpm)
 {
@@ -231,8 +108,8 @@ static void extract_cpio(int fd, const char *source_rpm)
                 /* compat: overwrite existing files.
                  * try "rpm -i foo.src.rpm" few times in a row -
                  * standard rpm will not complain.
-                 * (TODO? real rpm creates "file;1234" and then renames it) */
-                | ARCHIVE_UNLINK_OLD;
+                 */
+                | ARCHIVE_REPLACE_VIA_RENAME;
         archive_handle->src_fd = fd;
         /*archive_handle->offset = 0; - init_handle() did it */
 
@@ -294,7 +171,7 @@ static int bsearch_rpmtag(const void *key, const void *item)
 static int rpm_getcount(int tag)
 {
         rpm_index **found;
-        found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
         if (!found)
                 return 0;
         return found[0]->count;
@@ -303,7 +180,7 @@ static int rpm_getcount(int tag)
 static char *rpm_getstr(int tag, int itemindex)
 {
         rpm_index **found;
-        found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
         if (!found || itemindex >= found[0]->count)
                 return NULL;
         if (found[0]->type == RPM_STRING_TYPE
@@ -311,7 +188,7 @@ static char *rpm_getstr(int tag, int itemindex)
          || found[0]->type == RPM_STRING_ARRAY_TYPE
         ) {
                 int n;
-                char *tmpstr = (char *) map + found[0]->offset;
+                char *tmpstr = (char *) G.map + found[0]->offset;
                 for (n = 0; n < itemindex; n++)
                         tmpstr = tmpstr + strlen(tmpstr) + 1;
                 return tmpstr;
@@ -322,32 +199,25 @@ static char *rpm_getstr(int tag, int itemindex)
 static int rpm_getint(int tag, int itemindex)
 {
         rpm_index **found;
-        int *tmpint; /* NB: using int8_t* would be easier to code */
+        char *tmpint;
 
         /* gcc throws warnings here when sizeof(void*)!=sizeof(int) ...
          * it's ok to ignore it because tag won't be used as a pointer */
-        found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
         if (!found || itemindex >= found[0]->count)
                 return -1;
 
-        tmpint = (int *) ((char *) map + found[0]->offset);
-
+        tmpint = (char *) G.map + found[0]->offset;
         if (found[0]->type == RPM_INT32_TYPE) {
-                tmpint = (int *) ((char *) tmpint + itemindex*4);
-                /*return ntohl(*tmpint);*/
-                /* int can be != int32_t */
+                tmpint += itemindex*4;
                 return ntohl(*(int32_t*)tmpint);
         }
         if (found[0]->type == RPM_INT16_TYPE) {
-                tmpint = (int *) ((char *) tmpint + itemindex*2);
-                /* ??? read int, and THEN ntohs() it?? */
-                /*return ntohs(*tmpint);*/
+                tmpint += itemindex*2;
                 return ntohs(*(int16_t*)tmpint);
         }
         if (found[0]->type == RPM_INT8_TYPE) {
-                tmpint = (int *) ((char *) tmpint + itemindex);
-                /* ??? why we don't read byte here??? */
-                /*return ntohs(*tmpint);*/
+                tmpint += itemindex;
                 return *(int8_t*)tmpint;
         }
         return -1;
@@ -392,3 +262,134 @@ static void loop_through_files(int filetag, void (*fileaction)(char *filename, i
                 free(filename);
         }
 }
+
+int rpm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rpm_main(int argc, char **argv)
+{
+        int opt, func = 0;
+        const unsigned pagesize = getpagesize();
+
+        while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
+                switch (opt) {
+                case 'i': /* First arg: Install mode, with q: Information */
+                        if (!func) func = rpm_install;
+                        else func |= rpm_query_info;
+                        break;
+                case 'q': /* First arg: Query mode */
+                        if (func) bb_show_usage();
+                        func = rpm_query;
+                        break;
+                case 'p': /* Query a package */
+                        func |= rpm_query_package;
+                        break;
+                case 'l': /* List files in a package */
+                        func |= rpm_query_list;
+                        break;
+                case 'd': /* List doc files in a package (implies list) */
+                        func |= rpm_query_list;
+                        func |= rpm_query_list_doc;
+                        break;
+                case 'c': /* List config files in a package (implies list) */
+                        func |= rpm_query_list;
+                        func |= rpm_query_list_config;
+                        break;
+                default:
+                        bb_show_usage();
+                }
+        }
+        argv += optind;
+        //argc -= optind;
+        if (!argv[0]) {
+                bb_show_usage();
+        }
+
+        while (*argv) {
+                int rpm_fd;
+                unsigned mapsize;
+                const char *source_rpm;
+
+                rpm_fd = xopen(*argv++, O_RDONLY);
+                G.mytags = rpm_gettags(rpm_fd, &G.tagcount);
+                if (!G.mytags)
+                        bb_error_msg_and_die("error reading rpm header");
+                mapsize = xlseek(rpm_fd, 0, SEEK_CUR);
+                mapsize = (mapsize + pagesize) & -(int)pagesize;
+                /* Some NOMMU systems prefer MAP_PRIVATE over MAP_SHARED */
+                G.map = mmap(0, mapsize, PROT_READ, MAP_PRIVATE, rpm_fd, 0);
+//FIXME: error check?
+
+                source_rpm = rpm_getstr(TAG_SOURCERPM, 0);
+
+                if (func & rpm_install) {
+                        /* Backup any config files */
+                        loop_through_files(TAG_BASENAMES, fileaction_dobackup);
+                        /* Extact the archive */
+                        extract_cpio(rpm_fd, source_rpm);
+                        /* Set the correct file uid/gid's */
+                        loop_through_files(TAG_BASENAMES, fileaction_setowngrp);
+                }
+                else if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) {
+                        if (!(func & (rpm_query_info|rpm_query_list))) {
+                                /* If just a straight query, just give package name */
+                                printf("%s-%s-%s\n", rpm_getstr(TAG_NAME, 0), rpm_getstr(TAG_VERSION, 0), rpm_getstr(TAG_RELEASE, 0));
+                        }
+                        if (func & rpm_query_info) {
+                                /* Do the nice printout */
+                                time_t bdate_time;
+                                struct tm *bdate_ptm;
+                                char bdatestring[50];
+                                const char *p;
+
+                                printf("%-12s: %s\n", "Name"        , rpm_getstr(TAG_NAME, 0));
+                                /* TODO compat: add "Epoch" here */
+                                printf("%-12s: %s\n", "Version"     , rpm_getstr(TAG_VERSION, 0));
+                                printf("%-12s: %s\n", "Release"     , rpm_getstr(TAG_RELEASE, 0));
+                                /* add "Architecture" */
+                                printf("%-12s: %s\n", "Install Date", "(not installed)");
+                                printf("%-12s: %s\n", "Group"       , rpm_getstr(TAG_GROUP, 0));
+                                printf("%-12s: %d\n", "Size"        , rpm_getint(TAG_SIZE, 0));
+                                printf("%-12s: %s\n", "License"     , rpm_getstr(TAG_LICENSE, 0));
+                                /* add "Signature" */
+                                printf("%-12s: %s\n", "Source RPM"  , source_rpm ? source_rpm : "(none)");
+                                bdate_time = rpm_getint(TAG_BUILDTIME, 0);
+                                bdate_ptm = localtime(&bdate_time);
+                                strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm);
+                                printf("%-12s: %s\n", "Build Date"  , bdatestring);
+                                printf("%-12s: %s\n", "Build Host"  , rpm_getstr(TAG_BUILDHOST, 0));
+                                p = rpm_getstr(TAG_PREFIXS, 0);
+                                printf("%-12s: %s\n", "Relocations" , p ? p : "(not relocatable)");
+                                /* add "Packager" */
+                                p = rpm_getstr(TAG_VENDOR, 0);
+                                printf("%-12s: %s\n", "Vendor"      , p ? p : "(none)");
+                                printf("%-12s: %s\n", "URL"         , rpm_getstr(TAG_URL, 0));
+                                printf("%-12s: %s\n", "Summary"     , rpm_getstr(TAG_SUMMARY, 0));
+                                printf("Description :\n%s\n", rpm_getstr(TAG_DESCRIPTION, 0));
+                        }
+                        if (func & rpm_query_list) {
+                                int count, it, flags;
+                                count = rpm_getcount(TAG_BASENAMES);
+                                for (it = 0; it < count; it++) {
+                                        flags = rpm_getint(TAG_FILEFLAGS, it);
+                                        switch (func & (rpm_query_list_doc|rpm_query_list_config)) {
+                                        case rpm_query_list_doc:
+                                                if (!(flags & RPMFILE_DOC)) continue;
+                                                break;
+                                        case rpm_query_list_config:
+                                                if (!(flags & RPMFILE_CONFIG)) continue;
+                                                break;
+                                        case rpm_query_list_doc|rpm_query_list_config:
+                                                if (!(flags & (RPMFILE_CONFIG|RPMFILE_DOC))) continue;
+                                                break;
+                                        }
+                                        printf("%s%s\n",
+                                                rpm_getstr(TAG_DIRNAMES, rpm_getint(TAG_DIRINDEXES, it)),
+                                                rpm_getstr(TAG_BASENAMES, it));
+                                }
+                        }
+                }
+                munmap(G.map, mapsize);
+                free(G.mytags);
+                close(rpm_fd);
+        }
+        return 0;
+}
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src
index b715b9c47..ec4ef7df2 100644
--- a/coreutils/Kbuild.src
+++ b/coreutils/Kbuild.src
@@ -35,7 +35,6 @@ lib-$(CONFIG_EXPAND)    += expand.o
 lib-$(CONFIG_FALSE)     += false.o
 lib-$(CONFIG_FOLD)      += fold.o
 lib-$(CONFIG_FSYNC)     += fsync.o
-lib-$(CONFIG_HEAD)      += head.o
 lib-$(CONFIG_INSTALL)   += install.o
 #lib-$(CONFIG_LENGTH)    += length.o
 lib-$(CONFIG_LN)        += ln.o
@@ -71,7 +70,6 @@ lib-$(CONFIG_STTY)      += stty.o
 lib-$(CONFIG_SUM)       += sum.o
 lib-$(CONFIG_SYNC)      += sync.o
 lib-$(CONFIG_TAC)       += tac.o
-lib-$(CONFIG_TAIL)      += tail.o
 lib-$(CONFIG_TEE)       += tee.o
 lib-$(CONFIG_TRUE)      += true.o
 lib-$(CONFIG_TTY)       += tty.o
diff --git a/coreutils/head.c b/coreutils/head.c
index ec4512765..291e1ce37 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -11,6 +11,9 @@
 /* BB_AUDIT GNU compatible -c, -q, and -v options in 'fancy' configuration. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/head.html */
 
+//kbuild:lib-$(CONFIG_HEAD) += head.o
+//kbuild:lib-$(CONFIG_HEAD) += head_tail.o
+
 //usage:#define head_trivial_usage
 //usage:       "[OPTIONS] [FILE]..."
 //usage:#define head_full_usage "\n\n"
@@ -18,7 +21,8 @@
 //usage:       "With more than one FILE, precede each with a filename header.\n"
 //usage:     "\n        -n N[kbm]       Print first N lines"
 //usage:        IF_FEATURE_FANCY_HEAD(
-//usage:     "\n        -c N[kbm]       Print first N bytes"
+//usage:     "\n        -n -N[kbm]      Print all except N last lines"
+//usage:     "\n        -c [-]N[kbm]    Print first N bytes"
 //usage:     "\n        -q              Never print headers"
 //usage:     "\n        -v              Always print headers"
 //usage:        )
@@ -31,9 +35,114 @@
 //usage:       "daemon:x:1:1:daemon:/usr/sbin:/bin/sh\n"
 
 #include "libbb.h"
+#include "head_tail.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
+#if !ENABLE_FEATURE_FANCY_HEAD
+# define print_first_N(fp,count,bytes) print_first_N(fp,count)
+#endif
+static void
+print_first_N(FILE *fp, unsigned long count, bool count_bytes)
+{
+#if !ENABLE_FEATURE_FANCY_HEAD
+        const int count_bytes = 0;
+#endif
+        while (count) {
+                int c = getc(fp);
+                if (c == EOF)
+                        break;
+                if (count_bytes || (c == '\n'))
+                        --count;
+                putchar(c);
+        }
+}
+
+#if ENABLE_FEATURE_FANCY_HEAD
+static void
+print_except_N_last_bytes(FILE *fp, unsigned count)
+{
+        unsigned char *circle = xmalloc(++count);
+        unsigned head = 0;
+        for(;;) {
+                int c;
+                c = getc(fp);
+                if (c == EOF)
+                        goto ret;
+                circle[head++] = c;
+                if (head == count)
+                        break;
+        }
+        for (;;) {
+                int c;
+                if (head == count)
+                        head = 0;
+                putchar(circle[head]);
+                c = getc(fp);
+                if (c == EOF)
+                        goto ret;
+                circle[head] = c;
+                head++;
+        }
+ ret:
+        free(circle);
+}
+
+static void
+print_except_N_last_lines(FILE *fp, unsigned count)
+{
+        char **circle = xzalloc((++count) * sizeof(circle[0]));
+        unsigned head = 0;
+        for(;;) {
+                char *c;
+                c = xmalloc_fgets(fp);
+                if (!c)
+                        goto ret;
+                circle[head++] = c;
+                if (head == count)
+                        break;
+        }
+        for (;;) {
+                char *c;
+                if (head == count)
+                        head = 0;
+                fputs(circle[head], stdout);
+                c = xmalloc_fgets(fp);
+                if (!c)
+                        goto ret;
+                free(circle[head]);
+                circle[head++] = c;
+        }
+ ret:
+        head = 0;
+        for(;;) {
+                free(circle[head++]);
+                if (head == count)
+                        break;
+        }
+        free(circle);
+}
+#else
+/* Must never be called */
+void print_except_N_last_bytes(FILE *fp, unsigned count);
+void print_except_N_last_lines(FILE *fp, unsigned count);
+#endif
+
+#if !ENABLE_FEATURE_FANCY_HEAD
+# define eat_num(negative_N,p) eat_num(p)
+#endif
+static unsigned long
+eat_num(bool *negative_N, const char *p)
+{
+#if ENABLE_FEATURE_FANCY_HEAD
+        if (*p == '-') {
+                *negative_N = 1;
+                p++;
+        }
+#endif
+        return xatoul_sfx(p, head_tail_suffixes);
+}
+
 static const char head_opts[] ALIGN1 =
         "n:"
 #if ENABLE_FEATURE_FANCY_HEAD
@@ -41,29 +150,25 @@ static const char head_opts[] ALIGN1 =
 #endif
         ;
 
-static const struct suffix_mult head_suffixes[] = {
-        { "b", 512 },
-        { "k", 1024 },
-        { "m", 1024*1024 },
-        { "", 0 }
-};
-
 #define header_fmt_str "\n==> %s <==\n"
 
 int head_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int head_main(int argc, char **argv)
 {
         unsigned long count = 10;
-        unsigned long i;
 #if ENABLE_FEATURE_FANCY_HEAD
-        int count_bytes = 0;
         int header_threshhold = 1;
+        bool count_bytes = 0;
+        bool negative_N = 0;
+#else
+# define header_threshhold 1
+# define count_bytes       0
+# define negative_N        0
 #endif
         FILE *fp;
         const char *fmt;
         char *p;
         int opt;
-        int c;
         int retval = EXIT_SUCCESS;
 
 #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
@@ -73,7 +178,7 @@ int head_main(int argc, char **argv)
         ) {
                 --argc;
                 ++argv;
-                p = (*argv) + 1;
+                p = argv[0] + 1;
                 goto GET_COUNT;
         }
 #endif
@@ -97,7 +202,7 @@ int head_main(int argc, char **argv)
 #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
  GET_COUNT:
 #endif
-                        count = xatoul_sfx(p, head_suffixes);
+                        count = eat_num(&negative_N, p);
                         break;
                 default:
                         bb_show_usage();
@@ -110,19 +215,17 @@ int head_main(int argc, char **argv)
                 *--argv = (char*)"-";
 
         fmt = header_fmt_str + 1;
-#if ENABLE_FEATURE_FANCY_HEAD
         if (argc <= header_threshhold) {
+#if ENABLE_FEATURE_FANCY_HEAD
                 header_threshhold = 0;
-        }
 #else
-        if (argc <= 1) {
                 fmt += 11; /* "" */
-        }
-        /* Now define some things here to avoid #ifdefs in the code below.
-         * These should optimize out of the if conditions below. */
-#define header_threshhold   1
-#define count_bytes         0
 #endif
+        }
+        if (negative_N) {
+                if (count >= INT_MAX / sizeof(char*))
+                        bb_error_msg("count is too big: %lu", count);
+        }
 
         do {
                 fp = fopen_or_warn_stdin(*argv);
@@ -133,18 +236,20 @@ int head_main(int argc, char **argv)
                         if (header_threshhold) {
                                 printf(fmt, *argv);
                         }
-                        i = count;
-                        while (i && ((c = getc(fp)) != EOF)) {
-                                if (count_bytes || (c == '\n')) {
-                                        --i;
+                        if (negative_N) {
+                                if (count_bytes) {
+                                        print_except_N_last_bytes(fp, count);
+                                } else {
+                                        print_except_N_last_lines(fp, count);
                                 }
-                                putchar(c);
+                        } else {
+                                print_first_N(fp, count, count_bytes);
                         }
+                        die_if_ferror_stdout();
                         if (fclose_if_not_stdin(fp)) {
                                 bb_simple_perror_msg(*argv);
                                 retval = EXIT_FAILURE;
                         }
-                        die_if_ferror_stdout();
                 } else {
                         retval = EXIT_FAILURE;
                 }
diff --git a/coreutils/head_tail.c b/coreutils/head_tail.c
new file mode 100644
index 000000000..1658c0d1b
--- /dev/null
+++ b/coreutils/head_tail.c
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2013 Denys Vlasenko
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+#include "libbb.h"
+#include "head_tail.h"
+
+const struct suffix_mult head_tail_suffixes[] = {
+        { "b", 512 },
+        { "k", 1024 },
+        { "m", 1024*1024 },
+        { "", 0 }
+};
diff --git a/coreutils/head_tail.h b/coreutils/head_tail.h
new file mode 100644
index 000000000..df19e41e0
--- /dev/null
+++ b/coreutils/head_tail.h
@@ -0,0 +1,6 @@
+/*
+ * Copyright (C) 2013 Denys Vlasenko
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+extern const struct suffix_mult head_tail_suffixes[];
diff --git a/coreutils/hostid.c b/coreutils/hostid.c
index 5c1a4e086..e5b1f5188 100644
--- a/coreutils/hostid.c
+++ b/coreutils/hostid.c
@@ -36,7 +36,8 @@ int hostid_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 bb_show_usage();
         }
 
-        printf("%08lx\n", gethostid());
+        /* POSIX says gethostid returns a "32-bit identifier" */
+        printf("%08x\n", (unsigned)(uint32_t)gethostid());
 
         return fflush_all();
 }
diff --git a/coreutils/id.c b/coreutils/id.c
index 1f20b755e..1f3e1c4c2 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -64,12 +64,10 @@
 /* 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)
+#if defined(__UCLIBC__) && UCLIBC_VERSION < KERNEL_VERSION(0, 9, 30)
 #error "Sorry, you need at least uClibc version 0.9.30 for id applet to build"
 #endif
 #endif
-#endif
 
 enum {
         PRINT_REAL      = (1 << 0),
diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index f7ad791ec..d73ef4ddb 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -39,7 +39,10 @@
  *   -q, --quiet, -s, --silent     suppress most error messages
  *   -v, --verbose                 report error messages
  *
- * bbox supports: -f -n -v (fully), -q -s (accepts but ignores)
+ * bbox supports: -f (partially) -n -v (fully), -q -s (accepts but ignores)
+ * Note: we export the -f flag, but our -f behaves like coreutils' -e.
+ * Unfortunately, there isn't a C lib function we can leverage to get this
+ * behavior which means we'd have to implement the full stack ourselves :(.
  */
 
 int readlink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/coreutils/tail.c b/coreutils/tail.c
index b376ec863..19fd8f695 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -24,6 +24,9 @@
  * 7) lseek attempted when count==0 even if arg was +0 (from top)
  */
 
+//kbuild:lib-$(CONFIG_TAIL) += tail.o
+//kbuild:lib-$(CONFIG_TAIL) += head_tail.o
+
 //usage:#define tail_trivial_usage
 //usage:       "[OPTIONS] [FILE]..."
 //usage:#define tail_full_usage "\n\n"
@@ -34,14 +37,13 @@
 //usage:     "\n        -s SECONDS      Wait SECONDS between reads with -f"
 //usage:        )
 //usage:     "\n        -n N[kbm]       Print last N lines"
+//usage:     "\n        -n +N[kbm]      Start on Nth line and print the rest"
 //usage:        IF_FEATURE_FANCY_TAIL(
-//usage:     "\n        -c N[kbm]       Print last N bytes"
+//usage:     "\n        -c [+]N[kbm]    Print last N bytes"
 //usage:     "\n        -q              Never print headers"
 //usage:     "\n        -v              Always print headers"
 //usage:     "\n"
 //usage:     "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)."
-//usage:     "\nIf N starts with a '+', output begins with the Nth item from the start"
-//usage:     "\nof each file, not from the end."
 //usage:        )
 //usage:
 //usage:#define tail_example_usage
@@ -49,13 +51,7 @@
 //usage:       "nameserver 10.0.0.1\n"
 
 #include "libbb.h"
-
-static const struct suffix_mult tail_suffixes[] = {
-        { "b", 512 },
-        { "k", 1024 },
-        { "m", 1024*1024 },
-        { "", 0 }
-};
+#include "head_tail.h"
 
 struct globals {
         bool from_top;
@@ -102,7 +98,7 @@ static unsigned eat_num(const char *p)
                 p++;
                 G.from_top = 1;
         }
-        return xatou_sfx(p, tail_suffixes);
+        return xatou_sfx(p, head_tail_suffixes);
 }
 
 int tail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 005b30420..2c2b032be 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -21,24 +21,24 @@
  * taken from debian-utils. I've only removed the long options and the
  * report mode. As the original run-parts support only long options, I've
  * broken compatibility because the BusyBox policy doesn't allow them.
- * The supported options are:
- * -t           test. Print the name of the files to be executed, without
- *              execute them.
- * -a ARG       argument. Pass ARG as an argument the program executed. It can
- *              be repeated to pass multiple arguments.
- * -u MASK      umask. Set the umask of the program executed to MASK.
  */
 
 //usage:#define run_parts_trivial_usage
-//usage:       "[-t"IF_FEATURE_RUN_PARTS_FANCY("l")"] [-a ARG]... [-u MASK] DIRECTORY"
+//usage:       "[-a ARG]... [-u UMASK] "
+//usage:       IF_FEATURE_RUN_PARTS_LONG_OPTIONS("[--reverse] [--test] [--exit-on-error] "IF_FEATURE_RUN_PARTS_FANCY("[--list] "))
+//usage:       "DIRECTORY"
 //usage:#define run_parts_full_usage "\n\n"
 //usage:       "Run a bunch of scripts in DIRECTORY\n"
-//usage:     "\n        -t      Dry run"
+//usage:     "\n        -a ARG          Pass ARG as argument to scripts"
+//usage:     "\n        -u UMASK        Set UMASK before running scripts"
+//usage:        IF_FEATURE_RUN_PARTS_LONG_OPTIONS(
+//usage:     "\n        --reverse       Reverse execution order"
+//usage:     "\n        --test          Dry run"
+//usage:     "\n        --exit-on-error Exit if a script exits with non-zero"
 //usage:        IF_FEATURE_RUN_PARTS_FANCY(
-//usage:     "\n        -l      Print names of matching files even if they are not executable"
+//usage:     "\n        --list          Print names of matching files even if they are not executable"
+//usage:        )
 //usage:        )
-//usage:     "\n        -a ARG  Pass ARG as argument to programs"
-//usage:     "\n        -u MASK Set umask to MASK before running programs"
 //usage:
 //usage:#define run_parts_example_usage
 //usage:       "$ run-parts -a start /etc/init.d\n"
@@ -70,19 +70,15 @@ struct globals {
 enum { NUM_CMD = (COMMON_BUFSIZE - sizeof(G)) / sizeof(cmd[0]) - 1 };
 
 enum {
-        OPT_r = (1 << 0),
-        OPT_a = (1 << 1),
-        OPT_u = (1 << 2),
-        OPT_t = (1 << 3),
-        OPT_l = (1 << 4) * ENABLE_FEATURE_RUN_PARTS_FANCY,
+        OPT_a = (1 << 0),
+        OPT_u = (1 << 1),
+        OPT_r = (1 << 2) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS,
+        OPT_t = (1 << 3) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS,
+        OPT_e = (1 << 4) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS,
+        OPT_l = (1 << 5) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
+                        * ENABLE_FEATURE_RUN_PARTS_FANCY,
 };
 
-#if ENABLE_FEATURE_RUN_PARTS_FANCY
-#define list_mode (option_mask32 & OPT_l)
-#else
-#define list_mode 0
-#endif
-
 /* Is this a valid filename (upper/lower alpha, digits,
  * underscores, and hyphens only?)
  */
@@ -110,7 +106,7 @@ static int FAST_FUNC act(const char *file, struct stat *statbuf, void *args UNUS
         if (depth == 2
          && (  !(statbuf->st_mode & (S_IFREG | S_IFLNK))
             || invalid_name(file)
-            || (!list_mode && access(file, X_OK) != 0))
+            || (!(option_mask32 & OPT_l) && access(file, X_OK) != 0))
         ) {
                 return SKIP;
         }
@@ -126,11 +122,12 @@ static int FAST_FUNC act(const char *file, struct stat *statbuf, void *args UNUS
 static const char runparts_longopts[] ALIGN1 =
         "arg\0"     Required_argument "a"
         "umask\0"   Required_argument "u"
-        "test\0"    No_argument       "t"
-#if ENABLE_FEATURE_RUN_PARTS_FANCY
-        "list\0"    No_argument       "l"
-        "reverse\0" No_argument       "r"
 //TODO: "verbose\0" No_argument       "v"
+        "reverse\0" No_argument       "\xf0"
+        "test\0"    No_argument       "\xf1"
+        "exit-on-error\0" No_argument "\xf2"
+#if ENABLE_FEATURE_RUN_PARTS_FANCY
+        "list\0"    No_argument       "\xf3"
 #endif
         ;
 #endif
@@ -150,7 +147,7 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
 #endif
         /* We require exactly one argument: the directory name */
         opt_complementary = "=1:a::";
-        getopt32(argv, "ra:u:t"IF_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
+        getopt32(argv, "a:u:", &arg_list, &umask_p);
 
         umask(xstrtou_range(umask_p, 8, 0, 07777));
 
@@ -193,6 +190,9 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
                         bb_perror_msg("can't execute '%s'", name);
                 else /* ret > 0 */
                         bb_error_msg("%s exited with code %d", name, ret & 0xff);
+
+                if (option_mask32 & OPT_e)
+                        xfunc_die();
         }
 
         return n;
diff --git a/docs/mdev.txt b/docs/mdev.txt
index 61f93c9df..b24025f7b 100644
--- a/docs/mdev.txt
+++ b/docs/mdev.txt
@@ -51,9 +51,9 @@ device nodes if your system needs something more than the default root/root
 660 permissions.
 
 The file has the format:
-        [-]<device regex>       <uid>:<gid> <permissions>
+        [-][envmatch]<device regex>     <uid>:<gid> <permissions>
 or
-        @<maj[,min1[-min2]]>    <uid>:<gid> <permissions>
+        [envmatch]@<maj[,min1[-min2]]>  <uid>:<gid> <permissions>
 or
         $envvar=<regex>         <uid>:<gid> <permissions>
 
diff --git a/editors/awk.c b/editors/awk.c
index 3224788c0..0b573a065 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2661,7 +2661,8 @@ static var *evaluate(node *op, var *res)
                         var *vbeg, *v;
                         const char *sv_progname;
 
-                        if (!op->r.f->body.first)
+                        /* The body might be empty, still has to eval the args */
+                        if (!op->r.n->info)
                                 syntax_error(EMSG_UNDEF_FUNC);
 
                         vbeg = v = nvalloc(op->r.f->nargs + 1);
diff --git a/editors/vi.c b/editors/vi.c
index 1fc66b931..63b984ea6 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -478,6 +478,7 @@ static void flash(int);		// flash the terminal screen
 static void show_status_line(void);     // put a message on the bottom line
 static void status_line(const char *, ...);     // print to status buf
 static void status_line_bold(const char *, ...);
+static void status_line_bold_errno(const char *fn);
 static void not_implemented(const char *); // display "Not implemented" message
 static int format_edit_status(void);    // format file status on status line
 static void redraw(int);        // force a full screen refresh
@@ -1321,7 +1322,7 @@ static void colon(char *buf)
                 }
                 if (l < 0) {
                         if (l == -1)
-                                status_line_bold("'%s' %s", fn, strerror(errno));
+                                status_line_bold_errno(fn);
                 } else {
                         status_line("'%s' %dL, %dC", fn, li, l);
                         if (q == text && r == end - 1 && l == ch) {
@@ -2512,7 +2513,7 @@ static int file_insert(const char *fn, char *p, int update_ro_status)
 
         /* Validate file */
         if (stat(fn, &statbuf) < 0) {
-                status_line_bold("'%s' %s", fn, strerror(errno));
+                status_line_bold_errno(fn);
                 goto fi0;
         }
         if (!S_ISREG(statbuf.st_mode)) {
@@ -2528,18 +2529,18 @@ static int file_insert(const char *fn, char *p, int update_ro_status)
         // read file to buffer
         fd = open(fn, O_RDONLY);
         if (fd < 0) {
-                status_line_bold("'%s' %s", fn, strerror(errno));
+                status_line_bold_errno(fn);
                 goto fi0;
         }
         size = (statbuf.st_size < INT_MAX ? (int)statbuf.st_size : INT_MAX);
         p += text_hole_make(p, size);
         cnt = safe_read(fd, p, size);
         if (cnt < 0) {
-                status_line_bold("'%s' %s", fn, strerror(errno));
+                status_line_bold_errno(fn);
                 p = text_hole_delete(p, p + size - 1);  // un-do buffer insert
         } else if (cnt < size) {
                 // There was a partial read, shrink unused space text[]
-                p = text_hole_delete(p + cnt, p + (size - cnt) - 1);    // un-do buffer insert
+                p = text_hole_delete(p + cnt, p + size - 1);    // un-do buffer insert
                 status_line_bold("can't read '%s'", fn);
         }
         if (cnt >= size)
@@ -2726,6 +2727,11 @@ static void status_line_bold(const char *format, ...)
         have_status_msg = 1 + sizeof(ESC_BOLD_TEXT) + sizeof(ESC_NORM_TEXT) - 2;
 }
 
+static void status_line_bold_errno(const char *fn)
+{
+        status_line_bold("'%s' %s", fn, strerror(errno));
+}
+
 // format status buffer
 static void status_line(const char *format, ...)
 {
diff --git a/examples/mdev_fat.conf b/examples/mdev_fat.conf
index ceba3a797..bceddb2d7 100644
--- a/examples/mdev_fat.conf
+++ b/examples/mdev_fat.conf
@@ -7,9 +7,9 @@
 # instead of the default 0:0 660.
 #
 # Syntax:
-# [-]devicename_regex user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
-# [-]$ENVVAR=regex    user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
-# [-]@maj,min[-min2]  user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
+# [-][ENVVAR=regex;]...devicename_regex user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
+# [-][ENVVAR=regex;]...@maj,min[-min2]  user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
+# [-]$ENVVAR=regex                      user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
 #
 # [-]: do not stop on this match, continue reading mdev.conf
 # =: move, >: move and create a symlink
@@ -53,6 +53,7 @@ sr[0-9]*	root:cdrom 660 @ln -sf $MDEV cdrom
 fd[0-9]*        root:floppy 660
 
 # net devices
+SUBSYSTEM=net;.* root:root 600 @nameif
 tun[0-9]*       root:root 600 =net/
 tap[0-9]*       root:root 600 =net/
 
diff --git a/examples/udhcp/simple.script b/examples/udhcp/simple.script
index 40ee73822..2a917eb6c 100755
--- a/examples/udhcp/simple.script
+++ b/examples/udhcp/simple.script
@@ -29,18 +29,23 @@ case "$1" in
                         metric=0
                         for i in $router ; do
                                 echo "Adding router $i"
-                                route add default gw $i dev $interface metric $((metric++))
+                                route add default gw $i dev $interface metric $metric
+                                : $(( metric += 1 ))
                         done
                 fi
 
                 echo "Recreating $RESOLV_CONF"
-                echo -n > $RESOLV_CONF-$$
-                [ -n "$domain" ] && echo "search $domain" >> $RESOLV_CONF-$$
+                # If the file is a symlink somewhere (like /etc/resolv.conf
+                # pointing to /run/resolv.conf), make sure things work.
+                realconf=$(readlink -f "$RESOLV_CONF" 2>/dev/null || echo "$RESOLV_CONF")
+                tmpfile="$realconf-$$"
+                > "$tmpfile"
+                [ -n "$domain" ] && echo "search $domain" >> "$tmpfile"
                 for i in $dns ; do
                         echo " Adding DNS server $i"
-                        echo "nameserver $i" >> $RESOLV_CONF-$$
+                        echo "nameserver $i" >> "$tmpfile"
                 done
-                mv $RESOLV_CONF-$$ $RESOLV_CONF
+                mv "$tmpfile" "$realconf"
                 ;;
 esac
 
diff --git a/include/bb_archive.h b/include/bb_archive.h
index a7a2a1135..b82cfd83c 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -122,6 +122,9 @@ typedef struct archive_handle_t {
 #define ARCHIVE_NUMERIC_OWNER       (1 << 7)
 #define ARCHIVE_O_TRUNC             (1 << 8)
 #define ARCHIVE_REMEMBER_NAMES      (1 << 9)
+#if ENABLE_RPM
+#define ARCHIVE_REPLACE_VIA_RENAME  (1 << 10)
+#endif
 
 
 /* POSIX tar Header Block, from POSIX 1003.1-1990  */
diff --git a/include/libbb.h b/include/libbb.h
index c5ff51398..15a5a6623 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -399,6 +399,7 @@ char *bb_get_last_path_component_nostrip(const char *path) FAST_FUNC;
 const char *bb_basename(const char *name) FAST_FUNC;
 /* NB: can violate const-ness (similarly to strchr) */
 char *last_char_is(const char *s, int c) FAST_FUNC;
+const char* endofname(const char *name) FAST_FUNC;
 
 void ndelay_on(int fd) FAST_FUNC;
 void ndelay_off(int fd) FAST_FUNC;
diff --git a/include/platform.h b/include/platform.h
index b3eee55ee..fa4267b4b 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -245,7 +245,7 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
 # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
 # define move_to_unaligned16(u16p, v) do { \
         uint16_t __t = (v); \
-        memcpy((u16p), &__t, 4); \
+        memcpy((u16p), &__t, 2); \
 } while (0)
 # define move_to_unaligned32(u32p, v) do { \
         uint32_t __t = (v); \
@@ -280,6 +280,12 @@ typedef unsigned smalluint;
 
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
+#ifdef __UCLIBC__
+# define UCLIBC_VERSION KERNEL_VERSION(__UCLIBC_MAJOR__, __UCLIBC_MINOR__, __UCLIBC_SUBLEVEL__)
+#else
+# define UCLIBC_VERSION 0
+#endif
+
 
 /* ---- Miscellaneous --------------------------------------- */
 
@@ -322,8 +328,9 @@ typedef unsigned smalluint;
  * for a mmu-less system.
  */
 #if ENABLE_NOMMU || \
-    (defined __UCLIBC__ && __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && \
-    __UCLIBC_SUBLEVEL__ > 28 && !defined __ARCH_USE_MMU__)
+    (defined __UCLIBC__ && \
+     UCLIBC_VERSION > KERNEL_VERSION(0, 9, 28) && \
+     !defined __ARCH_USE_MMU__)
 # define BB_MMU 0
 # define USE_FOR_NOMMU(...) __VA_ARGS__
 # define USE_FOR_MMU(...)
@@ -390,13 +397,8 @@ typedef unsigned smalluint;
 #define HAVE_NET_ETHERNET_H 1
 #define HAVE_SYS_STATFS_H 1
 
-#if defined(__UCLIBC_MAJOR__)
-# if __UCLIBC_MAJOR__ == 0 \
-  && (   __UCLIBC_MINOR__ < 9 \
-     || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 32) \
-     )
-#  undef HAVE_STRVERSCMP
-# endif
+#if defined(__UCLIBC__) && UCLIBC_VERSION < KERNEL_VERSION(0, 9, 32)
+# undef HAVE_STRVERSCMP
 #endif
 
 #if defined(__dietlibc__)
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index fb06ab9a5..f0df4e080 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -752,7 +752,7 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
 //TODO: just compare applet_no with APPLET_NO_test
                 if (!ENABLE_TEST || strcmp(applet_name, "test") != 0) {
                         /* If you want "foo --help" to return 0: */
-                        /*xfunc_error_retval = 0;*/
+                        xfunc_error_retval = 0;
                         bb_show_usage();
                 }
         }
diff --git a/libbb/endofname.c b/libbb/endofname.c
new file mode 100644
index 000000000..305f0932b
--- /dev/null
+++ b/libbb/endofname.c
@@ -0,0 +1,26 @@
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 2013 Denys Vlasenko
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+
+//kbuild:lib-y += endofname.o
+
+#include "libbb.h"
+
+#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
+#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
+
+const char* FAST_FUNC
+endofname(const char *name)
+{
+        if (!is_name(*name))
+                return name;
+        while (*++name) {
+                if (!is_in_name(*name))
+                        break;
+        }
+        return name;
+}
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 8a276d941..09e203159 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -187,6 +187,7 @@ extern struct lineedit_statics *const lineedit_ptr_to_statics;
         cmdedit_termw = 80; \
         IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \
         IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;) \
+        IF_FEATURE_EDITING_VI(delptr = delbuf;) \
 } while (0)
 
 static void deinit_S(void)
diff --git a/libbb/platform.c b/libbb/platform.c
index 2bf34f5bc..19734517b 100644
--- a/libbb/platform.c
+++ b/libbb/platform.c
@@ -28,14 +28,16 @@ int FAST_FUNC vasprintf(char **string_ptr, const char *format, va_list p)
         r = vsnprintf(buf, 128, format, p);
         va_end(p);
 
+        /* Note: can't use xstrdup/xmalloc, they call vasprintf (us) on failure! */
+
         if (r < 128) {
                 va_end(p2);
-                *string_ptr = xstrdup(buf);
-                return r;
+                *string_ptr = strdup(buf);
+                return (*string_ptr ? r : -1);
         }
 
-        *string_ptr = xmalloc(r+1);
-        r = vsnprintf(*string_ptr, r+1, format, p2);
+        *string_ptr = malloc(r+1);
+        r = (*string_ptr ? vsnprintf(*string_ptr, r+1, format, p2) : -1);
         va_end(p2);
 
         return r;
diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index f2faa6d7a..bc1d0e665 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -102,7 +102,8 @@ char* FAST_FUNC xmalloc_readlink_or_warn(const char *path)
 
 char* FAST_FUNC xmalloc_realpath(const char *path)
 {
-#if defined(__GLIBC__) && !defined(__UCLIBC__)
+#if defined(__GLIBC__) || \
+    (defined(__UCLIBC__) && UCLIBC_VERSION >= KERNEL_VERSION(0, 9, 31))
         /* glibc provides a non-standard extension */
         /* new: POSIX.1-2008 specifies this behavior as well */
         return realpath(path, NULL);
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index c426e9d85..b5aa1d17b 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -92,25 +92,73 @@ static int smtp_check(const char *fmt, int code)
 // strip argument of bad chars
 static char *sane_address(char *str)
 {
-        char *s = str;
-        char *p = s;
+        char *s;
+
+        trim(str);
+        s = str;
         while (*s) {
-                if (isalnum(*s) || '_' == *s || '-' == *s || '.' == *s || '@' == *s) {
-                        *p++ = *s;
+                if (!isalnum(*s) && !strchr("_-.@", *s)) {
+                        bb_error_msg("bad address '%s'", str);
+                        /* returning "": */
+                        str[0] = '\0';
+                        return str;
                 }
                 s++;
         }
-        *p = '\0';
         return str;
 }
 
+// check for an address inside angle brackets, if not found fall back to normal
+static char *angle_address(char *str)
+{
+        char *s, *e;
+
+        trim(str);
+        e = last_char_is(str, '>');
+        if (e) {
+                s = strrchr(str, '<');
+                if (s) {
+                        *e = '\0';
+                        str = s + 1;
+                }
+        }
+        return sane_address(str);
+}
+
 static void rcptto(const char *s)
 {
+        if (!*s)
+                return;
         // N.B. we don't die if recipient is rejected, for the other recipients may be accepted
         if (250 != smtp_checkp("RCPT TO:<%s>", s, -1))
                 bb_error_msg("Bad recipient: <%s>", s);
 }
 
+// send to a list of comma separated addresses
+static void rcptto_list(const char *list)
+{
+        char *str = xstrdup(list);
+        char *s = str;
+        char prev = 0;
+        int in_quote = 0;
+
+        while (*s) {
+                char ch = *s++;
+
+                if (ch == '"' && prev != '\\') {
+                        in_quote = !in_quote;
+                } else if (!in_quote && ch == ',') {
+                        s[-1] = '\0';
+                        rcptto(angle_address(str));
+                        str = s;
+                }
+                prev = ch;
+        }
+        if (prev != ',')
+                rcptto(angle_address(str));
+        free(str);
+}
+
 int sendmail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int sendmail_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -121,6 +169,13 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
         char *host = sane_address(safe_gethostname());
         unsigned nheaders = 0;
         int code;
+        enum {
+                HDR_OTHER = 0,
+                HDR_TOCC,
+                HDR_BCC,
+        } last_hdr = 0;
+        int check_hdr;
+        int has_to = 0;
 
         enum {
         //--- standard options
@@ -282,23 +337,36 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
 
                 // analyze headers
                 // To: or Cc: headers add recipients
+                check_hdr = (0 == strncasecmp("To:", s, 3));
+                has_to |= check_hdr;
                 if (opts & OPT_t) {
-                        if (0 == strncasecmp("To:", s, 3) || 0 == strncasecmp("Bcc:" + 1, s, 3)) {
-                                rcptto(sane_address(s+3));
+                        if (check_hdr || 0 == strncasecmp("Bcc:" + 1, s, 3)) {
+                                rcptto_list(s+3);
+                                last_hdr = HDR_TOCC;
                                 goto addheader;
                         }
                         // Bcc: header adds blind copy (hidden) recipient
                         if (0 == strncasecmp("Bcc:", s, 4)) {
-                                rcptto(sane_address(s+4));
+                                rcptto_list(s+4);
                                 free(s);
+                                last_hdr = HDR_BCC;
                                 continue; // N.B. Bcc: vanishes from headers!
                         }
                 }
-                if (strchr(s, ':') || (list && isspace(s[0]))) {
+                check_hdr = (list && isspace(s[0]));
+                if (strchr(s, ':') || check_hdr) {
                         // other headers go verbatim
                         // N.B. RFC2822 2.2.3 "Long Header Fields" allows for headers to occupy several lines.
                         // Continuation is denoted by prefixing additional lines with whitespace(s).
                         // Thanks (stefan.seyfried at googlemail.com) for pointing this out.
+                        if (check_hdr && last_hdr != HDR_OTHER) {
+                                rcptto_list(s+1);
+                                if (last_hdr == HDR_BCC)
+                                        continue;
+                                        // N.B. Bcc: vanishes from headers!
+                        } else {
+                                last_hdr = HDR_OTHER;
+                        }
  addheader:
                         // N.B. we allow MAX_HEADERS generic headers at most to prevent attacks
                         if (MAX_HEADERS && ++nheaders >= MAX_HEADERS)
@@ -309,12 +377,27 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
                         // so stop "analyze headers" mode
  reenter:
                         // put recipients specified on cmdline
+                        check_hdr = 1;
                         while (*argv) {
                                 char *t = sane_address(*argv);
                                 rcptto(t);
                                 //if (MAX_HEADERS && ++nheaders >= MAX_HEADERS)
                                 //      goto bail;
-                                llist_add_to_end(&list, xasprintf("To: %s", t));
+                                if (!has_to) {
+                                        const char *hdr;
+
+                                        if (check_hdr && argv[1])
+                                                hdr = "To: %s,";
+                                        else if (check_hdr)
+                                                hdr = "To: %s";
+                                        else if (argv[1])
+                                                hdr = "To: %s," + 3;
+                                        else
+                                                hdr = "To: %s" + 3;
+                                        llist_add_to_end(&list,
+                                                        xasprintf(hdr, t));
+                                        check_hdr = 0;
+                                }
                                 argv++;
                         }
                         // enter "put message" mode
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index 0598371d5..bf9b739a1 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -11,10 +11,11 @@
  */
 
 //usage:#define flash_eraseall_trivial_usage
-//usage:       "[-jq] MTD_DEVICE"
+//usage:       "[-jNq] MTD_DEVICE"
 //usage:#define flash_eraseall_full_usage "\n\n"
 //usage:       "Erase an MTD device\n"
 //usage:     "\n        -j      Format the device for jffs2"
+//usage:     "\n        -N      Don't skip bad blocks"
 //usage:     "\n        -q      Don't display progress messages"
 
 #include "libbb.h"
@@ -22,9 +23,9 @@
 #include <linux/jffs2.h>
 
 #define OPTION_J  (1 << 0)
-#define OPTION_Q  (1 << 1)
-#define IS_NAND   (1 << 2)
-#define BBTEST    (1 << 3)
+#define OPTION_N  (1 << 1)
+#define OPTION_Q  (1 << 2)
+#define IS_NAND   (1 << 3)
 
 /* mtd/jffs2-user.h used to have this atrocity:
 extern int target_endian;
@@ -71,7 +72,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
         char *mtd_name;
 
         opt_complementary = "=1";
-        flags = BBTEST | getopt32(argv, "jq");
+        flags = getopt32(argv, "jNq");
 
         mtd_name = argv[optind];
         fd = xopen(mtd_name, O_RDWR);
@@ -139,7 +140,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
 
         for (erase.start = 0; erase.start < meminfo.size;
              erase.start += meminfo.erasesize) {
-                if (flags & BBTEST) {
+                if (!(flags & OPTION_N)) {
                         int ret;
                         loff_t offset = erase.start;
 
@@ -154,7 +155,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
                                  * types e.g. NOR
                                  */
                                 if (errno == EOPNOTSUPP) {
-                                        flags &= ~BBTEST;
+                                        flags |= OPTION_N;
                                         if (flags & IS_NAND)
                                                 bb_error_msg_and_die("bad block check not available");
                                 } else {
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 5908ac773..e3f9b565d 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -23,7 +23,7 @@
 //config:         Dump the content of raw NAND chip
 
 //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))
+//applet:IF_NANDDUMP(APPLET_ODDNAME(nanddump, nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP, nanddump))
 
 //kbuild:lib-$(CONFIG_NANDWRITE) += nandwrite.o
 //kbuild:lib-$(CONFIG_NANDDUMP) += nandwrite.o
@@ -31,14 +31,14 @@
 //usage:#define nandwrite_trivial_usage
 //usage:        "[-p] [-s ADDR] MTD_DEVICE [FILE]"
 //usage:#define nandwrite_full_usage "\n\n"
-//usage:        "Write to the specified MTD device\n"
+//usage:        "Write to MTD_DEVICE\n"
 //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:        "[-o] [-b] [-s ADDR] [-l LEN] [-f FILE] MTD_DEVICE"
 //usage:#define nanddump_full_usage "\n\n"
-//usage:        "Dump the specified MTD device\n"
+//usage:        "Dump MTD_DEVICE\n"
 //usage:     "\n        -o      Dump oob data"
 //usage:     "\n        -b      Omit bad block from the dump"
 //usage:     "\n        -s ADDR Start address"
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index bf09cd529..2d389ea30 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -121,10 +121,7 @@ static void get_dest_addr(const char *hostid, struct ether_addr *eaddr)
         eap = ether_aton_r(hostid, eaddr);
         if (eap) {
                 bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eap));
-#if !defined(__UCLIBC_MAJOR__) \
- || __UCLIBC_MAJOR__ > 0 \
- || __UCLIBC_MINOR__ > 9 \
- || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 30)
+#if !defined(__UCLIBC__) || UCLIBC_VERSION >= KERNEL_VERSION(0, 9, 30)
         } else if (ether_hostton(hostid, eaddr) == 0) {
                 bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr));
 #endif
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 86586f0fe..3cdc2c9d2 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -556,7 +556,8 @@ int ifplugd_main(int argc UNUSED_PARAM, char **argv)
 
         if (opts & FLAG_KILL) {
                 if (pid_from_pidfile > 0)
-                        kill(pid_from_pidfile, SIGQUIT);
+                        /* Upstream tool use SIGINT for -k */
+                        kill(pid_from_pidfile, SIGINT);
                 return EXIT_SUCCESS;
         }
 
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 818048284..0f0857cb4 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -743,7 +743,7 @@ static const struct method_t *get_method(const struct address_family_t *af, char
         return NULL;
 }
 
-static struct interfaces_file_t *read_interfaces(const char *filename)
+static struct interfaces_file_t *read_interfaces(const char *filename, struct interfaces_file_t *defn)
 {
         /* Let's try to be compatible.
          *
@@ -758,19 +758,25 @@ static struct interfaces_file_t *read_interfaces(const char *filename)
          * be ignored. Blank lines are ignored. Lines may be indented freely.
          * A "\" character at the very end of the line indicates the next line
          * should be treated as a continuation of the current one.
+         *
+         * Lines  beginning with "source" are used to include stanzas from
+         * other files, so configuration can be split into many files.
+         * The word "source" is followed by the path of file to be sourced.
          */
 #if ENABLE_FEATURE_IFUPDOWN_MAPPING
         struct mapping_defn_t *currmap = NULL;
 #endif
         struct interface_defn_t *currif = NULL;
-        struct interfaces_file_t *defn;
         FILE *f;
         char *buf;
         char *first_word;
         char *rest_of_line;
         enum { NONE, IFACE, MAPPING } currently_processing = NONE;
 
-        defn = xzalloc(sizeof(*defn));
+        if (!defn)
+                defn = xzalloc(sizeof(*defn));
+
+        debug_noise("reading %s file:\n", filename);
         f = xfopen_for_read(filename);
 
         while ((buf = xmalloc_fgetline(f)) != NULL) {
@@ -881,6 +887,8 @@ static struct interfaces_file_t *read_interfaces(const char *filename)
                                 debug_noise("\nauto %s\n", first_word);
                         }
                         currently_processing = NONE;
+                } else if (strcmp(first_word, "source") == 0) {
+                        read_interfaces(next_word(&rest_of_line), defn);
                 } else {
                         switch (currently_processing) {
                         case IFACE:
@@ -934,6 +942,7 @@ static struct interfaces_file_t *read_interfaces(const char *filename)
                 bb_error_msg_and_die("%s: I/O error", filename);
         }
         fclose(f);
+        debug_noise("\ndone reading %s\n\n", filename);
 
         return defn;
 }
@@ -1199,9 +1208,7 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
                 if (!DO_ALL) bb_show_usage();
         }
 
-        debug_noise("reading %s file:\n", interfaces);
-        defn = read_interfaces(interfaces);
-        debug_noise("\ndone reading %s\n\n", interfaces);
+        defn = read_interfaces(interfaces, NULL);
 
         /* Create a list of interfaces to work on */
         if (DO_ALL) {
diff --git a/networking/nameif.c b/networking/nameif.c
index 5d7e8f9a4..9a8846dc0 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -292,12 +292,11 @@ int nameif_main(int argc UNUSED_PARAM, char **argv)
                         if (ch->mac && memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN) != 0)
                                 continue;
                         /* if we came here, all selectors have matched */
-                        break;
+                        goto found;
                 }
                 /* Nothing found for current interface */
-                if (!ch)
-                        continue;
-
+                continue;
+ found:
                 if (strcmp(ifr.ifr_name, ch->ifname) != 0) {
                         strcpy(ifr.ifr_newname, ch->ifname);
                         ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr,
@@ -313,10 +312,14 @@ int nameif_main(int argc UNUSED_PARAM, char **argv)
                         ch->next->prev = ch->prev;
                 if (ENABLE_FEATURE_CLEAN_UP)
                         delete_eth_table(ch);
-        }
+        } /* while */
+
         if (ENABLE_FEATURE_CLEAN_UP) {
-                for (ch = clist; ch; ch = ch->next)
+                ethtable_t *next;
+                for (ch = clist; ch; ch = next) {
+                        next = ch->next;
                         delete_eth_table(ch);
+                }
                 config_close(parser);
         };
 
diff --git a/networking/nc.c b/networking/nc.c
index 0c843a686..126bec906 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -24,7 +24,7 @@
 //config:         Allow netcat to act as a server.
 //config:
 //config:config NC_EXTRA
-//config:       bool "Netcat extensions (-eiw and filename)"
+//config:       bool "Netcat extensions (-eiw and -f FILE)"
 //config:       default y
 //config:       depends on NC
 //config:       help
@@ -40,7 +40,7 @@
 //config:         This option makes nc closely follow original nc-1.10.
 //config:         The code is about 2.5k bigger. It enables
 //config:         -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
-//config:         busybox-specific extensions: -f FILE and -ll.
+//config:         busybox-specific extensions: -f FILE.
 
 #if ENABLE_NC_110_COMPAT
 # include "nc_bloaty.c"
@@ -60,17 +60,18 @@
 //usage:#define nc_full_usage "\n\n"
 //usage:       "Open a pipe to IP:PORT" IF_NC_EXTRA(" or FILE")
 //usage:        NC_OPTIONS_STR
-//usage:        IF_NC_EXTRA(
-//usage:     "\n        -e PROG Run PROG after connect"
 //usage:        IF_NC_SERVER(
 //usage:     "\n        -l      Listen mode, for inbound connects"
 //usage:        IF_NC_EXTRA(
-//usage:     "\n                (use -l twice with -e for persistent server)")
+//usage:     "\n                (use -ll with -e for persistent server)"
+//usage:        )
 //usage:     "\n        -p PORT Local port"
 //usage:        )
-//usage:     "\n        -w SEC  Timeout for connect"
+//usage:        IF_NC_EXTRA(
+//usage:     "\n        -w SEC  Connect timeout"
 //usage:     "\n        -i SEC  Delay interval for lines sent"
 //usage:     "\n        -f FILE Use file (ala /dev/ttyS0) instead of network"
+//usage:     "\n        -e PROG Run PROG after connect"
 //usage:        )
 //usage:
 //usage:#define nc_notes_usage ""
@@ -147,7 +148,7 @@ int nc_main(int argc, char **argv)
                                                 *p++ = argv[optind++];
                                         }
                                 )
-                                /* optind points to argv[arvc] (NULL) now.
+                                /* optind points to argv[argc] (NULL) now.
                                 ** FIXME: we assume that getopt will not count options
                                 ** possibly present on "-e PROG ARGS" and will not
                                 ** include them into final value of optind
@@ -226,10 +227,9 @@ int nc_main(int argc, char **argv)
                 /* child, or main thread if only one -l */
                 xmove_fd(cfd, 0);
                 xdup2(0, 1);
-                xdup2(0, 2);
+                /*xdup2(0, 2); - original nc 1.10 does this, we don't */
                 IF_NC_EXTRA(BB_EXECVP(execparam[0], execparam);)
-                /* Don't print stuff or it will go over the wire... */
-                _exit(127);
+                IF_NC_EXTRA(bb_perror_msg_and_die("can't execute '%s'", execparam[0]);)
         }
 
         /* Select loop copying stdin to cfd, and cfd to stdout */
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 62a025116..00ba6f114 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -63,6 +63,12 @@
 //usage:       "        -e PROG Run PROG after connect (must be last)"
 //usage:        IF_NC_SERVER(
 //usage:     "\n        -l      Listen mode, for inbound connects"
+//usage:     "\n        -lk     With -e, provides persistent server"
+/* -ll does the same as -lk, but its our extension, while -k is BSD'd,
+ * presumably more widely known. Therefore we advertise it, not -ll.
+ * I would like to drop -ll support, but our "small" nc supports it,
+ * and Rob uses it.
+ */
 //usage:        )
 //usage:     "\n        -p PORT Local port"
 //usage:     "\n        -s ADDR Local address"
@@ -166,18 +172,14 @@ enum {
         OPT_v = (1 << 4),
         OPT_w = (1 << 5),
         OPT_l = (1 << 6) * ENABLE_NC_SERVER,
-        OPT_i = (1 << (6+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
-        OPT_o = (1 << (7+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
-        OPT_z = (1 << (8+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+        OPT_k = (1 << 7) * ENABLE_NC_SERVER,
+        OPT_i = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+        OPT_o = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+        OPT_z = (1 << (9+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
 };
 
 #define o_nflag   (option_mask32 & OPT_n)
 #define o_udpmode (option_mask32 & OPT_u)
-#if ENABLE_NC_SERVER
-#define o_listen  (option_mask32 & OPT_l)
-#else
-#define o_listen  0
-#endif
 #if ENABLE_NC_EXTRA
 #define o_ofile   (option_mask32 & OPT_o)
 #define o_zero    (option_mask32 & OPT_z)
@@ -298,7 +300,7 @@ static int connect_w_timeout(int fd)
  incoming and returns an open connection *from* someplace.  If we were
  given host/port args, any connections from elsewhere are rejected.  This
  in conjunction with local-address binding should limit things nicely... */
-static void dolisten(void)
+static void dolisten(int is_persistent, char **proggie)
 {
         int rr;
 
@@ -371,6 +373,7 @@ create new one, and bind() it. TODO */
                         xconnect(netfd, &remend.u.sa, ouraddr->len);
         } else {
                 /* TCP */
+ another:
                 arm(o_wait); /* wrap this in a timer, too; 0 = forever */
                 if (setjmp(jbuf) == 0) {
  again:
@@ -405,6 +408,19 @@ create new one, and bind() it. TODO */
                         unarm();
                 } else
                         bb_error_msg_and_die("timeout");
+
+                if (is_persistent && proggie) {
+                        /* -l -k -e PROG */
+                        signal(SIGCHLD, SIG_IGN); /* no zombies please */
+                        if (xvfork() != 0) {
+                                /* parent: go back and accept more connections */
+                                close(rr);
+                                goto another;
+                        }
+                        /* child */
+                        signal(SIGCHLD, SIG_DFL);
+                }
+
                 xmove_fd(rr, netfd); /* dump the old socket, here's our new one */
                 /* find out what address the connection was *to* on our end, in case we're
                  doing a listen-on-any on a multihomed machine.  This allows one to
@@ -454,6 +470,9 @@ create new one, and bind() it. TODO */
                 if (!o_nflag)
                         free(remhostname);
         }
+
+        if (proggie)
+                doexec(proggie);
 }
 
 /* udptest:
@@ -730,6 +749,7 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
         char *themdotted = themdotted; /* for compiler */
         char **proggie;
         int x;
+        unsigned cnt_l = 0;
         unsigned o_lport = 0;
 
         INIT_G();
@@ -760,7 +780,7 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
                 if (proggie[0][0] == '-') {
                         char *optpos = *proggie + 1;
                         /* Skip all valid opts w/o params */
-                        optpos = optpos + strspn(optpos, "nuv"IF_NC_SERVER("l")IF_NC_EXTRA("z"));
+                        optpos = optpos + strspn(optpos, "nuv"IF_NC_SERVER("lk")IF_NC_EXTRA("z"));
                         if (*optpos == 'e' && !optpos[1]) {
                                 *optpos = '\0';
                                 proggie++;
@@ -774,17 +794,21 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
  e_found:
 
         // -g -G -t -r deleted, unimplemented -a deleted too
-        opt_complementary = "?2:vv:w+"; /* max 2 params; -v is a counter; -w N */
-        getopt32(argv, "np:s:uvw:" IF_NC_SERVER("l")
+        opt_complementary = "?2:vv:ll:w+"; /* max 2 params; -v and -l are counters; -w N */
+        getopt32(argv, "np:s:uvw:" IF_NC_SERVER("lk")
                         IF_NC_EXTRA("i:o:z"),
                         &str_p, &str_s, &o_wait
-                        IF_NC_EXTRA(, &str_i, &str_o), &o_verbose);
+                        IF_NC_EXTRA(, &str_i, &str_o), &o_verbose IF_NC_SERVER(, &cnt_l));
         argv += optind;
 #if ENABLE_NC_EXTRA
         if (option_mask32 & OPT_i) /* line-interval time */
                 o_interval = xatou_range(str_i, 1, 0xffff);
 #endif
+#if ENABLE_NC_SERVER
         //if (option_mask32 & OPT_l) /* listen mode */
+        if (option_mask32 & OPT_k) /* persistent server mode */
+                cnt_l = 2;
+#endif
         //if (option_mask32 & OPT_n) /* numeric-only, no DNS lookups */
         //if (option_mask32 & OPT_o) /* hexdump log */
         if (option_mask32 & OPT_p) { /* local source port */
@@ -833,7 +857,7 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
         if (o_udpmode)
                 socket_want_pktinfo(netfd);
         if (!ENABLE_FEATURE_UNIX_LOCAL
-         || o_listen
+         || cnt_l != 0 /* listen */
          || ouraddr->u.sa.sa_family != AF_UNIX
         ) {
                 xbind(netfd, &ouraddr->u.sa, ouraddr->len);
@@ -862,11 +886,9 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
                 xmove_fd(xopen(str_o, O_WRONLY|O_CREAT|O_TRUNC), ofd);
 #endif
 
-        if (o_listen) {
-                dolisten();
+        if (cnt_l != 0) {
+                dolisten((cnt_l - 1), proggie);
                 /* dolisten does its own connect reporting */
-                if (proggie) /* -e given? */
-                        doexec(proggie);
                 x = readwrite(); /* it even works with UDP! */
         } else {
                 /* Outbound connects.  Now we're more picky about args... */
diff --git a/networking/ping.c b/networking/ping.c
index 3df67f5c3..e919b3a09 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -89,7 +89,9 @@
 //usage:       "[OPTIONS] HOST"
 //usage:# define ping_full_usage "\n\n"
 //usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
+//usage:        IF_PING6(
 //usage:     "\n        -4,-6           Force IP or IPv6 name resolution"
+//usage:        )
 //usage:     "\n        -c CNT          Send only CNT pings"
 //usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)"
 //usage:     "\n        -t TTL          Set TTL"
@@ -299,7 +301,7 @@ static int common_ping_main(sa_family_t af, char **argv)
 
 /* Full(er) version */
 
-#define OPT_STRING ("qvc:s:t:w:W:I:4" IF_PING6("6"))
+#define OPT_STRING ("qvc:s:t:w:W:I:n4" IF_PING6("6"))
 enum {
         OPT_QUIET = 1 << 0,
         OPT_VERBOSE = 1 << 1,
@@ -309,8 +311,9 @@ enum {
         OPT_w = 1 << 5,
         OPT_W = 1 << 6,
         OPT_I = 1 << 7,
-        OPT_IPV4 = 1 << 8,
-        OPT_IPV6 = (1 << 9) * ENABLE_PING6,
+        /*OPT_n = 1 << 8, - ignored */
+        OPT_IPV4 = 1 << 9,
+        OPT_IPV6 = (1 << 10) * ENABLE_PING6,
 };
 
 
@@ -349,9 +352,6 @@ struct globals {
 #define source_lsa   (G.source_lsa  )
 #define str_I        (G.str_I       )
 #define datalen      (G.datalen     )
-#define ntransmitted (G.ntransmitted)
-#define nreceived    (G.nreceived   )
-#define nrepeats     (G.nrepeats    )
 #define pingcount    (G.pingcount   )
 #define opt_ttl      (G.opt_ttl     )
 #define myid         (G.myid        )
@@ -387,33 +387,40 @@ void BUG_ping_globals_too_big(void);
 static void print_stats_and_exit(int junk) NORETURN;
 static void print_stats_and_exit(int junk UNUSED_PARAM)
 {
+        unsigned long ul;
+        unsigned long nrecv;
+
         signal(SIGINT, SIG_IGN);
 
-        printf("\n--- %s ping statistics ---\n", hostname);
-        printf("%lu packets transmitted, ", ntransmitted);
-        printf("%lu packets received, ", nreceived);
-        if (nrepeats)
-                printf("%lu duplicates, ", nrepeats);
-        if (ntransmitted)
-                ntransmitted = (ntransmitted - nreceived) * 100 / ntransmitted;
-        printf("%lu%% packet loss\n", ntransmitted);
+        nrecv = G.nreceived;
+        printf("\n--- %s ping statistics ---\n"
+                "%lu packets transmitted, "
+                "%lu packets received, ",
+                hostname, G.ntransmitted, nrecv
+        );
+        if (G.nrepeats)
+                printf("%lu duplicates, ", G.nrepeats);
+        ul = G.ntransmitted;
+        if (ul != 0)
+                ul = (ul - nrecv) * 100 / ul;
+        printf("%lu%% packet loss\n", ul);
         if (tmin != UINT_MAX) {
-                unsigned tavg = tsum / (nreceived + nrepeats);
+                unsigned tavg = tsum / (nrecv + G.nrepeats);
                 printf("round-trip min/avg/max = %u.%03u/%u.%03u/%u.%03u ms\n",
                         tmin / 1000, tmin % 1000,
                         tavg / 1000, tavg % 1000,
                         tmax / 1000, tmax % 1000);
         }
         /* if condition is true, exit with 1 -- 'failure' */
-        exit(nreceived == 0 || (deadline && nreceived < pingcount));
+        exit(nrecv == 0 || (deadline && nrecv < pingcount));
 }
 
 static void sendping_tail(void (*sp)(int), int size_pkt)
 {
         int sz;
 
-        CLR((uint16_t)ntransmitted % MAX_DUP_CHK);
-        ntransmitted++;
+        CLR((uint16_t)G.ntransmitted % MAX_DUP_CHK);
+        G.ntransmitted++;
 
         size_pkt += datalen;
 
@@ -423,7 +430,7 @@ static void sendping_tail(void (*sp)(int), int size_pkt)
         if (sz != size_pkt)
                 bb_error_msg_and_die(bb_msg_write_error);
 
-        if (pingcount == 0 || deadline || ntransmitted < pingcount) {
+        if (pingcount == 0 || deadline || G.ntransmitted < pingcount) {
                 /* Didn't send all pings yet - schedule next in 1s */
                 signal(SIGALRM, sp);
                 if (deadline) {
@@ -439,7 +446,7 @@ static void sendping_tail(void (*sp)(int), int size_pkt)
                  * otherwise ping waits for two RTTs. */
                 unsigned expire = timeout;
 
-                if (nreceived) {
+                if (G.nreceived) {
                         /* approx. 2*tmax, in seconds (2 RTT) */
                         expire = tmax / (512*1024);
                         if (expire == 0)
@@ -458,7 +465,7 @@ static void sendping4(int junk UNUSED_PARAM)
         pkt->icmp_type = ICMP_ECHO;
         /*pkt->icmp_code = 0;*/
         pkt->icmp_cksum = 0; /* cksum is calculated with this field set to 0 */
-        pkt->icmp_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
+        pkt->icmp_seq = htons(G.ntransmitted); /* don't ++ here, it can be a macro */
         pkt->icmp_id = myid;
 
         /* If datalen < 4, we store timestamp _past_ the packet,
@@ -481,7 +488,7 @@ static void sendping6(int junk UNUSED_PARAM)
         pkt->icmp6_type = ICMP6_ECHO_REQUEST;
         /*pkt->icmp6_code = 0;*/
         /*pkt->icmp6_cksum = 0;*/
-        pkt->icmp6_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
+        pkt->icmp6_seq = htons(G.ntransmitted); /* don't ++ here, it can be a macro */
         pkt->icmp6_id = myid;
 
         /*if (datalen >= 4)*/
@@ -548,7 +555,7 @@ static void unpack_tail(int sz, uint32_t *tp,
         const char *dupmsg = " (DUP!)";
         unsigned triptime = triptime; /* for gcc */
 
-        ++nreceived;
+        ++G.nreceived;
 
         if (tp) {
                 /* (int32_t) cast is for hypothetical 64-bit unsigned */
@@ -562,8 +569,8 @@ static void unpack_tail(int sz, uint32_t *tp,
         }
 
         if (TST(recv_seq % MAX_DUP_CHK)) {
-                ++nrepeats;
-                --nreceived;
+                ++G.nrepeats;
+                --G.nreceived;
         } else {
                 SET(recv_seq % MAX_DUP_CHK);
                 dupmsg += 7;
@@ -692,7 +699,7 @@ static void ping4(len_and_sockaddr *lsa)
                         continue;
                 }
                 unpack4(G.rcv_packet, c, &from);
-                if (pingcount && nreceived >= pingcount)
+                if (pingcount && G.nreceived >= pingcount)
                         break;
         }
 }
@@ -784,7 +791,7 @@ static void ping6(len_and_sockaddr *lsa)
                         }
                 }
                 unpack6(G.rcv_packet, c, &from, hoplimit);
-                if (pingcount && nreceived >= pingcount)
+                if (pingcount && G.nreceived >= pingcount)
                         break;
         }
 }
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 6b7b2ebdd..0c18d6c0c 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -805,6 +805,7 @@ common_traceroute_main(int op, char **argv)
         char *waittime_str;
         char *pausemsecs_str;
         char *first_ttl_str;
+        char *dest_str;
 #if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
         llist_t *source_route_list = NULL;
         int lsrr = 0;
@@ -1059,8 +1060,12 @@ common_traceroute_main(int op, char **argv)
         xsetgid(getgid());
         xsetuid(getuid());
 
-        printf("traceroute to %s (%s)", argv[0],
-                        xmalloc_sockaddr2dotted_noport(&dest_lsa->u.sa));
+        dest_str = xmalloc_sockaddr2dotted_noport(&dest_lsa->u.sa);
+        printf("traceroute to %s (%s)", argv[0], dest_str);
+        if (ENABLE_FEATURE_CLEAN_UP) {
+                free(dest_str);
+        }
+
         if (op & OPT_SOURCE)
                 printf(" from %s", source);
         printf(", %d hops max, %d byte packets\n", max_ttl, packlen);
@@ -1216,6 +1221,12 @@ common_traceroute_main(int op, char **argv)
                 }
         }
 
+        if (ENABLE_FEATURE_CLEAN_UP) {
+                free(to);
+                free(lastaddr);
+                free(from_lsa);
+        }
+
         return 0;
 }
 
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 9ad95954d..a1a7f6b57 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -22,11 +22,12 @@
  */
 
 //usage:#define udhcpd_trivial_usage
-//usage:       "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]"
+//usage:       "[-fS] [-I ADDR]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]"
 //usage:#define udhcpd_full_usage "\n\n"
 //usage:       "DHCP server\n"
 //usage:     "\n        -f      Run in foreground"
 //usage:     "\n        -S      Log to syslog too"
+//usage:     "\n        -I ADDR Local address"
 //usage:        IF_FEATURE_UDHCP_PORT(
 //usage:     "\n        -P N    Use port N (default 67)"
 //usage:        )
@@ -302,6 +303,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
         unsigned num_ips;
         unsigned opt;
         struct option_set *option;
+        char *str_I = str_I;
         IF_FEATURE_UDHCP_PORT(char *str_P;)
 
 #if ENABLE_FEATURE_UDHCP_PORT
@@ -312,8 +314,10 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
         opt_complementary = "vv";
 #endif
-        opt = getopt32(argv, "fSv"
-                IF_FEATURE_UDHCP_PORT("P:", &str_P)
+        opt = getopt32(argv, "fSI:v"
+                IF_FEATURE_UDHCP_PORT("P:")
+                , &str_I
+                IF_FEATURE_UDHCP_PORT(, &str_P)
                 IF_UDHCP_VERBOSE(, &dhcp_verbose)
                 );
         if (!(opt & 1)) { /* no -f */
@@ -326,8 +330,13 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 openlog(applet_name, LOG_PID, LOG_DAEMON);
                 logmode |= LOGMODE_SYSLOG;
         }
+        if (opt & 4) { /* -I */
+                len_and_sockaddr *lsa = xhost_and_af2sockaddr(str_I, 0, AF_INET);
+                server_config.server_nip = lsa->u.sin.sin_addr.s_addr;
+                free(lsa);
+        }
 #if ENABLE_FEATURE_UDHCP_PORT
-        if (opt & 8) { /* -P */
+        if (opt & 16) { /* -P */
                 SERVER_PORT = xatou16(str_P);
                 CLIENT_PORT = SERVER_PORT + 1;
         }
@@ -367,7 +376,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 
         if (udhcp_read_interface(server_config.interface,
                         &server_config.ifindex,
-                        &server_config.server_nip,
+                        (server_config.server_nip == 0 ? &server_config.server_nip : NULL),
                         server_config.server_mac)
         ) {
                 retval = 1;
diff --git a/procps/pgrep.c b/procps/pgrep.c
index dc7ffff48..8daf5b28a 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -128,7 +128,7 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
 
         if (argv[0])
-                xregcomp(&re_buffer, argv[0], REG_EXTENDED | REG_NOSUB);
+                xregcomp(&re_buffer, argv[0], OPT_ANCHOR ? REG_EXTENDED : (REG_EXTENDED|REG_NOSUB));
 
         matched_pid = 0;
         cmd_last = NULL;
diff --git a/shell/ash.c b/shell/ash.c
index 75c01ec14..962fc2609 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -441,6 +441,9 @@ static void trace_vprintf(const char *fmt, va_list va);
 /* ============ Utility functions */
 #define xbarrier() do { __asm__ __volatile__ ("": : :"memory"); } while (0)
 
+#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
+#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
+
 static int isdigit_str9(const char *str)
 {
         int maxlen = 9 + 1; /* max 9 digits: 999999999 */
@@ -2064,27 +2067,6 @@ getoptsreset(const char *value)
 }
 #endif
 
-/* math.h has these, otherwise define our private copies */
-#if !ENABLE_SH_MATH_SUPPORT
-#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
-#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
-/*
- * Return the pointer to the first char which is not part of a legal variable name
- * (a letter or underscore followed by letters, underscores, and digits).
- */
-static const char*
-endofname(const char *name)
-{
-        if (!is_name(*name))
-                return name;
-        while (*++name) {
-                if (!is_in_name(*name))
-                        break;
-        }
-        return name;
-}
-#endif
-
 /*
  * Compares two strings up to the first = or '\0'.  The first
  * string must be terminated by '='; the second may be terminated by
@@ -12774,6 +12756,9 @@ dotcmd(int argc, char **argv)
         /* "false; . empty_file; echo $?" should print 0, not 1: */
         exitstatus = 0;
 
+        /* This aborts if file isn't found, which is POSIXly correct.
+         * bash returns exitcode 1 instead.
+         */
         fullname = find_dot_file(argv[1]);
 
         argv += 2;
@@ -12785,6 +12770,9 @@ dotcmd(int argc, char **argv)
                 shellparam.p = argv;
         };
 
+        /* This aborts if file can't be opened, which is POSIXly correct.
+         * bash returns exitcode 1 instead.
+         */
         setinputfile(fullname, INPUT_PUSH_FILE);
         commandname = fullname;
         cmdloop(0);
@@ -13832,27 +13820,21 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
 #endif
         procargs(argv);
 
-#if ENABLE_FEATURE_EDITING_SAVEHISTORY
-        if (iflag) {
-                const char *hp = lookupvar("HISTFILE");
-                if (!hp) {
-                        hp = lookupvar("HOME");
-                        if (hp) {
-                                char *defhp = concat_path_file(hp, ".ash_history");
-                                setvar("HISTFILE", defhp, 0);
-                                free(defhp);
-                        }
-                }
-        }
-#endif
         if (argv[0] && argv[0][0] == '-')
                 isloginsh = 1;
         if (isloginsh) {
+                const char *hp;
+
                 state = 1;
                 read_profile("/etc/profile");
  state1:
                 state = 2;
-                read_profile(".profile");
+                hp = lookupvar("HOME");
+                if (hp) {
+                        hp = concat_path_file(hp, ".profile");
+                        read_profile(hp);
+                        free((char*)hp);
+                }
         }
  state2:
         state = 3;
@@ -13884,6 +13866,15 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
 #if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY
                 if (iflag) {
                         const char *hp = lookupvar("HISTFILE");
+                        if (!hp) {
+                                hp = lookupvar("HOME");
+                                if (hp) {
+                                        hp = concat_path_file(hp, ".ash_history");
+                                        setvar("HISTFILE", hp, 0);
+                                        free((char*)hp);
+                                        hp = lookupvar("HISTFILE");
+                                }
+                        }
                         if (hp)
                                 line_input_state->hist_file = hp;
 # if ENABLE_FEATURE_SH_HISTFILESIZE
diff --git a/shell/hush.c b/shell/hush.c
index e2dc1e2d0..b23325725 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -8880,6 +8880,9 @@ static int FAST_FUNC builtin_source(char **argv)
         free(arg_path);
         if (!input) {
                 /* bb_perror_msg("%s", *argv); - done by fopen_or_warn */
+                /* POSIX: non-interactive shell should abort here,
+                 * not merely fail. So far no one complained :)
+                 */
                 return EXIT_FAILURE;
         }
         close_on_exec_on(fileno(input));
@@ -8889,12 +8892,14 @@ static int FAST_FUNC builtin_source(char **argv)
         /* "we are inside sourced file, ok to use return" */
         G.flag_return_in_progress = -1;
 #endif
-        save_and_replace_G_args(&sv, argv);
+        if (argv[1])
+                save_and_replace_G_args(&sv, argv);
 
         parse_and_run_file(input);
         fclose(input);
 
-        restore_G_args(&sv, argv);
+        if (argv[1])
+                restore_G_args(&sv, argv);
 #if ENABLE_HUSH_FUNCTIONS
         G.flag_return_in_progress = sv_flg;
 #endif
diff --git a/shell/hush_test/hush-misc/source2.right b/shell/hush_test/hush-misc/source2.right
new file mode 100644
index 000000000..0587bad67
--- /dev/null
+++ b/shell/hush_test/hush-misc/source2.right
@@ -0,0 +1,4 @@
+0:arg0 1:arg1 2:arg2
+Ok1:0
+0:arg0 1:q 2:w
+Ok2:0
diff --git a/shell/hush_test/hush-misc/source2.tests b/shell/hush_test/hush-misc/source2.tests
new file mode 100755
index 000000000..40b6b83cd
--- /dev/null
+++ b/shell/hush_test/hush-misc/source2.tests
@@ -0,0 +1,8 @@
+echo 'echo "0:$0 1:$1 2:$2"' >sourced1
+set -- 1 2 3
+"$THIS_SH" -c '. ./sourced1' arg0 arg1 arg2
+echo Ok1:$?
+"$THIS_SH" -c '. ./sourced1 q w e' arg0 arg1 arg2
+echo Ok2:$?
+
+rm sourced1
diff --git a/shell/math.c b/shell/math.c
index 15c003965..3da151137 100644
--- a/shell/math.c
+++ b/shell/math.c
@@ -494,18 +494,6 @@ static const char op_tokens[] ALIGN1 = {
 };
 #define ptr_to_rparen (&op_tokens[sizeof(op_tokens)-7])
 
-const char* FAST_FUNC
-endofname(const char *name)
-{
-        if (!is_name(*name))
-                return name;
-        while (*++name) {
-                if (!is_in_name(*name))
-                        break;
-        }
-        return name;
-}
-
 static arith_t FAST_FUNC
 evaluate_string(arith_state_t *math_state, const char *expr)
 {
diff --git a/shell/math.h b/shell/math.h
index 2d305eb12..864bee691 100644
--- a/shell/math.h
+++ b/shell/math.h
@@ -73,11 +73,6 @@ typedef long arith_t;
 #define strto_arith_t strtoul
 #endif
 
-/* ash's and hush's endofname is the same, so... */
-# define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
-# define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
-const char* FAST_FUNC endofname(const char *name);
-
 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);
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 3fe3f5348..4f45b4f7f 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -29,7 +29,7 @@
 //usage:     "\n        -b N            N rotated logs to keep (default:1, max=99, 0=purge)"
 //usage:        )
 //usage:        IF_FEATURE_REMOTE_LOG(
-//usage:     "\n        -R HOST[:PORT]  Log to IP or hostname on PORT (default PORT=514/UDP)"
+//usage:     "\n        -R HOST[:PORT]  Log to HOST:PORT (default PORT:514)"
 //usage:     "\n        -L              Log locally and via network (default is network only if -R)"
 //usage:        )
 //usage:        IF_FEATURE_SYSLOGD_DUP(
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index f9c3b6b4d..dad49c3f5 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -25,6 +25,25 @@ testing "awk if string == "    "awk 'BEGIN{if(\"a\"==\"ab\") print \"bar\"}'" ""
 
 # 4294967295 = 0xffffffff
 testing "awk bitwise op"  "awk '{ print or(4294967295,1) }'" "4.29497e+09\n" "" "\n"
+
+# we were testing for a non-empty body when deciding if a function was
+# defined or not. The testcase below caused:
+# awk: cmd. line:8: Call to undefined function
+prg='
+function empty_fun(count) {
+  # empty
+}
+END {
+  i=1
+  print "L" i "\n"
+  empty_fun(i + i + ++i)
+  print "L" i "\n"
+}'
+testing "awk handles empty function f(arg){}" \
+        "awk '$prg'" \
+        "L1\n\nL2\n\n" \
+        "" ""
+
 optional DESKTOP
 testing "awk hex const 1" "awk '{ print or(0xffffffff,1) }'" "4.29497e+09\n" "" "\n"
 testing "awk hex const 2" "awk '{ print or(0x80000000,1) }'" "2.14748e+09\n" "" "\n"
diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c
index e7fcc067c..e32740dea 100644
--- a/util-linux/fdisk_sun.c
+++ b/util-linux/fdisk_sun.c
@@ -348,6 +348,7 @@ create_sunlabel(void)
 
         set_all_unchanged();
         set_changed(0);
+        check_sun_label();
         get_boot(CREATE_EMPTY_SUN);
 }
 
@@ -497,11 +498,14 @@ add_sun_partition(int n, int sys)
                 else
                         first = read_int(scround(start), scround(stop)+1,
                                          scround(stop), 0, mesg);
-                if (display_in_cyl_units)
+                if (display_in_cyl_units) {
                         first *= units_per_sector;
-                else
+                } else {
                         /* Starting sector has to be properly aligned */
-                        first = (first + g_heads * g_sectors - 1) / (g_heads * g_sectors);
+                        first = (first + g_heads * g_sectors - 1) /
+                                (g_heads * g_sectors);
+                        first *= g_heads * g_sectors;
+                }
                 if (n == 2 && first != 0)
                         printf("\
 It is highly recommended that the third partition covers the whole disk\n\
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index 21108d0bf..c69763335 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -8,16 +8,16 @@
  */
 
 //usage:#define losetup_trivial_usage
-//usage:       "[-r] [-o OFS] LOOPDEV FILE - associate loop devices\n"
+//usage:       "[-r] [-o OFS] {-f|LOOPDEV} FILE - associate loop devices\n"
 //usage:       "        losetup -d LOOPDEV - disassociate\n"
-//usage:       "        losetup [-f] - show"
+//usage:       "        losetup -a - show status of  all\n"
+//usage:       "        losetup -f - show next available"
 //usage:#define losetup_full_usage "\n\n"
 //usage:       "        -o OFS  Start OFS bytes into FILE"
 //usage:     "\n        -r      Read-only"
-//usage:     "\n        -f      Show first free loop device"
+//usage:     "\n        -f      Show/find first free loop device"
 //usage:
 //usage:#define losetup_notes_usage
-//usage:       "No arguments will display all current associations.\n"
 //usage:       "One argument (losetup /dev/loop1) will display the current association\n"
 //usage:       "(if any), or disassociate it (with -d). The display shows the offset\n"
 //usage:       "and filename of the file the loop device is currently bound to.\n\n"
@@ -31,77 +31,91 @@ int losetup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int losetup_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned opt;
-        int n;
         char *opt_o;
-        unsigned long long offset = 0;
+        char dev[LOOP_NAMESIZE];
         enum {
                 OPT_d = (1 << 0),
                 OPT_o = (1 << 1),
                 OPT_f = (1 << 2),
-                OPT_r = (1 << 3), /* must be last */
+                OPT_a = (1 << 3),
+                OPT_r = (1 << 4), /* must be last */
         };
 
-        /* max 2 args, -d,-o,-f opts are mutually exclusive */
-        opt_complementary = "?2:d--of:o--df:f--do";
-        opt = getopt32(argv, "do:fr", &opt_o);
+        opt_complementary = "?2:d--ofar:a--ofr";
+        opt = getopt32(argv, "do:far", &opt_o);
         argv += optind;
 
-        if (opt == OPT_o)
-                offset = xatoull(opt_o);
+        /* LOOPDEV */
+        if (!opt && argv[0] && !argv[1]) {
+                char *s;
 
+                s = query_loop(argv[0]);
+                if (!s)
+                        bb_simple_perror_msg_and_die(argv[0]);
+                printf("%s: %s\n", argv[0], s);
+                if (ENABLE_FEATURE_CLEAN_UP)
+                        free(s);
+                return EXIT_SUCCESS;
+        }
+
+        /* -d LOOPDEV */
         if (opt == OPT_d) {
-                /* -d BLOCKDEV */
-                if (!argv[0] || argv[1])
-                        bb_show_usage();
                 if (del_loop(argv[0]))
                         bb_simple_perror_msg_and_die(argv[0]);
                 return EXIT_SUCCESS;
         }
 
-        if (argv[0]) {
-                char *s;
-
-                if (opt == OPT_f) /* -f should not have arguments */
-                        bb_show_usage();
+        /* -a */
+        if (opt == OPT_a) {
+                int n;
+                for (n = 0; n < 10; n++) {
+                        char *s;
 
-                if (argv[1]) {
-                        /* [-r] [-o OFS] BLOCKDEV FILE */
-                        if (set_loop(&argv[0], argv[1], offset, (opt / OPT_r)) < 0)
-                                bb_simple_perror_msg_and_die(argv[0]);
-                        return EXIT_SUCCESS;
+                        sprintf(dev, LOOP_FORMAT, n);
+                        s = query_loop(dev);
+                        if (s) {
+                                printf("%s: %s\n", dev, s);
+                                if (ENABLE_FEATURE_CLEAN_UP)
+                                        free(s);
+                        }
                 }
-                /* [-r] [-o OFS] BLOCKDEV */
-                s = query_loop(argv[0]);
-                if (!s)
-                        bb_simple_perror_msg_and_die(argv[0]);
-                printf("%s: %s\n", argv[0], s);
-                if (ENABLE_FEATURE_CLEAN_UP)
-                        free(s);
                 return EXIT_SUCCESS;
         }
 
-        /* [-r] [-o OFS|-f] with no params */
-        n = 0;
-        while (1) {
+        /* contains -f */
+        if (opt & OPT_f) {
                 char *s;
-                char dev[LOOP_NAMESIZE];
+                int n = 0;
 
-                sprintf(dev, LOOP_FORMAT, n);
-                s = query_loop(dev);
-                n++;
-                if (!s) {
-                        if (n > 9 && errno && errno != ENXIO)
-                                return EXIT_SUCCESS;
-                        if (opt == OPT_f) {
-                                puts(dev);
-                                return EXIT_SUCCESS;
-                        }
-                } else {
-                        if (opt != OPT_f)
-                                printf("%s: %s\n", dev, s);
-                        if (ENABLE_FEATURE_CLEAN_UP)
+                do {
+                        sprintf(dev, LOOP_FORMAT, n);
+                        s = query_loop(dev);
+                        if (s && ENABLE_FEATURE_CLEAN_UP)
                                 free(s);
+                } while (s);
+                if ((opt == OPT_f) && !argv[0]) {
+                        puts(dev);
+                        return EXIT_SUCCESS;
                 }
         }
-        return EXIT_SUCCESS;
+
+        /* [-r] [-o OFS] {-f|LOOPDEV} FILE */
+        if (argv[0] && ((opt & OPT_f) || argv[1])) {
+                unsigned long long offset = 0;
+                char *d = dev;
+
+                if (opt == OPT_o)
+                        offset = xatoull(opt_o);
+                if (opt != OPT_f)
+                        d = *(argv++);
+
+                if (argv[0]) {
+                        if (set_loop(&d, argv[0], offset, (opt / OPT_r)) < 0)
+                                bb_simple_perror_msg_and_die(argv[0]);
+                        return EXIT_SUCCESS;
+                }
+        }
+
+        bb_show_usage();
+        return EXIT_FAILURE;
 }
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index c592ef687..5fe6bbbde 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -80,7 +80,7 @@
 //usage:        IF_FEATURE_MDEV_CONF(
 //usage:       "\n"
 //usage:       "It uses /etc/mdev.conf with lines\n"
-//usage:       "        [-]DEVNAME UID:GID PERM"
+//usage:       "        [-][ENV=regex;]...DEVNAME UID:GID PERM"
 //usage:                        IF_FEATURE_MDEV_RENAME(" [>|=PATH]|[!]")
 //usage:                        IF_FEATURE_MDEV_EXEC(" [@|$|*PROG]")
 //usage:       "\n"
@@ -230,9 +230,34 @@
  * SUBSYSTEM=block
  */
 
-static const char keywords[] ALIGN1 = "add\0remove\0change\0";
+#define DEBUG_LVL 2
+
+#if DEBUG_LVL >= 1
+# define dbg1(...) do { if (G.verbose) bb_error_msg(__VA_ARGS__); } while(0)
+#else
+# define dbg1(...) ((void)0)
+#endif
+#if DEBUG_LVL >= 2
+# define dbg2(...) do { if (G.verbose >= 2) bb_error_msg(__VA_ARGS__); } while(0)
+#else
+# define dbg2(...) ((void)0)
+#endif
+#if DEBUG_LVL >= 3
+# define dbg3(...) do { if (G.verbose >= 3) bb_error_msg(__VA_ARGS__); } while(0)
+#else
+# define dbg3(...) ((void)0)
+#endif
+
+
+static const char keywords[] ALIGN1 = "add\0remove\0"; // "change\0"
 enum { OP_add, OP_remove };
 
+struct envmatch {
+        struct envmatch *next;
+        char *envname;
+        regex_t match;
+};
+
 struct rule {
         bool keep_matching;
         bool regex_compiled;
@@ -243,12 +268,14 @@ struct rule {
         char *ren_mov;
         IF_FEATURE_MDEV_EXEC(char *r_cmd;)
         regex_t match;
+        struct envmatch *envmatch;
 };
 
 struct globals {
         int root_major, root_minor;
         smallint verbose;
         char *subsystem;
+        char *subsys_env; /* for putenv("SUBSYSTEM=subsystem") */
 #if ENABLE_FEATURE_MDEV_CONF
         const char *filename;
         parser_t *parser;
@@ -256,6 +283,7 @@ struct globals {
         unsigned rule_idx;
 #endif
         struct rule cur_rule;
+        char timestr[sizeof("60.123456")];
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define INIT_G() do { \
@@ -270,13 +298,6 @@ struct globals {
 /* We use additional 64+ bytes in make_device() */
 #define SCRATCH_SIZE 80
 
-#if 0
-# define dbg(...) bb_error_msg(__VA_ARGS__)
-#else
-# define dbg(...) ((void)0)
-#endif
-
-
 #if ENABLE_FEATURE_MDEV_CONF
 
 static void make_default_cur_rule(void)
@@ -288,14 +309,48 @@ static void make_default_cur_rule(void)
 
 static void clean_up_cur_rule(void)
 {
+        struct envmatch *e;
+
         free(G.cur_rule.envvar);
+        free(G.cur_rule.ren_mov);
         if (G.cur_rule.regex_compiled)
                 regfree(&G.cur_rule.match);
-        free(G.cur_rule.ren_mov);
         IF_FEATURE_MDEV_EXEC(free(G.cur_rule.r_cmd);)
+        e = G.cur_rule.envmatch;
+        while (e) {
+                free(e->envname);
+                regfree(&e->match);
+                e = e->next;
+        }
         make_default_cur_rule();
 }
 
+static char *parse_envmatch_pfx(char *val)
+{
+        struct envmatch **nextp = &G.cur_rule.envmatch;
+
+        for (;;) {
+                struct envmatch *e;
+                char *semicolon;
+                char *eq = strchr(val, '=');
+                if (!eq /* || eq == val? */)
+                        return val;
+                if (endofname(val) != eq)
+                        return val;
+                semicolon = strchr(eq, ';');
+                if (!semicolon)
+                        return val;
+                /* ENVVAR=regex;... */
+                *nextp = e = xzalloc(sizeof(*e));
+                nextp = &e->next;
+                e->envname = xstrndup(val, eq - val);
+                *semicolon = '\0';
+                xregcomp(&e->match, eq + 1, REG_EXTENDED);
+                *semicolon = ';';
+                val = semicolon + 1;
+        }
+}
+
 static void parse_next_rule(void)
 {
         /* Note: on entry, G.cur_rule is set to default */
@@ -308,12 +363,13 @@ static void parse_next_rule(void)
                         break;
 
                 /* Fields: [-]regex uid:gid mode [alias] [cmd] */
-                dbg("token1:'%s'", tokens[1]);
+                dbg3("token1:'%s'", tokens[1]);
 
                 /* 1st field */
                 val = tokens[0];
                 G.cur_rule.keep_matching = ('-' == val[0]);
                 val += G.cur_rule.keep_matching; /* swallow leading dash */
+                val = parse_envmatch_pfx(val);
                 if (val[0] == '@') {
                         /* @major,minor[-minor2] */
                         /* (useful when name is ambiguous:
@@ -328,8 +384,10 @@ static void parse_next_rule(void)
                         if (sc == 2)
                                 G.cur_rule.min1 = G.cur_rule.min0;
                 } else {
+                        char *eq = strchr(val, '=');
                         if (val[0] == '$') {
-                                char *eq = strchr(++val, '=');
+                                /* $ENVVAR=regex ... */
+                                val++;
                                 if (!eq) {
                                         bb_error_msg("bad $envvar=regex on line %d", G.parser->lineno);
                                         goto next_rule;
@@ -373,7 +431,7 @@ static void parse_next_rule(void)
                 clean_up_cur_rule();
         } /* while (config_read) */
 
-        dbg("config_close(G.parser)");
+        dbg3("config_close(G.parser)");
         config_close(G.parser);
         G.parser = NULL;
 
@@ -390,7 +448,7 @@ static const struct rule *next_rule(void)
 
         /* Open conf file if we didn't do it yet */
         if (!G.parser && G.filename) {
-                dbg("config_open('%s')", G.filename);
+                dbg3("config_open('%s')", G.filename);
                 G.parser = config_open2(G.filename, fopen_for_read);
                 G.filename = NULL;
         }
@@ -399,7 +457,7 @@ static const struct rule *next_rule(void)
                 /* mdev -s */
                 /* Do we have rule parsed already? */
                 if (G.rule_vec[G.rule_idx]) {
-                        dbg("< G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
+                        dbg3("< G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
                         return G.rule_vec[G.rule_idx++];
                 }
                 make_default_cur_rule();
@@ -416,13 +474,28 @@ static const struct rule *next_rule(void)
                         rule = memcpy(xmalloc(sizeof(G.cur_rule)), &G.cur_rule, sizeof(G.cur_rule));
                         G.rule_vec = xrealloc_vector(G.rule_vec, 4, G.rule_idx);
                         G.rule_vec[G.rule_idx++] = rule;
-                        dbg("> G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
+                        dbg3("> G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
                 }
         }
 
         return rule;
 }
 
+static int env_matches(struct envmatch *e)
+{
+        while (e) {
+                int r;
+                char *val = getenv(e->envname);
+                if (!val)
+                        return 0;
+                r = regexec(&e->match, val, /*size*/ 0, /*range[]*/ NULL, /*eflags*/ 0);
+                if (r != 0) /* no match */
+                        return 0;
+                e = e->next;
+        }
+        return 1;
+}
+
 #else
 
 # define next_rule() (&G.cur_rule)
@@ -479,9 +552,6 @@ static void make_device(char *device_name, char *path, int operation)
 {
         int major, minor, type, len;
 
-        if (G.verbose)
-                bb_error_msg("device: %s, %s", device_name, path);
-
         /* Try to read major/minor string.  Note that the kernel puts \n after
          * the data, so we don't need to worry about null terminating the string
          * because sscanf() will stop at the first nondigit, which \n is.
@@ -500,8 +570,7 @@ static void make_device(char *device_name, char *path, int operation)
                         /* no "dev" file, but we can still run scripts
                          * based on device name */
                 } else if (sscanf(++dev_maj_min, "%u:%u", &major, &minor) == 2) {
-                        if (G.verbose)
-                                bb_error_msg("maj,min: %u,%u", major, minor);
+                        dbg1("dev %u,%u", major, minor);
                 } else {
                         major = -1;
                 }
@@ -511,7 +580,8 @@ static void make_device(char *device_name, char *path, int operation)
         /* Determine device name, type, major and minor */
         if (!device_name)
                 device_name = (char*) bb_basename(path);
-        /* http://kernel.org/doc/pending/hotplug.txt says that only
+        /*
+         * http://kernel.org/doc/pending/hotplug.txt says that only
          * "/sys/block/..." is for block devices. "/sys/bus" etc is not.
          * But since 2.6.25 block devices are also in /sys/class/block.
          * We use strstr("/block/") to forestall future surprises.
@@ -537,6 +607,8 @@ static void make_device(char *device_name, char *path, int operation)
                 rule = next_rule();
 
 #if ENABLE_FEATURE_MDEV_CONF
+                if (!env_matches(rule->envmatch))
+                        continue;
                 if (rule->maj >= 0) {  /* @maj,min rule */
                         if (major != rule->maj)
                                 continue;
@@ -547,7 +619,7 @@ static void make_device(char *device_name, char *path, int operation)
                 }
                 if (rule->envvar) { /* $envvar=regex rule */
                         str_to_match = getenv(rule->envvar);
-                        dbg("getenv('%s'):'%s'", rule->envvar, str_to_match);
+                        dbg3("getenv('%s'):'%s'", rule->envvar, str_to_match);
                         if (!str_to_match)
                                 continue;
                 }
@@ -555,7 +627,7 @@ static void make_device(char *device_name, char *path, int operation)
 
                 if (rule->regex_compiled) {
                         int regex_match = regexec(&rule->match, str_to_match, ARRAY_SIZE(off), off, 0);
-                        dbg("regex_match for '%s':%d", str_to_match, regex_match);
+                        dbg3("regex_match for '%s':%d", str_to_match, regex_match);
                         //bb_error_msg("matches:");
                         //for (int i = 0; i < ARRAY_SIZE(off); i++) {
                         //      if (off[i].rm_so < 0) continue;
@@ -574,9 +646,8 @@ static void make_device(char *device_name, char *path, int operation)
                 }
                 /* else: it's final implicit "match-all" rule */
  rule_matches:
+                dbg2("rule matched, line %d", G.parser ? G.parser->lineno : -1);
 #endif
-                dbg("rule matched");
-
                 /* Build alias name */
                 alias = NULL;
                 if (ENABLE_FEATURE_MDEV_RENAME && rule->ren_mov) {
@@ -619,34 +690,30 @@ static void make_device(char *device_name, char *path, int operation)
                                 }
                         }
                 }
-                dbg("alias:'%s'", alias);
+                dbg3("alias:'%s'", alias);
 
                 command = NULL;
                 IF_FEATURE_MDEV_EXEC(command = rule->r_cmd;)
                 if (command) {
-                        const char *s = "$@*";
-                        const char *s2 = strchr(s, command[0]);
-
                         /* Are we running this command now?
-                         * Run $cmd on delete, @cmd on create, *cmd on both
+                         * Run @cmd on create, $cmd on delete, *cmd on any
                          */
-                        if (s2 - s != (operation == OP_remove) || *s2 == '*') {
-                                /* We are here if: '*',
-                                 * or: '@' and delete = 0,
-                                 * or: '$' and delete = 1
-                                 */
+                        if ((command[0] == '@' && operation == OP_add)
+                         || (command[0] == '$' && operation == OP_remove)
+                         || (command[0] == '*')
+                        ) {
                                 command++;
                         } else {
                                 command = NULL;
                         }
                 }
-                dbg("command:'%s'", command);
+                dbg3("command:'%s'", command);
 
                 /* "Execute" the line we found */
                 node_name = device_name;
                 if (ENABLE_FEATURE_MDEV_RENAME && alias) {
                         node_name = alias = build_alias(alias, device_name);
-                        dbg("alias2:'%s'", alias);
+                        dbg3("alias2:'%s'", alias);
                 }
 
                 if (operation == OP_add && major >= 0) {
@@ -656,13 +723,20 @@ static void make_device(char *device_name, char *path, int operation)
                                 mkdir_recursive(node_name);
                                 *slash = '/';
                         }
-                        if (G.verbose)
-                                bb_error_msg("mknod: %s (%d,%d) %o", node_name, major, minor, rule->mode | type);
+                        if (ENABLE_FEATURE_MDEV_CONF) {
+                                dbg1("mknod %s (%d,%d) %o"
+                                        " %u:%u",
+                                        node_name, major, minor, rule->mode | type,
+                                        rule->ugid.uid, rule->ugid.gid
+                                );
+                        } else {
+                                dbg1("mknod %s (%d,%d) %o",
+                                        node_name, major, minor, rule->mode | type
+                                );
+                        }
                         if (mknod(node_name, rule->mode | type, makedev(major, minor)) && errno != EEXIST)
                                 bb_perror_msg("can't create '%s'", node_name);
                         if (ENABLE_FEATURE_MDEV_CONF) {
-                                if (G.verbose)
-                                        bb_error_msg("chmod: %o chown: %u:%u", rule->mode, rule->ugid.uid, rule->ugid.gid);
                                 chmod(node_name, rule->mode);
                                 chown(node_name, rule->ugid.uid, rule->ugid.gid);
                         }
@@ -673,8 +747,7 @@ static void make_device(char *device_name, char *path, int operation)
 //TODO: on devtmpfs, device_name already exists and symlink() fails.
 //End result is that instead of symlink, we have two nodes.
 //What should be done?
-                                        if (G.verbose)
-                                                bb_error_msg("symlink: %s", device_name);
+                                        dbg1("symlink: %s", device_name);
                                         symlink(node_name, device_name);
                                 }
                         }
@@ -683,27 +756,21 @@ static void make_device(char *device_name, char *path, int operation)
                 if (ENABLE_FEATURE_MDEV_EXEC && command) {
                         /* setenv will leak memory, use putenv/unsetenv/free */
                         char *s = xasprintf("%s=%s", "MDEV", node_name);
-                        char *s1 = xasprintf("%s=%s", "SUBSYSTEM", G.subsystem);
                         putenv(s);
-                        putenv(s1);
-                        if (G.verbose)
-                                bb_error_msg("running: %s", command);
+                        dbg1("running: %s", command);
                         if (system(command) == -1)
                                 bb_perror_msg("can't run '%s'", command);
-                        bb_unsetenv_and_free(s1);
                         bb_unsetenv_and_free(s);
                 }
 
                 if (operation == OP_remove && major >= -1) {
                         if (ENABLE_FEATURE_MDEV_RENAME && alias) {
                                 if (aliaslink == '>') {
-                                        if (G.verbose)
-                                                bb_error_msg("unlink: %s", device_name);
+                                        dbg1("unlink: %s", device_name);
                                         unlink(device_name);
                                 }
                         }
-                        if (G.verbose)
-                                bb_error_msg("unlink: %s", node_name);
+                        dbg1("unlink: %s", node_name);
                         unlink(node_name);
                 }
 
@@ -748,9 +815,16 @@ static int FAST_FUNC dirAction(const char *fileName UNUSED_PARAM,
          * under /sys/class/ */
         if (1 == depth) {
                 free(G.subsystem);
+                if (G.subsys_env) {
+                        bb_unsetenv_and_free(G.subsys_env);
+                        G.subsys_env = NULL;
+                }
                 G.subsystem = strrchr(fileName, '/');
-                if (G.subsystem)
+                if (G.subsystem) {
                         G.subsystem = xstrdup(G.subsystem + 1);
+                        G.subsys_env = xasprintf("%s=%s", "SUBSYSTEM", G.subsystem);
+                        putenv(G.subsys_env);
+                }
         }
 
         return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE);
@@ -822,6 +896,100 @@ static void load_firmware(const char *firmware, const char *sysfs_path)
         }
 }
 
+static char *curtime(void)
+{
+        struct timeval tv;
+        gettimeofday(&tv, NULL);
+        sprintf(G.timestr, "%u.%06u", (unsigned)tv.tv_sec % 60, (unsigned)tv.tv_usec);
+        return G.timestr;
+}
+
+static void open_mdev_log(const char *seq, unsigned my_pid)
+{
+        int logfd = open("mdev.log", O_WRONLY | O_APPEND);
+        if (logfd >= 0) {
+                xmove_fd(logfd, STDERR_FILENO);
+                G.verbose = 2;
+                applet_name = xasprintf("%s[%s]", applet_name, seq ? seq : utoa(my_pid));
+        }
+}
+
+/* If it exists, does /dev/mdev.seq match $SEQNUM?
+ * If it does not match, earlier mdev is running
+ * in parallel, and we need to wait.
+ * Active mdev pokes us with SIGCHLD to check the new file.
+ */
+static int
+wait_for_seqfile(const char *seq)
+{
+        /* We time out after 2 sec */
+        static const struct timespec ts = { 0, 32*1000*1000 };
+        int timeout = 2000 / 32;
+        int seq_fd = -1;
+        int do_once = 1;
+        sigset_t set_CHLD;
+
+        sigemptyset(&set_CHLD);
+        sigaddset(&set_CHLD, SIGCHLD);
+        sigprocmask(SIG_BLOCK, &set_CHLD, NULL);
+
+        for (;;) {
+                int seqlen;
+                char seqbuf[sizeof(int)*3 + 2];
+
+                if (seq_fd < 0) {
+                        seq_fd = open("mdev.seq", O_RDWR);
+                        if (seq_fd < 0)
+                                break;
+                }
+                seqlen = pread(seq_fd, seqbuf, sizeof(seqbuf) - 1, 0);
+                if (seqlen < 0) {
+                        close(seq_fd);
+                        seq_fd = -1;
+                        break;
+                }
+                seqbuf[seqlen] = '\0';
+                if (seqbuf[0] == '\n') {
+                        /* seed file: write out seq ASAP */
+                        xwrite_str(seq_fd, seq);
+                        xlseek(seq_fd, 0, SEEK_SET);
+                        dbg2("first seq written");
+                        break;
+                }
+                if (strcmp(seq, seqbuf) == 0) {
+                        /* correct idx */
+                        break;
+                }
+                if (do_once) {
+                        dbg2("%s waiting for '%s'", curtime(), seqbuf);
+                        do_once = 0;
+                }
+                if (sigtimedwait(&set_CHLD, NULL, &ts) >= 0) {
+                        dbg3("woken up");
+                        continue; /* don't decrement timeout! */
+                }
+                if (--timeout == 0) {
+                        dbg1("%s waiting for '%s'", "timed out", seqbuf);
+                        break;
+                }
+        }
+        sigprocmask(SIG_UNBLOCK, &set_CHLD, NULL);
+        return seq_fd;
+}
+
+static void signal_mdevs(unsigned my_pid)
+{
+        procps_status_t* p = NULL;
+        while ((p = procps_scan(p, PSSCAN_ARGV0)) != NULL) {
+                if (p->pid != my_pid
+                 && p->argv0
+                 && strcmp(bb_basename(p->argv0), "mdev") == 0
+                ) {
+                        kill(p->pid, SIGCHLD);
+                }
+        }
+}
+
 int mdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mdev_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -843,8 +1011,8 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
         xchdir("/dev");
 
         if (argv[1] && strcmp(argv[1], "-s") == 0) {
-                /* Scan:
-                 * mdev -s
+                /*
+                 * Scan: mdev -s
                  */
                 struct stat st;
 
@@ -856,6 +1024,8 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
                 G.root_major = major(st.st_dev);
                 G.root_minor = minor(st.st_dev);
 
+                putenv((char*)"ACTION=add");
+
                 /* ACTION_FOLLOWLINKS is needed since in newer kernels
                  * /sys/block/loop* (for example) are symlinks to dirs,
                  * not real directories.
@@ -881,11 +1051,13 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
                 char *action;
                 char *env_devname;
                 char *env_devpath;
+                unsigned my_pid;
+                int seq_fd;
                 smalluint op;
 
                 /* Hotplug:
                  * env ACTION=... DEVPATH=... SUBSYSTEM=... [SEQNUM=...] mdev
-                 * ACTION can be "add" or "remove"
+                 * ACTION can be "add", "remove", "change"
                  * DEVPATH is like "/block/sda" or "/class/input/mice"
                  */
                 action = getenv("ACTION");
@@ -896,41 +1068,20 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
                 if (!action || !env_devpath /*|| !G.subsystem*/)
                         bb_show_usage();
                 fw = getenv("FIRMWARE");
-                /* If it exists, does /dev/mdev.seq match $SEQNUM?
-                 * If it does not match, earlier mdev is running
-                 * in parallel, and we need to wait */
                 seq = getenv("SEQNUM");
-                if (seq) {
-                        int timeout = 2000 / 32; /* 2000 msec */
-                        do {
-                                int seqlen;
-                                char seqbuf[sizeof(int)*3 + 2];
-
-                                seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1);
-                                if (seqlen < 0) {
-                                        seq = NULL;
-                                        break;
-                                }
-                                seqbuf[seqlen] = '\0';
-                                if (seqbuf[0] == '\n' /* seed file? */
-                                 || strcmp(seq, seqbuf) == 0 /* correct idx? */
-                                ) {
-                                        break;
-                                }
-                                usleep(32*1000);
-                        } while (--timeout);
-                }
 
-                {
-                        int logfd = open("mdev.log", O_WRONLY | O_APPEND);
-                        if (logfd >= 0) {
-                                xmove_fd(logfd, STDERR_FILENO);
-                                G.verbose = 1;
-                                if (seq)
-                                        applet_name = xasprintf("%s[%s]", applet_name, seq);
-                                bb_error_msg("action: %s", action);
-                        }
-                }
+                my_pid = getpid();
+                open_mdev_log(seq, my_pid);
+
+                seq_fd = seq ? wait_for_seqfile(seq) : -1;
+
+                dbg1("%s "
+                        "ACTION:%s SUBSYSTEM:%s DEVNAME:%s DEVPATH:%s"
+                        "%s%s",
+                        curtime(),
+                        action, G.subsystem, env_devname, env_devpath,
+                        fw ? " FW:" : "", fw ? fw : ""
+                );
 
                 snprintf(temp, PATH_MAX, "/sys%s", env_devpath);
                 if (op == OP_remove) {
@@ -940,16 +1091,18 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
                         if (!fw)
                                 make_device(env_devname, temp, op);
                 }
-                else if (op == OP_add) {
+                else {
                         make_device(env_devname, temp, op);
                         if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) {
-                                if (fw)
+                                if (op == OP_add && fw)
                                         load_firmware(fw, temp);
                         }
                 }
 
-                if (seq) {
-                        xopen_xwrite_close("mdev.seq", utoa(xatou(seq) + 1));
+                dbg1("%s exiting", curtime());
+                if (seq_fd >= 0) {
+                        xwrite_str(seq_fd, utoa(xatou(seq) + 1));
+                        signal_mdevs(my_pid);
                 }
         }
 
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 59d7d23d4..49afd1176 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -196,54 +196,6 @@ static void minix_clrbit(char *a, unsigned i)
 # define BLKGETSIZE     _IO(0x12,96)    /* return device size */
 #endif
 
-
-static long valid_offset(int fd, int offset)
-{
-        char ch;
-
-        if (lseek(fd, offset, SEEK_SET) < 0)
-                return 0;
-        if (read(fd, &ch, 1) < 1)
-                return 0;
-        return 1;
-}
-
-static int count_blocks(int fd)
-{
-        int high, low;
-
-        low = 0;
-        for (high = 1; valid_offset(fd, high); high *= 2)
-                low = high;
-
-        while (low < high - 1) {
-                const int mid = (low + high) / 2;
-
-                if (valid_offset(fd, mid))
-                        low = mid;
-                else
-                        high = mid;
-        }
-        valid_offset(fd, 0);
-        return (low + 1);
-}
-
-static int get_size(const char *file)
-{
-        int fd;
-        long size;
-
-        fd = xopen(file, O_RDWR);
-        if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
-                close(fd);
-                return (size * 512);
-        }
-
-        size = count_blocks(fd);
-        close(fd);
-        return size;
-}
-
 static void write_tables(void)
 {
         /* Mark the superblock valid. */
@@ -636,7 +588,6 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned opt;
         char *tmp;
-        struct stat statbuf;
         char *str_i;
         char *listfile = NULL;
 
@@ -673,13 +624,17 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
 #endif
         }
 
-        G.device_name = *argv++;
+        G.device_name = argv[0];
         if (!G.device_name)
                 bb_show_usage();
-        if (*argv)
-                G.total_blocks = xatou32(*argv);
-        else
-                G.total_blocks = get_size(G.device_name) / 1024;
+
+        /* Check if it is mounted */
+        if (find_mount_point(G.device_name, 0))
+                bb_error_msg_and_die("can't format mounted filesystem");
+
+        xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
+
+        G.total_blocks = get_volume_size_in_bytes(dev_fd, argv[1], 1024, /*extend:*/ 1) / 1024;
 
         if (G.total_blocks < 10)
                 bb_error_msg_and_die("must have at least 10 blocks");
@@ -690,25 +645,21 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
                         G.magic = MINIX2_SUPER_MAGIC;
         } else if (G.total_blocks > 65535)
                 G.total_blocks = 65535;
-
-        /* Check if it is mounted */
-        if (find_mount_point(G.device_name, 0))
-                bb_error_msg_and_die("can't format mounted filesystem");
-
-        xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
+#if 0
+        struct stat statbuf;
         xfstat(dev_fd, &statbuf, G.device_name);
+/* why? */
         if (!S_ISBLK(statbuf.st_mode))
                 opt &= ~1; // clear -c (check)
-
+#if 0
 /* I don't know why someone has special code to prevent mkfs.minix
  * on IDE devices. Why IDE but not SCSI, etc?... */
-#if 0
         else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
                 /* what is this? */
                 bb_error_msg_and_die("will not try "
                         "to make filesystem on '%s'", G.device_name);
 #endif
-
+#endif
         tmp = G.root_block;
         *(short *) tmp = 1;
         strcpy(tmp + 2, ".");