Merge branch 'busybox' into merge

130 files changed, 2217 insertions, 1327 deletions

diff --git a/Config.in b/Config.in
index 8999e1699..8c0e64988 100644
--- a/Config.in
+++ b/Config.in
@@ -184,12 +184,13 @@ config UNICODE_USING_LOCALE
           Internal implementation is smaller.
 
 config FEATURE_CHECK_UNICODE_IN_ENV
-        bool "Check $LANG environment variable"
+        bool "Check $LC_ALL, $LC_CTYPE and $LANG environment variables"
         default n
         depends on UNICODE_SUPPORT && !UNICODE_USING_LOCALE
         help
           With this option on, Unicode support is activated
-          only if LANG variable has the value of the form "xxxx.utf8"
+          only if locale-related variables have the value of the form
+          "xxxx.utf8"
 
           Otherwise, Unicode support will be always enabled and active.
 
diff --git a/Makefile.custom b/Makefile.custom
index 6da79e6e4..3561e5768 100644
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -3,7 +3,12 @@
 # ==========================================================================
 
 busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h include/applets.h
-        $(Q)-$(SHELL) $^ >$@
+        $(Q)-$(SHELL) $^ > $@
+
+busybox.cfg.suid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autoconf.h include/applets.h
+        $(Q)-SUID="yes" $(SHELL) $^ > $@
+busybox.cfg.nosuid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autoconf.h include/applets.h
+        $(Q)-SUID="DROP" $(SHELL) $^ > $@
 
 .PHONY: install
 ifeq ($(CONFIG_INSTALL_APPLET_SYMLINKS),y)
diff --git a/TODO b/TODO
index 44364690f..d2a085ede 100644
--- a/TODO
+++ b/TODO
@@ -128,15 +128,6 @@ patch
   And while we're at it, a new patch filename quoting format is apparently
   coming soon:  http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
 ---
-stty / catv
-  stty's visible() function and catv's guts are identical. Merge them into
-  an appropriate libbb function.
----
-struct suffix_mult
-  Several duplicate users of: grep -r "1024\*1024" * -B2 -A1
-  Merge to a single size_suffixes[] in libbb.
-  Users: head tail od_bloaty hexdump and (partially as it wouldn't hurt) svlogd
----
 tail
   ./busybox tail -f foo.c~ TODO
   should not print fmt=header_fmt for subsequent date >> TODO; i.e. only
@@ -234,8 +225,6 @@ Minor stuff:
   See grep -r strtod
   Alot of duplication that wants cleanup.
 ---
-  in_ether duplicated in network/{interface,ifconfig}.c
----
   unify progress_meter. wget, flash_eraseall, pipe_progress, fbsplash, setfiles.
 ---
   support start-stop-daemon -d <chdir-path>
diff --git a/applets/busybox.mksuid b/applets/busybox.mksuid
new file mode 100755
index 000000000..6492c079a
--- /dev/null
+++ b/applets/busybox.mksuid
@@ -0,0 +1,54 @@
+#!/bin/sh
+# Make list of configuration variables regarding suid handling
+
+# input $1: full path to autoconf.h
+# input $2: full path to applets.h
+# input $3: full path to .config
+# output (stdout): list of CONFIG_ that do or may require suid
+
+# If the environment variable SUID is not set or set to DROP,
+# lists all config options that do not require suid permissions.
+# Otherwise, lists all config options for applets that DO or MAY require
+# suid permissions.
+
+# Maintainer: Bernhard Reutner-Fischer
+
+export LC_ALL=POSIX
+export LC_CTYPE=POSIX
+
+CONFIG_H=${1:-include/autoconf.h}
+APPLETS_H=${2:-include/applets.h}
+DOT_CONFIG=${3:-.config}
+
+case ${SUID:-DROP} in
+[dD][rR][oO][pP]) USE="DROP" ;;
+*) USE="suid" ;;
+esac
+
+$HOSTCC -E -DMAKE_SUID -include $CONFIG_H $APPLETS_H |
+  awk -v USE=${USE} '
+    /^SUID[ \t]/{
+      if (USE == "DROP") {
+        if ($2 != "BB_SUID_DROP") next
+      } else {
+        if ($2 == "BB_SUID_DROP") next
+      }
+      cfg = $NF
+      gsub("\"", "", cfg)
+      cfg = substr(cfg, 8)
+      s[i++] = "CONFIG_" cfg
+      s[i++] = "CONFIG_FEATURE_" cfg "_.*"
+    }
+    END{
+      while (getline < ARGV[2]) {
+        for (j in s) {
+          if ($0 ~ "^" s[j] "=y$") {
+            sub(/=.*/, "")
+            print
+            if (s[j] !~ /\*$/) delete s[j] # can drop this applet now
+          }
+        }
+      }
+    }
+' - $DOT_CONFIG
+
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index f77ac8383..9d1cd9485 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -132,7 +132,10 @@ int FAST_FUNC bbunpack(char **argv,
 
                 if (filename) {
                         char *del = new_name;
+
                         if (status >= 0) {
+                                unsigned new_name_len;
+
                                 /* TODO: restore other things? */
                                 if (aux.mtime != 0) {
                                         struct timeval times[2];
@@ -146,24 +149,31 @@ int FAST_FUNC bbunpack(char **argv,
                                         utimes(new_name, times); /* ignoring errors */
                                 }
 
-                                /* Delete _compressed_ file */
+                                if (ENABLE_DESKTOP)
+                                        new_name_len = strlen(new_name);
+                                /* Restore source filename (unless tgz -> tar case) */
+                                if (new_name == filename) {
+                                        new_name_len = strlen(filename);
+                                        filename[new_name_len] = '.';
+                                }
+                                /* Extreme bloat for gunzip compat */
+                                /* Some users do want this info... */
+                                if (ENABLE_DESKTOP && (option_mask32 & OPT_VERBOSE)) {
+                                        unsigned percent = status
+                                                ? ((uoff_t)stat_buf.st_size * 100u / (unsigned long long)status)
+                                                : 0;
+                                        fprintf(stderr, "%s: %u%% - replaced with %.*s\n",
+                                                filename,
+                                                100u - percent,
+                                                new_name_len, new_name
+                                        );
+                                }
+                                /* Delete _source_ file */
                                 del = filename;
-                                /* restore extension (unless tgz -> tar case) */
-                                if (new_name == filename)
-                                        filename[strlen(filename)] = '.';
                         }
                         if (ENABLE_PLATFORM_MINGW32)
                                 xclose(STDIN_FILENO);
                         xunlink(del);
-
-#if 0 /* Currently buggy - wrong name: "a.gz: 261% - replaced with a.gz" */
-                        /* Extreme bloat for gunzip compat */
-                        if (ENABLE_DESKTOP && (option_mask32 & OPT_VERBOSE) && status >= 0) {
-                                fprintf(stderr, "%s: %u%% - replaced with %s\n",
-                                        filename, (unsigned)(stat_buf.st_size*100 / (status+1)), new_name);
-                        }
-#endif
-
  free_name:
                         if (new_name != filename)
                                 free(new_name);
diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index 58457fc22..968fdf8ab 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -38,31 +38,45 @@ DPKG_FILES:= \
 
 INSERT
 
-lib-$(CONFIG_AR)                        += get_header_ar.o unpack_ar_archive.o
-lib-$(CONFIG_BUNZIP2)                   += decompress_bunzip2.o
-lib-$(CONFIG_UNLZMA)                    += decompress_unlzma.o
-lib-$(CONFIG_UNXZ)                      += decompress_unxz.o
-lib-$(CONFIG_CPIO)                      += get_header_cpio.o
 lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
 lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
-lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
-lib-$(CONFIG_RPM2CPIO)                  += decompress_gunzip.o get_header_cpio.o
-lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
+
+lib-$(CONFIG_AR)                        += get_header_ar.o unpack_ar_archive.o
+lib-$(CONFIG_CPIO)                      += get_header_cpio.o
 lib-$(CONFIG_TAR)                       += get_header_tar.o
-lib-$(CONFIG_UNCOMPRESS)                += decompress_uncompress.o
-lib-$(CONFIG_UNZIP)                     += decompress_gunzip.o
+lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
 lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
+lib-$(CONFIG_BUNZIP2)                   += open_transformer.o decompress_bunzip2.o
+lib-$(CONFIG_UNLZMA)                    += open_transformer.o decompress_unlzma.o
+lib-$(CONFIG_UNXZ)                      += open_transformer.o decompress_unxz.o
+lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_UNCOMPRESS)                += open_transformer.o decompress_uncompress.o
+lib-$(CONFIG_UNZIP)                     += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_RPM2CPIO)                  += open_transformer.o decompress_gunzip.o get_header_cpio.o
+lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
+
+lib-$(CONFIG_GZIP)                      += open_transformer.o
+lib-$(CONFIG_BZIP2)                     += open_transformer.o
+lib-$(CONFIG_LZOP)                      += open_transformer.o
+lib-$(CONFIG_MAN)                       += open_transformer.o
+lib-$(CONFIG_SETFONT)                   += open_transformer.o
+lib-$(CONFIG_FEATURE_2_4_MODULES)       += open_transformer.o
 lib-$(CONFIG_MODINFO)                   += open_transformer.o
 lib-$(CONFIG_INSMOD)                    += open_transformer.o
+lib-$(CONFIG_DEPMOD)                    += open_transformer.o
+lib-$(CONFIG_RMMOD)                     += open_transformer.o
+lib-$(CONFIG_LSMOD)                     += open_transformer.o
+lib-$(CONFIG_MODPROBE)                  += open_transformer.o
+lib-$(CONFIG_MODPROBE_SMALL)            += open_transformer.o
+
 lib-$(CONFIG_FEATURE_SEAMLESS_Z)        += open_transformer.o decompress_uncompress.o
 lib-$(CONFIG_FEATURE_SEAMLESS_GZ)       += open_transformer.o decompress_gunzip.o
 lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o
 lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.o
 lib-$(CONFIG_FEATURE_SEAMLESS_XZ)       += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += open_transformer.o decompress_bunzip2.o
-lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += decompress_bunzip2.o
-lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
+lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += open_transformer.o decompress_bunzip2.o
 
 ifneq ($(lib-y),)
 lib-y += $(COMMON_FILES)
diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index a2ce33b51..5b32c2ec8 100644
--- a/archival/libarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -103,7 +103,7 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle)
                                 archive_handle->tar__to_command_shell,
                                 "-c",
                                 archive_handle->tar__to_command,
-                                NULL);
+                                (char *)0);
                         bb_perror_msg_and_die("can't execute '%s'", archive_handle->tar__to_command_shell);
                 }
                 close(p[0]);
diff --git a/archival/tar.c b/archival/tar.c
index 648d1256d..3129781d2 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -569,7 +569,7 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip)
                 xmove_fd(gzipDataPipe.rd, 0);
                 xmove_fd(tar_fd, 1);
                 /* exec gzip/bzip2 program/applet */
-                BB_EXECLP(zip_exec, zip_exec, "-f", NULL);
+                BB_EXECLP(zip_exec, zip_exec, "-f", (char *)0);
                 vfork_exec_errno = errno;
                 _exit(EXIT_FAILURE);
         }
@@ -681,14 +681,12 @@ static llist_t *append_file_list_to_list(llist_t *list)
                         char *cp = last_char_is(line, '/');
                         if (cp > line)
                                 *cp = '\0';
-                        llist_add_to(&newlist, line);
+                        llist_add_to_end(&newlist, line);
                 }
                 fclose(src_stream);
         }
         return newlist;
 }
-#else
-# define append_file_list_to_list(x) 0
 #endif
 
 //usage:#define tar_trivial_usage
diff --git a/archival/unzip.c b/archival/unzip.c
index e4c824850..673e5fe08 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -163,7 +163,17 @@ enum { zip_fd = 3 };
 
 #if ENABLE_DESKTOP
 
-#define PEEK_FROM_END 16384
+/* Seen in the wild:
+ * Self-extracting PRO2K3XP_32.exe contains 19078464 byte zip archive,
+ * where CDE was nearly 48 kbytes before EOF.
+ * (Surprisingly, it also apparently has *another* CDE structure
+ * closer to the end, with bogus cdf_offset).
+ * To make extraction work, bumped PEEK_FROM_END from 16k to 64k.
+ */
+#define PEEK_FROM_END (64*1024)
+
+/* This value means that we failed to find CDF */
+#define BAD_CDF_OFFSET ((uint32_t)0xffffffff)
 
 /* NB: does not preserve file position! */
 static uint32_t find_cdf_offset(void)
@@ -180,6 +190,7 @@ static uint32_t find_cdf_offset(void)
         xlseek(zip_fd, end, SEEK_SET);
         full_read(zip_fd, buf, PEEK_FROM_END);
 
+        cde_header.formatted.cdf_offset = BAD_CDF_OFFSET;
         p = buf;
         while (p <= buf + PEEK_FROM_END - CDE_HEADER_LEN - 4) {
                 if (*p != 'P') {
@@ -195,11 +206,17 @@ static uint32_t find_cdf_offset(void)
                 /* we found CDE! */
                 memcpy(cde_header.raw, p + 1, CDE_HEADER_LEN);
                 FIX_ENDIANNESS_CDE(cde_header);
-                free(buf);
-                return cde_header.formatted.cdf_offset;
+                /*
+                 * I've seen .ZIP files with seemingly valid CDEs
+                 * where cdf_offset points past EOF - ??
+                 * Ignore such CDEs:
+                 */
+                if (cde_header.formatted.cdf_offset < end + (p - buf))
+                        break;
+                cde_header.formatted.cdf_offset = BAD_CDF_OFFSET;
         }
-        //free(buf);
-        bb_error_msg_and_die("can't find file table");
+        free(buf);
+        return cde_header.formatted.cdf_offset;
 };
 
 static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr)
@@ -211,13 +228,15 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr)
         if (!cdf_offset)
                 cdf_offset = find_cdf_offset();
 
-        xlseek(zip_fd, cdf_offset + 4, SEEK_SET);
-        xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN);
-        FIX_ENDIANNESS_CDF(*cdf_ptr);
-        cdf_offset += 4 + CDF_HEADER_LEN
-                + cdf_ptr->formatted.file_name_length
-                + cdf_ptr->formatted.extra_field_length
-                + cdf_ptr->formatted.file_comment_length;
+        if (cdf_offset != BAD_CDF_OFFSET) {
+                xlseek(zip_fd, cdf_offset + 4, SEEK_SET);
+                xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN);
+                FIX_ENDIANNESS_CDF(*cdf_ptr);
+                cdf_offset += 4 + CDF_HEADER_LEN
+                        + cdf_ptr->formatted.file_name_length
+                        + cdf_ptr->formatted.extra_field_length
+                        + cdf_ptr->formatted.file_comment_length;
+        }
 
         xlseek(zip_fd, org, SEEK_SET);
         return cdf_offset;
@@ -226,8 +245,9 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr)
 
 static void unzip_skip(off_t skip)
 {
-        if (lseek(zip_fd, skip, SEEK_CUR) == (off_t)-1)
-                bb_copyfd_exact_size(zip_fd, -1, skip);
+        if (skip != 0)
+                if (lseek(zip_fd, skip, SEEK_CUR) == (off_t)-1)
+                        bb_copyfd_exact_size(zip_fd, -1, skip);
 }
 
 static void unzip_create_leading_dirs(const char *fn)
@@ -528,21 +548,31 @@ int unzip_main(int argc, char **argv)
                         bb_error_msg_and_die("zip flag 1 (encryption) is not supported");
                 }
 
-                {
+                if (cdf_offset != BAD_CDF_OFFSET) {
                         cdf_header_t cdf_header;
                         cdf_offset = read_next_cdf(cdf_offset, &cdf_header);
+                        /*
+                         * Note: cdf_offset can become BAD_CDF_OFFSET after the above call.
+                         */
                         if (zip_header.formatted.zip_flags & SWAP_LE16(0x0008)) {
                                 /* 0x0008 - streaming. [u]cmpsize can be reliably gotten
-                                 * only from Central Directory. See unzip_doc.txt */
+                                 * only from Central Directory. See unzip_doc.txt
+                                 */
                                 zip_header.formatted.crc32    = cdf_header.formatted.crc32;
                                 zip_header.formatted.cmpsize  = cdf_header.formatted.cmpsize;
                                 zip_header.formatted.ucmpsize = cdf_header.formatted.ucmpsize;
                         }
                         if ((cdf_header.formatted.version_made_by >> 8) == 3) {
-                                /* this archive is created on Unix */
+                                /* This archive is created on Unix */
                                 dir_mode = file_mode = (cdf_header.formatted.external_file_attributes >> 16);
                         }
                 }
+                if (cdf_offset == BAD_CDF_OFFSET
+                 && (zip_header.formatted.zip_flags & SWAP_LE16(0x0008))
+                ) {
+                        /* If it's a streaming zip, we _require_ CDF */
+                        bb_error_msg_and_die("can't find file table");
+                }
 #endif
 
                 /* Read filename */
diff --git a/coreutils/catv.c b/coreutils/catv.c
index 214b4311a..e3499c597 100644
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -25,14 +25,23 @@ int catv_main(int argc UNUSED_PARAM, char **argv)
 {
         int retval = EXIT_SUCCESS;
         int fd;
-        unsigned flags;
-
-        flags = getopt32(argv, "etv");
+        unsigned opts;
 #define CATV_OPT_e (1<<0)
 #define CATV_OPT_t (1<<1)
 #define CATV_OPT_v (1<<2)
-        flags ^= CATV_OPT_v;
+        typedef char BUG_const_mismatch[
+                CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS
+                ? 1 : -1
+        ];
+
+        opts = getopt32(argv, "etv");
         argv += optind;
+#if 0 /* These consts match, we can just pass "opts" to visible() */
+        if (opts & CATV_OPT_e)
+                flags |= VISIBLE_ENDLINE;
+        if (opts & CATV_OPT_t)
+                flags |= VISIBLE_SHOW_TABS;
+#endif
 
         /* Read from stdin if there's nothing else to do. */
         if (!argv[0])
@@ -50,29 +59,17 @@ int catv_main(int argc UNUSED_PARAM, char **argv)
                         res = read(fd, read_buf, COMMON_BUFSIZE);
                         if (res < 0)
                                 retval = EXIT_FAILURE;
-                        if (res < 1)
+                        if (res <= 0)
                                 break;
                         for (i = 0; i < res; i++) {
                                 unsigned char c = read_buf[i];
-
-                                if (c > 126 && (flags & CATV_OPT_v)) {
-                                        if (c == 127) {
-                                                printf("^?");
-                                                continue;
-                                        }
-                                        printf("M-");
-                                        c -= 128;
-                                }
-                                if (c < 32) {
-                                        if (c == 10) {
-                                                if (flags & CATV_OPT_e)
-                                                        bb_putchar('$');
-                                        } else if (flags & (c==9 ? CATV_OPT_t : CATV_OPT_v)) {
-                                                printf("^%c", c+'@');
-                                                continue;
-                                        }
+                                if (opts & CATV_OPT_v) {
+                                        putchar(c);
+                                } else {
+                                        char buf[sizeof("M-^c")];
+                                        visible(c, buf, opts);
+                                        fputs(buf, stdout);
                                 }
-                                bb_putchar(c);
                         }
                 }
                 if (ENABLE_FEATURE_CLEAN_UP && fd)
diff --git a/coreutils/dd.c b/coreutils/dd.c
index f6869cb26..db61f665e 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -30,10 +30,10 @@
 //usage:     "\n        conv=noerror    Continue after read errors"
 //usage:     "\n        conv=sync       Pad blocks with zeros"
 //usage:     "\n        conv=fsync      Physically write data out before finishing"
+//usage:     "\n        conv=swab       Swap every pair of bytes"
 //usage:        )
 //usage:     "\n"
-//usage:     "\nNumbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),"
-//usage:     "\nMD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)"
+//usage:     "\nN may be suffixed by c (1), w (2), b (512), kD (1000), k (1024), MD, M, GD, G"
 //usage:
 //usage:#define dd_example_usage
 //usage:       "$ dd if=/dev/zero of=/dev/ram1 bs=1M count=4\n"
@@ -151,13 +151,14 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         enum {
                 /* Must be in the same order as OP_conv_XXX! */
                 /* (see "flags |= (1 << what)" below) */
-                FLAG_NOTRUNC = 1 << 0,
-                FLAG_SYNC    = 1 << 1,
-                FLAG_NOERROR = 1 << 2,
-                FLAG_FSYNC   = 1 << 3,
+                FLAG_NOTRUNC = (1 << 0) * ENABLE_FEATURE_DD_IBS_OBS,
+                FLAG_SYNC    = (1 << 1) * ENABLE_FEATURE_DD_IBS_OBS,
+                FLAG_NOERROR = (1 << 2) * ENABLE_FEATURE_DD_IBS_OBS,
+                FLAG_FSYNC   = (1 << 3) * ENABLE_FEATURE_DD_IBS_OBS,
+                FLAG_SWAB    = (1 << 4) * ENABLE_FEATURE_DD_IBS_OBS,
                 /* end of conv flags */
-                FLAG_TWOBUFS = 1 << 4,
-                FLAG_COUNT   = 1 << 5,
+                FLAG_TWOBUFS = (1 << 5) * ENABLE_FEATURE_DD_IBS_OBS,
+                FLAG_COUNT   = 1 << 6,
         };
         static const char keywords[] ALIGN1 =
                 "bs\0""count\0""seek\0""skip\0""if\0""of\0"
@@ -167,7 +168,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 ;
 #if ENABLE_FEATURE_DD_IBS_OBS
         static const char conv_words[] ALIGN1 =
-                "notrunc\0""sync\0""noerror\0""fsync\0";
+                "notrunc\0""sync\0""noerror\0""fsync\0""swab\0";
 #endif
         enum {
                 OP_bs = 0,
@@ -185,11 +186,11 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 OP_conv_sync,
                 OP_conv_noerror,
                 OP_conv_fsync,
+                OP_conv_swab,
         /* Unimplemented conv=XXX: */
         //nocreat       do not create the output file
         //excl          fail if the output file already exists
         //fdatasync     physically write output file data before finishing
-        //swab          swap every pair of input bytes
         //lcase         change upper case to lower case
         //ucase         change lower case to upper case
         //block         pad newline-terminated records with spaces to cbs-size
@@ -197,23 +198,34 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         //ascii         from EBCDIC to ASCII
         //ebcdic        from ASCII to EBCDIC
         //ibm           from ASCII to alternate EBCDIC
+        /* Partially implemented: */
+        //swab          swap every pair of input bytes: will abort on non-even reads
 #endif
         };
-        int exitcode = EXIT_FAILURE;
+        smallint exitcode = EXIT_FAILURE;
         int devzero = 0;
-        size_t ibs = 512, obs = 512;
-        ssize_t n, w;
-        char *ibuf, *obuf;
-        /* And these are all zeroed at once! */
+        int i;
+        size_t ibs = 512;
+        char *ibuf;
+#if ENABLE_FEATURE_DD_IBS_OBS
+        size_t obs = 512;
+        char *obuf;
+#else
+# define obs  ibs
+# define obuf ibuf
+#endif
+        /* These are all zeroed at once! */
         struct {
                 int flags;
                 size_t oc;
+                ssize_t prev_read_size; /* for detecting swab failure */
                 off_t count;
                 off_t seek, skip;
                 const char *infile, *outfile;
         } Z;
 #define flags   (Z.flags  )
 #define oc      (Z.oc     )
+#define prev_read_size (Z.prev_read_size)
 #define count   (Z.count  )
 #define seek    (Z.seek   )
 #define skip    (Z.skip   )
@@ -224,10 +236,10 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
         //fflush_all(); - is this needed because of NOEXEC?
 
-        for (n = 1; argv[n]; n++) {
+        for (i = 1; argv[i]; i++) {
                 int what;
                 char *val;
-                char *arg = argv[n];
+                char *arg = argv[i];
 
 #if ENABLE_DESKTOP
                 /* "dd --". NB: coreutils 6.9 will complain if they see
@@ -256,6 +268,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 }
                 if (what == OP_conv) {
                         while (1) {
+                                int n;
                                 /* find ',', replace them with NUL so we can use val for
                                  * index_in_strings() without copying.
                                  * We rely on val being non-null, else strchr would fault.
@@ -263,20 +276,21 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                                 arg = strchr(val, ',');
                                 if (arg)
                                         *arg = '\0';
-                                what = index_in_strings(conv_words, val);
-                                if (what < 0)
+                                n = index_in_strings(conv_words, val);
+                                if (n < 0)
                                         bb_error_msg_and_die(bb_msg_invalid_arg, val, "conv");
-                                flags |= (1 << what);
+                                flags |= (1 << n);
                                 if (!arg) /* no ',' left, so this was the last specifier */
                                         break;
                                 /* *arg = ','; - to preserve ps listing? */
                                 val = arg + 1; /* skip this keyword and ',' */
                         }
-                        continue; /* we trashed 'what', can't fall through */
+                        /*continue;*/
                 }
 #endif
                 if (what == OP_bs) {
-                        ibs = obs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes);
+                        ibs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes);
+                        obs = ibs;
                         /*continue;*/
                 }
                 /* These can be large: */
@@ -301,14 +315,17 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                         outfile = val;
                         /*continue;*/
                 }
-        } /* end of "for (argv[n])" */
+        } /* end of "for (argv[i])" */
 
 //XXX:FIXME for huge ibs or obs, malloc'ing them isn't the brightest idea ever
-        ibuf = obuf = xmalloc(ibs);
+        ibuf = xmalloc(ibs);
+        obuf = ibuf;
+#if ENABLE_FEATURE_DD_IBS_OBS
         if (ibs != obs) {
                 flags |= FLAG_TWOBUFS;
                 obuf = xmalloc(obs);
         }
+#endif
 
 #if ENABLE_FEATURE_DD_SIGNAL_HANDLING
         signal_SA_RESTART_empty_mask(SIGUSR1, dd_output_status);
@@ -317,17 +334,17 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         G.begin_time_us = monotonic_us();
 #endif
 
-        if (infile != NULL)
+        if (infile) {
                 if (ENABLE_PLATFORM_MINGW32 && !strcmp(infile, "/dev/zero")) {
                         flags |= FLAG_NOERROR;
                         devzero = 1;
-                }
-                else
+                } else {
                         xmove_fd(xopen(infile, O_RDONLY), ifd);
-        else {
+                }
+        } else {
                 infile = bb_msg_standard_input;
         }
-        if (outfile != NULL) {
+        if (outfile) {
                 int oflag = O_WRONLY | O_CREAT;
 
                 if (!seek && !(flags & FLAG_NOTRUNC))
@@ -352,13 +369,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         }
         if (skip && !devzero) {
                 if (lseek(ifd, skip * ibs, SEEK_CUR) < 0) {
-                        while (skip-- > 0) {
-                                n = safe_read(ifd, ibuf, ibs);
+                        do {
+                                ssize_t n = safe_read(ifd, ibuf, ibs);
                                 if (n < 0)
                                         goto die_infile;
                                 if (n == 0)
                                         break;
-                        }
+                        } while (--skip != 0);
                 }
         }
         if (seek) {
@@ -367,6 +384,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         }
 
         while (!(flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
+                ssize_t n;
+
                 if (devzero) {
                         memset(ibuf, 0, ibs);
                         n = ibs;
@@ -386,6 +405,27 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                          * conv=noerror just ignores input bad blocks */
                         n = 0;
                 }
+                if (flags & FLAG_SWAB) {
+                        uint16_t *p16;
+                        ssize_t n2;
+
+                        /* Our code allows only last read to be odd-sized */
+                        if (prev_read_size & 1)
+                                bb_error_msg_and_die("can't swab %lu byte buffer",
+                                                (unsigned long)prev_read_size);
+                        prev_read_size = n;
+
+                        /* If n is odd, last byte is not swapped:
+                         *  echo -n "qwe" | dd conv=swab
+                         * prints "wqe".
+                         */
+                        p16 = (void*) ibuf;
+                        n2 = (n >> 1);
+                        while (--n2 >= 0) {
+                                *p16 = bswap_16(*p16);
+                                p16++;
+                        }
+                }
                 if ((size_t)n == ibs)
                         G.in_full++;
                 else {
@@ -412,8 +452,10 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                                         oc = 0;
                                 }
                         }
-                } else if (write_and_stats(ibuf, n, obs, outfile))
-                        goto out_status;
+                } else {
+                        if (write_and_stats(ibuf, n, obs, outfile))
+                                goto out_status;
+                }
 
                 if (flags & FLAG_FSYNC) {
                         if (fsync(ofd) < 0)
@@ -422,9 +464,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         }
 
         if (ENABLE_FEATURE_DD_IBS_OBS && oc) {
-                w = full_write_or_warn(obuf, oc, outfile);
-                if (w < 0) goto out_status;
-                if (w > 0) G.out_part++;
+                if (write_and_stats(obuf, oc, obs, outfile))
+                        goto out_status;
         }
 
         if (!devzero && close(ifd) < 0) {
diff --git a/coreutils/head.c b/coreutils/head.c
index 291e1ce37..9388b026a 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -12,7 +12,6 @@
 /* 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]..."
@@ -35,7 +34,6 @@
 //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! */
 
@@ -140,7 +138,7 @@ eat_num(bool *negative_N, const char *p)
                 p++;
         }
 #endif
-        return xatoul_sfx(p, head_tail_suffixes);
+        return xatoul_sfx(p, bkm_suffixes);
 }
 
 static const char head_opts[] ALIGN1 =
diff --git a/coreutils/head_tail.c b/coreutils/head_tail.c
deleted file mode 100644
index 1658c0d1b..000000000
--- a/coreutils/head_tail.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * 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
deleted file mode 100644
index df19e41e0..000000000
--- a/coreutils/head_tail.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * 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/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 92a4d4462..1a5342e87 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -151,7 +151,9 @@ static uint8_t *hash_file(const char *filename)
                         update(&context, in_buf, count);
                 }
                 hash_value = NULL;
-                if (count == 0) {
+                if (count < 0)
+                        bb_perror_msg("can't read '%s'", filename);
+                else /* count == 0 */ {
                         final(&context, in_buf);
                         hash_value = hash_bin_to_hex(in_buf, hash_len);
                 }
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index ee4f72ca1..c4d11601f 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -1173,12 +1173,6 @@ parse_old_offset(const char *s, off_t *offset)
 int od_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int od_main(int argc UNUSED_PARAM, char **argv)
 {
-        static const struct suffix_mult bkm[] = {
-                { "b", 512 },
-                { "k", 1024 },
-                { "m", 1024*1024 },
-                { "", 0 }
-        };
 #if ENABLE_LONG_OPTS
         static const char od_longopts[] ALIGN1 =
                 "skip-bytes\0"        Required_argument "j"
@@ -1237,7 +1231,7 @@ int od_main(int argc UNUSED_PARAM, char **argv)
                 address_pad_len_char = doxn_address_pad_len_char[pos];
         }
         if (opt & OPT_N) {
-                max_bytes_to_format = xstrtooff_sfx(str_N, 0, bkm);
+                max_bytes_to_format = xstrtooff_sfx(str_N, 0, bkm_suffixes);
         }
         if (opt & OPT_a) decode_format_string("a");
         if (opt & OPT_b) decode_format_string("oC");
@@ -1246,7 +1240,7 @@ int od_main(int argc UNUSED_PARAM, char **argv)
         if (opt & OPT_f) decode_format_string("fF");
         if (opt & OPT_h) decode_format_string("x2");
         if (opt & OPT_i) decode_format_string("d2");
-        if (opt & OPT_j) n_bytes_to_skip = xstrtooff_sfx(str_j, 0, bkm);
+        if (opt & OPT_j) n_bytes_to_skip = xstrtooff_sfx(str_j, 0, bkm_suffixes);
         if (opt & OPT_l) decode_format_string("d4");
         if (opt & OPT_o) decode_format_string("o2");
         while (lst_t) {
@@ -1255,7 +1249,7 @@ int od_main(int argc UNUSED_PARAM, char **argv)
         if (opt & OPT_x) decode_format_string("x2");
         if (opt & OPT_s) decode_format_string("d2");
         if (opt & OPT_S) {
-                string_min = xstrtou_sfx(str_S, 0, bkm);
+                string_min = xstrtou_sfx(str_S, 0, bkm_suffixes);
         }
 
         // Bloat:
diff --git a/coreutils/split.c b/coreutils/split.c
index 11e640442..1e1673efb 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -23,17 +23,15 @@
 
 #include "libbb.h"
 
-static const struct suffix_mult split_suffices[] = {
 #if ENABLE_FEATURE_SPLIT_FANCY
+static const struct suffix_mult split_suffixes[] = {
         { "b", 512 },
-#endif
         { "k", 1024 },
         { "m", 1024*1024 },
-#if ENABLE_FEATURE_SPLIT_FANCY
         { "g", 1024*1024*1024 },
-#endif
         { "", 0 }
 };
+#endif
 
 /* Increment the suffix part of the filename.
  * Returns NULL if we are out of filenames.
@@ -86,7 +84,10 @@ int split_main(int argc UNUSED_PARAM, char **argv)
         if (opt & SPLIT_OPT_l)
                 cnt = XATOOFF(count_p);
         if (opt & SPLIT_OPT_b) // FIXME: also needs XATOOFF
-                cnt = xatoull_sfx(count_p, split_suffices);
+                cnt = xatoull_sfx(count_p,
+                                IF_FEATURE_SPLIT_FANCY(split_suffixes)
+                                IF_NOT_FEATURE_SPLIT_FANCY(km_suffixes)
+                );
         sfx = "x";
 
         argv += optind;
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 96754dd84..378a848e7 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -246,10 +246,21 @@ enum speed_setting {
 
 /* Which member(s) of 'struct termios' a mode uses */
 enum {
-        /* Do NOT change the order or values, as mode_type_flag()
-         * depends on them */
         control, input, output, local, combination
 };
+static tcflag_t *get_ptr_to_tcflag(unsigned type, const struct termios *mode)
+{
+        static const uint8_t tcflag_offsets[] ALIGN1 = {
+                offsetof(struct termios, c_cflag), /* control */
+                offsetof(struct termios, c_iflag), /* input */
+                offsetof(struct termios, c_oflag), /* output */
+                offsetof(struct termios, c_lflag)  /* local */
+        };
+        if (type <= local) {
+                return (tcflag_t*) (((char*)mode) + tcflag_offsets[type]);
+        }
+        return NULL;
+}
 
 /* Flags for 'struct mode_info' */
 #define SANE_SET 1              /* Set in 'sane' mode                  */
@@ -770,51 +781,6 @@ struct globals {
         G.max_col = 80; \
 } while (0)
 
-
-/* Return a string that is the printable representation of character CH */
-/* Adapted from 'cat' by Torbjorn Granlund */
-static const char *visible(unsigned ch)
-{
-        char *bpout = G.buf;
-
-        if (ch == _POSIX_VDISABLE)
-                return "<undef>";
-
-        if (ch >= 128) {
-                ch -= 128;
-                *bpout++ = 'M';
-                *bpout++ = '-';
-        }
-
-        if (ch < 32) {
-                *bpout++ = '^';
-                *bpout++ = ch + 64;
-        } else if (ch < 127) {
-                *bpout++ = ch;
-        } else {
-                *bpout++ = '^';
-                *bpout++ = '?';
-        }
-
-        *bpout = '\0';
-        return G.buf;
-}
-
-static tcflag_t *mode_type_flag(unsigned type, const struct termios *mode)
-{
-        static const uint8_t tcflag_offsets[] ALIGN1 = {
-                offsetof(struct termios, c_cflag), /* control */
-                offsetof(struct termios, c_iflag), /* input */
-                offsetof(struct termios, c_oflag), /* output */
-                offsetof(struct termios, c_lflag)  /* local */
-        };
-
-        if (type <= local) {
-                return (tcflag_t*) (((char*)mode) + tcflag_offsets[type]);
-        }
-        return NULL;
-}
-
 static void set_speed_or_die(enum speed_setting type, const char *arg,
                                         struct termios *mode)
 {
@@ -1042,6 +1008,7 @@ static void do_display(const struct termios *mode, int all)
 #endif
 
         for (i = 0; i != CIDX_min; ++i) {
+                char ch;
                 /* If swtch is the same as susp, don't print both */
 #if VSWTCH == VSUSP
                 if (i == CIDX_swtch)
@@ -1055,8 +1022,12 @@ static void do_display(const struct termios *mode, int all)
                         continue;
                 }
 #endif
-                wrapf("%s = %s;", nth_string(control_name, i),
-                                visible(mode->c_cc[control_info[i].offset]));
+                ch = mode->c_cc[control_info[i].offset];
+                if (ch == _POSIX_VDISABLE)
+                        strcpy(G.buf, "<undef>");
+                else
+                        visible(ch, G.buf, 0);
+                wrapf("%s = %s;", nth_string(control_name, i), G.buf);
         }
 #if VEOF == VMIN
         if ((mode->c_lflag & ICANON) == 0)
@@ -1072,7 +1043,7 @@ static void do_display(const struct termios *mode, int all)
                         prev_type = mode_info[i].type;
                 }
 
-                bitsp = mode_type_flag(mode_info[i].type, mode);
+                bitsp = get_ptr_to_tcflag(mode_info[i].type, mode);
                 mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits;
                 if ((*bitsp & mask) == mode_info[i].bits) {
                         if (all || (mode_info[i].flags & SANE_UNSET))
@@ -1091,7 +1062,6 @@ static void do_display(const struct termios *mode, int all)
 static void sane_mode(struct termios *mode)
 {
         int i;
-        tcflag_t *bitsp;
 
         for (i = 0; i < NUM_control_info; ++i) {
 #if VMIN == VEOF
@@ -1102,14 +1072,17 @@ static void sane_mode(struct termios *mode)
         }
 
         for (i = 0; i < NUM_mode_info; ++i) {
+                tcflag_t val;
+                tcflag_t *bitsp = get_ptr_to_tcflag(mode_info[i].type, mode);
+
+                if (!bitsp)
+                        continue;
+                val = *bitsp & ~((unsigned long)mode_info[i].mask);
                 if (mode_info[i].flags & SANE_SET) {
-                        bitsp = mode_type_flag(mode_info[i].type, mode);
-                        *bitsp = (*bitsp & ~((unsigned long)mode_info[i].mask))
-                                | mode_info[i].bits;
-                } else if (mode_info[i].flags & SANE_UNSET) {
-                        bitsp = mode_type_flag(mode_info[i].type, mode);
-                        *bitsp = *bitsp & ~((unsigned long)mode_info[i].mask)
-                                & ~mode_info[i].bits;
+                        *bitsp = val | mode_info[i].bits;
+                } else
+                if (mode_info[i].flags & SANE_UNSET) {
+                        *bitsp = val & ~mode_info[i].bits;
                 }
         }
 }
@@ -1119,17 +1092,18 @@ static void set_mode(const struct mode_info *info, int reversed,
 {
         tcflag_t *bitsp;
 
-        bitsp = mode_type_flag(info->type, mode);
+        bitsp = get_ptr_to_tcflag(info->type, mode);
 
         if (bitsp) {
+                tcflag_t val = *bitsp & ~info->mask;
                 if (reversed)
-                        *bitsp = *bitsp & ~info->mask & ~info->bits;
+                        *bitsp = val & ~info->bits;
                 else
-                        *bitsp = (*bitsp & ~info->mask) | info->bits;
+                        *bitsp = val | info->bits;
                 return;
         }
 
-        /* Combination mode */
+        /* !bitsp - it's a "combination" mode */
         if (info == &mode_info[IDX_evenp] || info == &mode_info[IDX_parity]) {
                 if (reversed)
                         mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
@@ -1534,7 +1508,12 @@ int stty_main(int argc UNUSED_PARAM, char **argv)
                         perror_on_device_and_die("%s");
 
                 if (memcmp(&mode, &new_mode, sizeof(mode)) != 0) {
-#if CIBAUD
+/*
+ * I think the below chunk is not necessary on Linux.
+ * If you are deleting it, also delete STTY_speed_was_set bit -
+ * it is only ever checked here.
+ */
+#if 0 /* was "if CIBAUD" */
                         /* SunOS 4.1.3 (at least) has the problem that after this sequence,
                            tcgetattr (&m1); tcsetattr (&m1); tcgetattr (&m2);
                            sometimes (m1 != m2).  The only difference is in the four bits
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 19fd8f695..07c71ca4b 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -25,7 +25,6 @@
  */
 
 //kbuild:lib-$(CONFIG_TAIL) += tail.o
-//kbuild:lib-$(CONFIG_TAIL) += head_tail.o
 
 //usage:#define tail_trivial_usage
 //usage:       "[OPTIONS] [FILE]..."
@@ -51,7 +50,6 @@
 //usage:       "nameserver 10.0.0.1\n"
 
 #include "libbb.h"
-#include "head_tail.h"
 
 struct globals {
         bool from_top;
@@ -69,15 +67,6 @@ static void tail_xprint_header(const char *fmt, const char *filename)
 static ssize_t tail_read(int fd, char *buf, size_t count)
 {
         ssize_t r;
-        off_t current;
-        struct stat sbuf;
-
-        /* /proc files report zero st_size, don't lseek them. */
-        if (fstat(fd, &sbuf) == 0 && sbuf.st_size > 0) {
-                current = lseek(fd, 0, SEEK_CUR);
-                if (sbuf.st_size < current)
-                        xlseek(fd, 0, SEEK_SET);
-        }
 
         r = full_read(fd, buf, count);
         if (r < 0) {
@@ -98,7 +87,7 @@ static unsigned eat_num(const char *p)
                 p++;
                 G.from_top = 1;
         }
-        return xatou_sfx(p, head_tail_suffixes);
+        return xatou_sfx(p, bkm_suffixes);
 }
 
 int tail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -363,7 +352,19 @@ int tail_main(int argc, char **argv)
                         if (nfiles > header_threshhold) {
                                 fmt = header_fmt_str;
                         }
-                        while ((nread = tail_read(fd, tailbuf, BUFSIZ)) > 0) {
+                        for (;;) {
+                                /* tail -f keeps following files even if they are truncated */
+                                struct stat sbuf;
+                                /* /proc files report zero st_size, don't lseek them */
+                                if (fstat(fd, &sbuf) == 0 && sbuf.st_size > 0) {
+                                        off_t current = lseek(fd, 0, SEEK_CUR);
+                                        if (sbuf.st_size < current)
+                                                xlseek(fd, 0, SEEK_SET);
+                                }
+
+                                nread = tail_read(fd, tailbuf, BUFSIZ);
+                                if (nread <= 0)
+                                        break;
                                 if (fmt) {
                                         tail_xprint_header(fmt, filename);
                                         fmt = NULL;
diff --git a/docs/tcp.txt b/docs/tcp.txt
new file mode 100644
index 000000000..766766387
--- /dev/null
+++ b/docs/tcp.txt
@@ -0,0 +1,82 @@
+        Some less-widely known details of TCP connections.
+
+        Properly closing the connection.
+
+After this code sequence:
+
+    sock = socket(AF_INET, SOCK_STREAM, 0);
+    connect(sock, &remote, sizeof(remote));
+    write(sock, buffer, 1000000);
+
+a large block of data is only buffered by kernel, it can't be sent all at once.
+What will happen if we close the socket?
+
+"A host MAY implement a 'half-duplex' TCP close sequence, so that
+ an application that has called close() cannot continue to read
+ data from the connection. If such a host issues a close() call
+ while received data is still pending in TCP, or if new data is
+ received after close() is called, its TCP SHOULD send a RST
+ to show that data was lost."
+
+IOW: if we just close(sock) now, kernel can reset the TCP connection,
+discarding some not-yet sent data.
+
+What can be done about it?
+
+Solution #1: block until sending is done:
+
+    /* When enabled, a close(2) or shutdown(2) will not return until
+     * all queued messages for the socket have been successfully sent
+     * or the linger timeout has been reached.
+     */
+    struct linger {
+        int l_onoff;    /* linger active */
+        int l_linger;   /* how many seconds to linger for */
+    } linger;
+    linger.l_onoff = 1;
+    linger.l_linger = SOME_NUM;
+    setsockopt(sock, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));
+    close(sock);
+
+Solution #2: tell kernel that you are done sending.
+This makes kernel send FIN after all data is written:
+
+    shutdown(sock, SHUT_WR);
+    close(sock);
+
+However, experiments on Linux 3.9.4 show that kernel can return from
+shutdown() and from close() before all data is sent,
+and if peer sends any data to us after this, kernel stll responds with
+RST before all our data is sent.
+
+In practice the protocol in use often does not allow peer to send
+such data to us, in which case this solution is acceptable.
+
+If you know that peer is going to close its end after it sees our FIN
+(as EOF), it might be a good idea to perform a read after shutdown().
+When read finishes with 0-sized result, we conclude that peer received all
+the data, saw EOF, and closed its end.
+
+However, this incurs small performance penalty (we run for a longer time)
+and requires safeguards (nonblocking reads, timeouts etc) against
+malicious peers which don't close the connection.
+
+
+        Defeating Nagle.
+
+Method #1: manually control whether partial sends are allowed:
+
+This prevents partially filled packets being sent:
+
+    int state = 1;
+    setsockopt(fd, IPPROTO_TCP, TCP_CORK, &state, sizeof(state));
+
+and this forces last, partially filled packet (if any) to be sent:
+
+    int state = 0;
+    setsockopt(fd, IPPROTO_TCP, TCP_CORK, &state, sizeof(state));
+
+Method #2: make any write to immediately send data, even if it's partial:
+
+    int state = 1;
+    setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &state, sizeof(state));
diff --git a/editors/awk.c b/editors/awk.c
index 0b573a065..77784dfc1 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -190,7 +190,7 @@ typedef struct tsplitter_s {
 
 /* combined token classes */
 #define TC_BINOP   (TC_BINOPX | TC_COMMA | TC_PIPE | TC_IN)
-#define TC_UNARYOP (TC_UOPPRE | TC_UOPPOST)
+//#define       TC_UNARYOP (TC_UOPPRE | TC_UOPPOST)
 #define TC_OPERAND (TC_VARIABLE | TC_ARRAY | TC_FUNCTION \
                    | TC_BUILTIN | TC_GETLINE | TC_SEQSTART | TC_STRING | TC_NUMBER)
 
@@ -2015,8 +2015,8 @@ static int fmt_num(char *b, int size, const char *format, double n, int int_as_i
         char c;
         const char *s = format;
 
-        if (int_as_int && n == (int)n) {
-                r = snprintf(b, size, "%d", (int)n);
+        if (int_as_int && n == (long long)n) {
+                r = snprintf(b, size, "%lld", (long long)n);
         } else {
                 do { c = *s; } while (c && *++s);
                 if (strchr("diouxX", c)) {
@@ -2662,7 +2662,7 @@ static var *evaluate(node *op, var *res)
                         const char *sv_progname;
 
                         /* The body might be empty, still has to eval the args */
-                        if (!op->r.n->info)
+                        if (!op->r.n->info && !op->r.f->body.first)
                                 syntax_error(EMSG_UNDEF_FUNC);
 
                         vbeg = v = nvalloc(op->r.f->nargs + 1);
@@ -2733,7 +2733,7 @@ static var *evaluate(node *op, var *res)
 
                         switch (opn) {
                         case F_in:
-                                R_d = (int)L_d;
+                                R_d = (long long)L_d;
                                 break;
 
                         case F_rn:
@@ -2931,7 +2931,7 @@ static var *evaluate(node *op, var *res)
                         case '%':
                                 if (R_d == 0)
                                         syntax_error(EMSG_DIV_BY_ZERO);
-                                L_d -= (int)(L_d / R_d) * R_d;
+                                L_d -= (long long)(L_d / R_d) * R_d;
                                 break;
                         }
                         debug_printf_eval("BINARY/REPLACE result:%f\n", L_d);
diff --git a/editors/sed.c b/editors/sed.c
index f8ca5d351..3a0d917aa 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -330,7 +330,7 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex)
                 next = index_of_next_unescaped_regexp_delim(delimiter, ++pos);
                 temp = copy_parsing_escapes(pos, next);
                 *regex = xzalloc(sizeof(regex_t));
-                xregcomp(*regex, temp, G.regex_type|REG_NEWLINE);
+                xregcomp(*regex, temp, G.regex_type);
                 free(temp);
                 /* Move position to next character after last delimiter */
                 pos += (next+1);
@@ -649,6 +649,12 @@ static void add_cmd(const char *cmdstr)
                 sed_cmd->cmd = *cmdstr++;
                 cmdstr = parse_cmd_args(sed_cmd, cmdstr);
 
+                /* cmdstr now points past args.
+                 * GNU sed requires a separator, if there are more commands,
+                 * else it complains "char N: extra characters after command".
+                 * Example: "sed 'p;d'". We also allow "sed 'pd'".
+                 */
+
                 /* Add the command to the command array */
                 *G.sed_cmd_tail = sed_cmd;
                 G.sed_cmd_tail = &sed_cmd->next;
@@ -1371,7 +1377,7 @@ static void process_files(void)
 /* It is possible to have a command line argument with embedded
  * newlines.  This counts as multiple command lines.
  * However, newline can be escaped: 's/e/z\<newline>z/'
- * We check for this.
+ * add_cmd() handles this.
  */
 
 static void add_cmd_block(char *cmdstr)
@@ -1381,22 +1387,8 @@ static void add_cmd_block(char *cmdstr)
         cmdstr = sv = xstrdup(cmdstr);
         do {
                 eol = strchr(cmdstr, '\n');
- next:
-                if (eol) {
-                        /* Count preceding slashes */
-                        int slashes = 0;
-                        char *sl = eol;
-
-                        while (sl != cmdstr && *--sl == '\\')
-                                slashes++;
-                        /* Odd number of preceding slashes - newline is escaped */
-                        if (slashes & 1) {
-                                overlapping_strcpy(eol - 1, eol);
-                                eol = strchr(eol, '\n');
-                                goto next;
-                        }
+                if (eol)
                         *eol = '\0';
-                }
                 add_cmd(cmdstr);
                 cmdstr = eol + 1;
         } while (eol);
diff --git a/editors/vi.c b/editors/vi.c
index d6c8c0dd8..ab49b3f7d 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1707,65 +1707,53 @@ static char *new_screen(int ro, int co)
 // search for pattern starting at p
 static char *char_search(char *p, const char *pat, int dir, int range)
 {
-        char *q;
         struct re_pattern_buffer preg;
+        const char *err;
+        char *q;
         int i;
         int size;
 
         re_syntax_options = RE_SYNTAX_POSIX_EXTENDED;
-        preg.translate = 0;
-        preg.fastmap = 0;
-        preg.buffer = 0;
-        preg.allocated = 0;
+        if (ignorecase)
+                re_syntax_options = RE_SYNTAX_POSIX_EXTENDED | RE_ICASE;
+
+        memset(&preg, 0, sizeof(preg));
+        err = re_compile_pattern(pat, strlen(pat), &preg);
+        if (err != NULL) {
+                status_line_bold("bad search pattern '%s': %s", pat, err);
+                return p;
+        }
 
         // assume a LIMITED forward search
-        q = next_line(p);
-        q = end_line(q);
         q = end - 1;
-        if (dir == BACK) {
-                q = prev_line(p);
+        if (dir == BACK)
                 q = text;
-        }
-        // count the number of chars to search over, forward or backward
-        size = q - p;
-        if (size < 0)
-                size = p - q;
         // RANGE could be negative if we are searching backwards
         range = q - p;
-
-        q = (char *)re_compile_pattern(pat, strlen(pat), (struct re_pattern_buffer *)&preg);
-        if (q != 0) {
-                // The pattern was not compiled
-                status_line_bold("bad search pattern: '%s': %s", pat, q);
-                i = 0;                  // return p if pattern not compiled
-                goto cs1;
-        }
-
         q = p;
+        size = range;
         if (range < 0) {
+                size = -size;
                 q = p - size;
                 if (q < text)
                         q = text;
         }
         // search for the compiled pattern, preg, in p[]
-        // range < 0-  search backward
-        // range > 0-  search forward
+        // range < 0: search backward
+        // range > 0: search forward
         // 0 < start < size
-        // re_search() < 0  not found or error
-        // re_search() > 0  index of found pattern
-        //            struct pattern    char     int    int    int     struct reg
-        // re_search (*pattern_buffer,  *string, size,  start, range,  *regs)
-        i = re_search(&preg, q, size, 0, range, 0);
-        if (i == -1) {
-                p = 0;
-                i = 0;                  // return NULL if pattern not found
-        }
- cs1:
-        if (dir == FORWARD) {
+        // re_search() < 0: not found or error
+        // re_search() >= 0: index of found pattern
+        //           struct pattern   char     int   int    int    struct reg
+        // re_search(*pattern_buffer, *string, size, start, range, *regs)
+        i = re_search(&preg, q, size, /*start:*/ 0, range, /*struct re_registers*:*/ NULL);
+        regfree(&preg);
+        if (i < 0)
+                return NULL;
+        if (dir == FORWARD)
                 p = p + i;
-        } else {
+        else
                 p = p - i;
-        }
         return p;
 }
 
@@ -1790,7 +1778,7 @@ static char *char_search(char *p, const char *pat, int dir, int range)
 
         len = strlen(pat);
         if (dir == FORWARD) {
-                stop = end - 1; // assume range is p - end-1
+                stop = end - 1; // assume range is p..end-1
                 if (range == LIMITED)
                         stop = next_line(p);    // range is to next line
                 for (start = p; start < stop; start++) {
@@ -1799,7 +1787,7 @@ static char *char_search(char *p, const char *pat, int dir, int range)
                         }
                 }
         } else if (dir == BACK) {
-                stop = text;    // assume range is text - p
+                stop = text;    // assume range is text..p
                 if (range == LIMITED)
                         stop = prev_line(p);    // range is to prev line
                 for (start = p - len; start >= stop; start--) {
diff --git a/findutils/find.c b/findutils/find.c
index 2235b5049..53d8239c7 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -231,12 +231,13 @@
 //kbuild:lib-$(CONFIG_FIND) += find.o
 
 //usage:#define find_trivial_usage
-//usage:       "[PATH]... [OPTIONS] [ACTIONS]"
+//usage:       "[-HL] [PATH]... [OPTIONS] [ACTIONS]"
 //usage:#define find_full_usage "\n\n"
 //usage:       "Search for files and perform actions on them.\n"
 //usage:       "First failed action stops processing of current file.\n"
 //usage:       "Defaults: PATH is current directory, action is '-print'\n"
-//usage:     "\n        -follow         Follow symlinks"
+//usage:     "\n        -L,-follow      Follow symlinks"
+//usage:     "\n        -H              ...on command line only"
 //usage:        IF_FEATURE_FIND_XDEV(
 //usage:     "\n        -xdev           Don't descend directories on other filesystems"
 //usage:        )
@@ -814,6 +815,31 @@ static const char* plus_minus_num(const char* str)
 }
 #endif
 
+/* Say no to GCCism */
+#define USE_NESTED_FUNCTION 0
+
+#if !USE_NESTED_FUNCTION
+struct pp_locals {
+        action*** appp;
+        unsigned cur_group;
+        unsigned cur_action;
+        IF_FEATURE_FIND_NOT( bool invert_flag; )
+};
+static action* alloc_action(struct pp_locals *ppl, int sizeof_struct, action_fp f)
+{
+        action *ap = xzalloc(sizeof_struct);
+        action **app;
+        action ***group = &ppl->appp[ppl->cur_group];
+        *group = app = xrealloc(*group, (ppl->cur_action+2) * sizeof(ppl->appp[0][0]));
+        app[ppl->cur_action++] = ap;
+        app[ppl->cur_action] = NULL;
+        ap->f = f;
+        IF_FEATURE_FIND_NOT( ap->invert = ppl->invert_flag; )
+        IF_FEATURE_FIND_NOT( ppl->invert_flag = 0; )
+        return ap;
+}
+#endif
+
 static action*** parse_params(char **argv)
 {
         enum {
@@ -900,10 +926,18 @@ static action*** parse_params(char **argv)
         IF_FEATURE_FIND_MAXDEPTH("-mindepth\0""-maxdepth\0")
         ;
 
+#if !USE_NESTED_FUNCTION
+        struct pp_locals ppl;
+#define appp        (ppl.appp       )
+#define cur_group   (ppl.cur_group  )
+#define cur_action  (ppl.cur_action )
+#define invert_flag (ppl.invert_flag)
+#define ALLOC_ACTION(name) (action_##name*)alloc_action(&ppl, sizeof(action_##name), (action_fp) func_##name)
+#else
         action*** appp;
-        unsigned cur_group = 0;
-        unsigned cur_action = 0;
-        IF_FEATURE_FIND_NOT( bool invert_flag = 0; )
+        unsigned cur_group;
+        unsigned cur_action;
+        IF_FEATURE_FIND_NOT( bool invert_flag; )
 
         /* This is the only place in busybox where we use nested function.
          * So far more standard alternatives were bigger. */
@@ -912,7 +946,7 @@ static action*** parse_params(char **argv)
         action* alloc_action(int sizeof_struct, action_fp f)
         {
                 action *ap;
-                appp[cur_group] = xrealloc(appp[cur_group], (cur_action+2) * sizeof(*appp));
+                appp[cur_group] = xrealloc(appp[cur_group], (cur_action+2) * sizeof(appp[0][0]));
                 appp[cur_group][cur_action++] = ap = xzalloc(sizeof_struct);
                 appp[cur_group][cur_action] = NULL;
                 ap->f = f;
@@ -920,9 +954,12 @@ static action*** parse_params(char **argv)
                 IF_FEATURE_FIND_NOT( invert_flag = 0; )
                 return ap;
         }
-
 #define ALLOC_ACTION(name) (action_##name*)alloc_action(sizeof(action_##name), (action_fp) func_##name)
+#endif
 
+        cur_group = 0;
+        cur_action = 0;
+        IF_FEATURE_FIND_NOT( invert_flag = 0; )
         appp = xzalloc(2 * sizeof(appp[0])); /* appp[0],[1] == NULL */
 
         while (*argv) {
@@ -948,8 +985,8 @@ static action*** parse_params(char **argv)
  */
                 /* Options */
                 if (parm == OPT_FOLLOW) {
-                        dbg("follow enabled: %d", __LINE__);
-                        G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK;
+                        dbg("follow enabled: %d", __LINE__);
+                        G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK;
                 }
 #if ENABLE_FEATURE_FIND_XDEV
                 else if (parm == OPT_XDEV) {
@@ -987,7 +1024,7 @@ static action*** parse_params(char **argv)
                         dbg("%d", __LINE__);
                         /* start new OR group */
                         cur_group++;
-                        appp = xrealloc(appp, (cur_group+2) * sizeof(*appp));
+                        appp = xrealloc(appp, (cur_group+2) * sizeof(appp[0]));
                         /*appp[cur_group] = NULL; - already NULL */
                         appp[cur_group+1] = NULL;
                         cur_action = 0;
@@ -1245,6 +1282,9 @@ static action*** parse_params(char **argv)
         dbg("exiting %s", __func__);
         return appp;
 #undef ALLOC_ACTION
+#undef appp
+#undef cur_action
+#undef invert_flag
 }
 
 int find_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -1254,7 +1294,15 @@ int find_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        argv++;
+        /* "+": stop on first non-option */
+        i = getopt32(argv, "+HLP");
+        if (i & (1<<0))
+                G.recurse_flags |= ACTION_FOLLOWLINKS_L0 | ACTION_DANGLING_OK;
+        if (i & (1<<1))
+                G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK;
+        /* -P is default and is ignored */
+        argv += optind;
+
         for (firstopt = 0; argv[firstopt]; firstopt++) {
                 if (argv[firstopt][0] == '-')
                         break;
diff --git a/findutils/grep.c b/findutils/grep.c
index 6b47f4327..5bbe61100 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -381,6 +381,8 @@ static int grep_file(FILE *file)
  opt_f_not_found: ;
                                 }
                         } else {
+                                char *match_at;
+
                                 if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
                                         gl->flg_mem_alocated_compiled |= COMPILED;
 #if !ENABLE_EXTRA_COMPAT
@@ -396,32 +398,36 @@ static int grep_file(FILE *file)
                                 gl->matched_range.rm_so = 0;
                                 gl->matched_range.rm_eo = 0;
 #endif
+                                match_at = line;
+ opt_w_again:
                                 if (
 #if !ENABLE_EXTRA_COMPAT
-                                        regexec(&gl->compiled_regex, line, 1, &gl->matched_range, 0) == 0
+                                        regexec(&gl->compiled_regex, match_at, 1, &gl->matched_range, 0) == 0
 #else
-                                        re_search(&gl->compiled_regex, line, line_len,
+                                        re_search(&gl->compiled_regex, match_at, line_len,
                                                         /*start:*/ 0, /*range:*/ line_len,
                                                         &gl->matched_range) >= 0
 #endif
                                 ) {
                                         if (option_mask32 & OPT_x) {
                                                 found = (gl->matched_range.rm_so == 0
-                                                         && line[gl->matched_range.rm_eo] == '\0');
+                                                         && match_at[gl->matched_range.rm_eo] == '\0');
                                         } else
                                         if (!(option_mask32 & OPT_w)) {
                                                 found = 1;
                                         } else {
                                                 char c = ' ';
                                                 if (gl->matched_range.rm_so)
-                                                        c = line[gl->matched_range.rm_so - 1];
+                                                        c = match_at[gl->matched_range.rm_so - 1];
                                                 if (!isalnum(c) && c != '_') {
-                                                        c = line[gl->matched_range.rm_eo];
-                                                        if (!c || (!isalnum(c) && c != '_'))
+                                                        c = match_at[gl->matched_range.rm_eo];
+                                                        if (!c || (!isalnum(c) && c != '_')) {
                                                                 found = 1;
+                                                        } else {
+                                                                match_at += gl->matched_range.rm_eo;
+                                                                goto opt_w_again;
+                                                        }
                                                 }
-//BUG: "echo foop foo | grep -w foo" should match, but doesn't:
-//we bail out on first "mismatch" because it's not a word.
                                         }
                                 }
                         }
@@ -718,7 +724,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
                 option_mask32 |= OPT_F;
 
 #if !ENABLE_EXTRA_COMPAT
-        if (!(option_mask32 & (OPT_o | OPT_w)))
+        if (!(option_mask32 & (OPT_o | OPT_w | OPT_x)))
                 reflags = REG_NOSUB;
 #endif
 
diff --git a/include/applets.src.h b/include/applets.src.h
index 00172b1bc..aa319bbc9 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -52,6 +52,12 @@ s     - suid type:
 # define APPLET_NOEXEC(name,main,l,s,name2)  LINK l name
 # define APPLET_NOFORK(name,main,l,s,name2)  LINK l name
 
+#elif defined(MAKE_SUID)
+# define APPLET(name,l,s)                    SUID s l name
+# define APPLET_ODDNAME(name,main,l,s,name2) SUID s l name
+# define APPLET_NOEXEC(name,main,l,s,name2)  SUID s l name
+# define APPLET_NOFORK(name,main,l,s,name2)  SUID s l name
+
 #else
   static struct bb_applet applets[] = { /*    name, main, location, need_suid */
 # define APPLET(name,l,s)                    { #name, #name, l, s },
@@ -415,7 +421,8 @@ IF_YES(APPLET_NOFORK(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes))
 IF_GUNZIP(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat))
 IF_ZCIP(APPLET(zcip, BB_DIR_SBIN, BB_SUID_DROP))
 
-#if !defined(PROTOTYPES) && !defined(NAME_MAIN_CNAME) && !defined(MAKE_USAGE)
+#if !defined(PROTOTYPES) && !defined(NAME_MAIN_CNAME) && !defined(MAKE_USAGE) \
+        && !defined(MAKE_LINKS) && !defined(MAKE_SUID)
 };
 #endif
 
diff --git a/include/bb_e2fs_defs.h b/include/bb_e2fs_defs.h
index b400f8c11..3f5e3c45b 100644
--- a/include/bb_e2fs_defs.h
+++ b/include/bb_e2fs_defs.h
@@ -442,7 +442,7 @@ struct ext2_super_block {
         uint32_t        s_reserved[162];        /* Padding to the end of the block */
 };
 struct BUG_ext2_super_block {
-        char bug[sizeof(struct ext2_super_block) == 1024 ? 1 : -1];
+        char bug[sizeof(struct ext2_super_block) == 1024 ? 1 : -1];
 };
 
 /*
diff --git a/include/libbb.h b/include/libbb.h
index f5b7d8dc7..9adb037ca 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -496,9 +496,9 @@ int xmkstemp(char *template) FAST_FUNC;
 off_t fdlength(int fd) FAST_FUNC;
 
 uoff_t FAST_FUNC get_volume_size_in_bytes(int fd,
-                const char *override,
-                unsigned override_units,
-                int extend);
+                const char *override,
+                unsigned override_units,
+                int extend);
 
 void xpipe(int filedes[2]) FAST_FUNC;
 /* In this form code with pipes is much more readable */
@@ -691,6 +691,13 @@ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str);
  * else it is printed as-is (except for ch = 0x9b) */
 enum { PRINTABLE_META = 0x100 };
 void fputc_printable(int ch, FILE *file) FAST_FUNC;
+/* Return a string that is the printable representation of character ch.
+ * Buffer must hold at least four characters. */
+enum {
+        VISIBLE_ENDLINE   = 1 << 0,
+        VISIBLE_SHOW_TABS = 1 << 1,
+};
+void visible(unsigned ch, char *buf, int flags) FAST_FUNC;
 
 /* dmalloc will redefine these to it's own implementation. It is safe
  * to have the prototypes here unconditionally.  */
@@ -848,6 +855,9 @@ struct suffix_mult {
         char suffix[4];
         unsigned mult;
 };
+extern const struct suffix_mult bkm_suffixes[];
+#define km_suffixes (bkm_suffixes + 1)
+
 #include "xatonum.h"
 /* Specialized: */
 
@@ -1125,9 +1135,6 @@ void bb_displayroutes(int noresolve, int netstatfmt) FAST_FUNC;
 
 
 /* Networking */
-int create_icmp_socket(void) FAST_FUNC;
-int create_icmp6_socket(void) FAST_FUNC;
-/* interface.c */
 /* This structure defines protocol families and their handlers. */
 struct aftype {
         const char *name;
@@ -1156,6 +1163,7 @@ struct hwtype {
 };
 extern smallint interface_opt_a;
 int display_interfaces(char *ifname) FAST_FUNC;
+int in_ether(const char *bufp, struct sockaddr *sap) FAST_FUNC;
 #if ENABLE_FEATURE_HWIB
 int in_ib(const char *bufp, struct sockaddr *sap) FAST_FUNC;
 #else
@@ -1452,7 +1460,7 @@ void read_key_ungets(char *buffer, const char *str, unsigned len) FAST_FUNC;
 /* It's NOT just ENABLEd or disabled. It's a number: */
 # if defined CONFIG_FEATURE_EDITING_HISTORY && CONFIG_FEATURE_EDITING_HISTORY > 0
 #  define MAX_HISTORY (CONFIG_FEATURE_EDITING_HISTORY + 0)
-unsigned size_from_HISTFILESIZE(const char *hp);
+unsigned size_from_HISTFILESIZE(const char *hp) FAST_FUNC;
 # else
 #  define MAX_HISTORY 0
 # endif
@@ -1494,6 +1502,7 @@ line_input_t *new_line_input_t(int flags) FAST_FUNC;
  * >0 length of input string, including terminating '\n'
  */
 int read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize, int timeout) FAST_FUNC;
+void show_history(const line_input_t *st) FAST_FUNC;
 # if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
 void save_history(line_input_t *st);
 # endif
@@ -1825,7 +1834,7 @@ extern const char bb_default_login_shell[] ALIGN1;
 # define VC_4 "/dev/vc/4"
 # define VC_5 "/dev/vc/5"
 # define VC_FORMAT "/dev/vc/%d"
-# define LOOP_FORMAT "/dev/loop/%d"
+# define LOOP_FORMAT "/dev/loop/%u"
 # define LOOP_NAMESIZE (sizeof("/dev/loop/") + sizeof(int)*3 + 1)
 # define LOOP_NAME "/dev/loop/"
 # define FB_0 "/dev/fb/0"
@@ -1838,7 +1847,7 @@ extern const char bb_default_login_shell[] ALIGN1;
 # define VC_4 "/dev/tty4"
 # define VC_5 "/dev/tty5"
 # define VC_FORMAT "/dev/tty%d"
-# define LOOP_FORMAT "/dev/loop%d"
+# define LOOP_FORMAT "/dev/loop%u"
 # define LOOP_NAMESIZE (sizeof("/dev/loop") + sizeof(int)*3 + 1)
 # define LOOP_NAME "/dev/loop"
 # define FB_0 "/dev/fb0"
diff --git a/include/liblzo_interface.h b/include/liblzo_interface.h
index 9a84c0b6b..b7f1b639b 100644
--- a/include/liblzo_interface.h
+++ b/include/liblzo_interface.h
@@ -30,7 +30,7 @@
 /*
 static void die_at(int line)
 {
-        bb_error_msg_and_die("internal error at %d", line);
+        bb_error_msg_and_die("internal error at %d", line);
 }
 #define assert(v) if (!(v)) die_at(__LINE__)
 */
diff --git a/include/platform.h b/include/platform.h
index 432cb9cae..f18d5b74e 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -225,6 +225,7 @@ typedef int      bb__aliased_int      FIX_ALIASING;
 typedef long     bb__aliased_long     FIX_ALIASING;
 typedef uint16_t bb__aliased_uint16_t FIX_ALIASING;
 typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
+typedef uint64_t bb__aliased_uint64_t FIX_ALIASING;
 
 /* NB: unaligned parameter should be a pointer, aligned one -
  * a lvalue. This makes it more likely to not swap them by mistake
diff --git a/init/init.c b/init/init.c
index 15aad474f..edb5be696 100644
--- a/init/init.c
+++ b/init/init.c
@@ -140,12 +140,11 @@
  * not fully functional init by switching it on! */
 #define DEBUG_INIT 0
 
-#define COMMAND_SIZE      256
 #define CONSOLE_NAME_SIZE 32
 
 /* Default sysinit script. */
 #ifndef INIT_SCRIPT
-#define INIT_SCRIPT  "/etc/init.d/rcS"
+# define INIT_SCRIPT  "/etc/init.d/rcS"
 #endif
 
 /* Each type of actions can appear many times. They will be
@@ -195,7 +194,7 @@ struct init_action {
         pid_t pid;
         uint8_t action_type;
         char terminal[CONSOLE_NAME_SIZE];
-        char command[COMMAND_SIZE];
+        char command[1];
 };
 
 static struct init_action *init_action_list = NULL;
@@ -398,7 +397,7 @@ static void reset_sighandlers_and_unblock_sigs(void)
 }
 
 /* Wrapper around exec:
- * Takes string (max COMMAND_SIZE chars).
+ * Takes string.
  * If chars like '>' detected, execs '[-]/bin/sh -c "exec ......."'.
  * Otherwise splits words on whitespace, deals with leading dash,
  * and uses plain exec().
@@ -406,10 +405,15 @@ static void reset_sighandlers_and_unblock_sigs(void)
  */
 static void init_exec(const char *command)
 {
-        char *cmd[COMMAND_SIZE / 2];
-        char buf[COMMAND_SIZE + 6];  /* COMMAND_SIZE+strlen("exec ")+1 */
-        int dash = (command[0] == '-' /* maybe? && command[1] == '/' */);
-
+        /* +8 allows to write VLA sizes below more efficiently: */
+        unsigned command_size = strlen(command) + 8;
+        /* strlen(command) + strlen("exec ")+1: */
+        char buf[command_size];
+        /* strlen(command) / 2 + 4: */
+        char *cmd[command_size / 2];
+        int dash;
+
+        dash = (command[0] == '-' /* maybe? && command[1] == '/' */);
         command += dash;
 
         /* See if any special /bin/sh requiring characters are present */
@@ -626,21 +630,21 @@ static void new_init_action(uint8_t action_type, const char *command, const char
                 nextp = &a->next;
         }
 
-        a = xzalloc(sizeof(*a));
+        a = xzalloc(sizeof(*a) + strlen(command));
 
         /* Append to the end of the list */
  append:
         *nextp = a;
         a->action_type = action_type;
-        safe_strncpy(a->command, command, sizeof(a->command));
+        strcpy(a->command, command);
         safe_strncpy(a->terminal, cons, sizeof(a->terminal));
-        dbg_message(L_LOG | L_CONSOLE, "command='%s' action=%d tty='%s'\n",
+        dbg_message(L_LOG | L_CONSOLE, "command='%s' action=%x tty='%s'\n",
                 a->command, a->action_type, a->terminal);
 }
 
 /* NOTE that if CONFIG_FEATURE_USE_INITTAB is NOT defined,
  * then parse_inittab() simply adds in some default
- * actions(i.e., runs INIT_SCRIPT and then starts a pair
+ * actions (i.e., runs INIT_SCRIPT and then starts a pair
  * of "askfirst" shells).  If CONFIG_FEATURE_USE_INITTAB
  * _is_ defined, but /etc/inittab is missing, this
  * results in the same set of default behaviors.
@@ -655,23 +659,22 @@ static void parse_inittab(void)
 #endif
         {
                 /* No inittab file - set up some default behavior */
-                /* Reboot on Ctrl-Alt-Del */
-                new_init_action(CTRLALTDEL, "reboot", "");
-                /* Umount all filesystems on halt/reboot */
-                new_init_action(SHUTDOWN, "umount -a -r", "");
-                /* Swapoff on halt/reboot */
-                if (ENABLE_SWAPONOFF)
-                        new_init_action(SHUTDOWN, "swapoff -a", "");
-                /* Prepare to restart init when a QUIT is received */
-                new_init_action(RESTART, "init", "");
+                /* Sysinit */
+                new_init_action(SYSINIT, INIT_SCRIPT, "");
                 /* Askfirst shell on tty1-4 */
                 new_init_action(ASKFIRST, bb_default_login_shell, "");
 //TODO: VC_1 instead of ""? "" is console -> ctty problems -> angry users
                 new_init_action(ASKFIRST, bb_default_login_shell, VC_2);
                 new_init_action(ASKFIRST, bb_default_login_shell, VC_3);
                 new_init_action(ASKFIRST, bb_default_login_shell, VC_4);
-                /* sysinit */
-                new_init_action(SYSINIT, INIT_SCRIPT, "");
+                /* Reboot on Ctrl-Alt-Del */
+                new_init_action(CTRLALTDEL, "reboot", "");
+                /* Umount all filesystems on halt/reboot */
+                new_init_action(SHUTDOWN, "umount -a -r", "");
+                /* Swapoff on halt/reboot */
+                new_init_action(SHUTDOWN, "swapoff -a", "");
+                /* Restart init when a QUIT is received */
+                new_init_action(RESTART, "init", "");
                 return;
         }
 
@@ -931,10 +934,17 @@ static void reload_inittab(void)
 
         /* Remove stale entries and SYSINIT entries.
          * We never rerun SYSINIT entries anyway,
-         * removing them too saves a few bytes */
+         * removing them too saves a few bytes
+         */
         nextp = &init_action_list;
         while ((a = *nextp) != NULL) {
-                if ((a->action_type & ~SYSINIT) == 0) {
+                /*
+                 * Why pid == 0 check?
+                 * Process can be removed from inittab and added *later*.
+                 * If we delete its entry but process still runs,
+                 * duplicate is spawned when the entry is re-added.
+                 */
+                if ((a->action_type & ~SYSINIT) == 0 && a->pid == 0) {
                         *nextp = a->next;
                         free(a);
                 } else {
@@ -1058,10 +1068,13 @@ int init_main(int argc UNUSED_PARAM, char **argv)
         message(L_CONSOLE | L_LOG, "init started: %s", bb_banner);
 #endif
 
+#if 0
+/* It's 2013, does anyone really still depend on this? */
+/* If you do, consider adding swapon to sysinot actions then! */
 /* struct sysinfo is linux-specific */
-#ifdef __linux__
+# ifdef __linux__
         /* Make sure there is enough memory to do something useful. */
-        if (ENABLE_SWAPONOFF) {
+        /*if (ENABLE_SWAPONOFF) - WRONG: we may have non-bbox swapon*/ {
                 struct sysinfo info;
 
                 if (sysinfo(&info) == 0
@@ -1075,6 +1088,7 @@ int init_main(int argc UNUSED_PARAM, char **argv)
                         run_actions(SYSINIT);   /* wait and removing */
                 }
         }
+# endif
 #endif
 
         /* Check if we are supposed to be in single user mode */
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index ad81ce46b..db79ff62b 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -27,8 +27,6 @@ lib-y += concat_subpath_file.o
 lib-y += copy_file.o
 lib-y += copyfd.o
 lib-y += crc32.o
-lib-y += create_icmp6_socket.o
-lib-y += create_icmp_socket.o
 lib-y += default_error_retval.o
 lib-y += device_open.o
 lib-y += dump.o
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index f0df4e080..44161a219 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -29,7 +29,7 @@
 #include "busybox.h"
 
 #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
-        || defined(__APPLE__) \
+    || defined(__APPLE__) \
     )
 # include <malloc.h> /* for mallopt */
 #endif
diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index fe2b50677..77c1bcd95 100644
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -65,7 +65,9 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
         i = 0;
         while (1) {
                 int r = read(fd, &ret[i], 1);
-                if (r < 0) {
+                if ((i == 0 && r == 0) /* EOF (^D) with no password */
+                 || r < 0
+                ) {
                         /* read is interrupted by timeout or ^C */
                         ret = NULL;
                         break;
diff --git a/libbb/create_icmp6_socket.c b/libbb/create_icmp6_socket.c
deleted file mode 100644
index 368c69028..000000000
--- a/libbb/create_icmp6_socket.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * create raw socket for icmp (IPv6 version) protocol
- * and drop root privileges if running setuid
- *
- * Licensed under GPLv2, see file LICENSE in this source tree.
- */
-
-#include "libbb.h"
-
-#if ENABLE_FEATURE_IPV6
-int FAST_FUNC create_icmp6_socket(void)
-{
-        int sock;
-#if 0
-        struct protoent *proto;
-        proto = getprotobyname("ipv6-icmp");
-        /* if getprotobyname failed, just silently force
-         * proto->p_proto to have the correct value for "ipv6-icmp" */
-        sock = socket(AF_INET6, SOCK_RAW,
-                        (proto ? proto->p_proto : IPPROTO_ICMPV6));
-#else
-        sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
-#endif
-        if (sock < 0) {
-                if (errno == EPERM)
-                        bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-                bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
-        }
-
-        /* drop root privs if running setuid */
-        xsetuid(getuid());
-
-        return sock;
-}
-#endif
diff --git a/libbb/create_icmp_socket.c b/libbb/create_icmp_socket.c
deleted file mode 100644
index 585626983..000000000
--- a/libbb/create_icmp_socket.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * create raw socket for icmp protocol
- * and drop root privileges if running setuid
- *
- * Licensed under GPLv2, see file LICENSE in this source tree.
- */
-
-#include "libbb.h"
-
-int FAST_FUNC create_icmp_socket(void)
-{
-        int sock;
-#if 0
-        struct protoent *proto;
-        proto = getprotobyname("icmp");
-        /* if getprotobyname failed, just silently force
-         * proto->p_proto to have the correct value for "icmp" */
-        sock = socket(AF_INET, SOCK_RAW,
-                        (proto ? proto->p_proto : 1)); /* 1 == ICMP */
-#else
-        sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
-#endif
-        if (sock < 0) {
-                if (errno == EPERM)
-                        bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-                bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
-        }
-
-        /* drop root privs if running setuid */
-        xsetuid(getuid());
-
-        return sock;
-}
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index b4d955e5a..3f743ac75 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -84,7 +84,7 @@ static void FAST_FUNC common64_end(md5_ctx_t *ctx, int swap_needed)
                         if (swap_needed)
                                 t = bb_bswap_64(t);
                         /* wbuffer is suitably aligned for this */
-                        *(uint64_t *) (&ctx->wbuffer[64 - 8]) = t;
+                        *(bb__aliased_uint64_t *) (&ctx->wbuffer[64 - 8]) = t;
                 }
                 ctx->process_block(ctx);
                 if (remaining >= 8)
@@ -883,10 +883,10 @@ void FAST_FUNC sha512_end(sha512_ctx_t *ctx, void *resbuf)
                         uint64_t t;
                         t = ctx->total64[0] << 3;
                         t = SWAP_BE64(t);
-                        *(uint64_t *) (&ctx->wbuffer[128 - 8]) = t;
+                        *(bb__aliased_uint64_t *) (&ctx->wbuffer[128 - 8]) = t;
                         t = (ctx->total64[1] << 3) | (ctx->total64[0] >> 61);
                         t = SWAP_BE64(t);
-                        *(uint64_t *) (&ctx->wbuffer[128 - 16]) = t;
+                        *(bb__aliased_uint64_t *) (&ctx->wbuffer[128 - 16]) = t;
                 }
                 sha512_process_block128(ctx);
                 if (remaining >= 16)
diff --git a/libbb/in_ether.c b/libbb/in_ether.c
new file mode 100644
index 000000000..dadadbafe
--- /dev/null
+++ b/libbb/in_ether.c
@@ -0,0 +1,58 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ */
+
+//kbuild:lib-$(CONFIG_IFCONFIG) += in_ether.o
+//kbuild:lib-$(CONFIG_IFENSLAVE) += in_ether.o
+
+#include "libbb.h"
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+
+/* Convert Ethernet address from "XX[:]XX[:]XX[:]XX[:]XX[:]XX" to sockaddr.
+ * Return nonzero on error.
+ */
+int FAST_FUNC in_ether(const char *bufp, struct sockaddr *sap)
+{
+        char *ptr;
+        int i, j;
+        unsigned char val;
+        unsigned char c;
+
+        sap->sa_family = ARPHRD_ETHER;
+        ptr = (char *) sap->sa_data;
+
+        i = ETH_ALEN;
+        goto first;
+        do {
+                /* We might get a semicolon here */
+                if (*bufp == ':')
+                        bufp++;
+ first:
+                j = val = 0;
+                do {
+                        c = *bufp;
+                        if (((unsigned char)(c - '0')) <= 9) {
+                                c -= '0';
+                        } else if ((unsigned char)((c|0x20) - 'a') <= 5) {
+                                c = (unsigned char)((c|0x20) - 'a') + 10;
+                        } else {
+                                if (j && (c == ':' || c == '\0'))
+                                        /* One-digit byte: __:X:__ */
+                                        break;
+                                return -1;
+                        }
+                        ++bufp;
+                        val <<= 4;
+                        val += c;
+                        j ^= 1;
+                } while (j);
+
+                *ptr++ = val;
+
+        } while (--i);
+
+        /* Error if we aren't at end of string */
+        return *bufp;
+}
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 7f64a9691..20d75cf56 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -38,6 +38,14 @@
  * and the \] escape to signal the end of such a sequence. Example:
  *
  * PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+ *
+ * Unicode in PS1 is not fully supported: prompt length calulation is wrong,
+ * resulting in line wrap problems with long (multi-line) input.
+ *
+ * Multi-line PS1 (e.g. PS1="\n[\w]\n$ ") has problems with history
+ * browsing: up/down arrows result in scrolling.
+ * It stems from simplistic "cmdedit_y = cmdedit_prmt_len / cmdedit_termw"
+ * calculation of how many lines the prompt takes.
  */
 #include "libbb.h"
 #include "unicode.h"
@@ -1268,7 +1276,7 @@ line_input_t* FAST_FUNC new_line_input_t(int flags)
 
 #if MAX_HISTORY > 0
 
-unsigned size_from_HISTFILESIZE(const char *hp)
+unsigned FAST_FUNC size_from_HISTFILESIZE(const char *hp)
 {
         int size = MAX_HISTORY;
         if (hp) {
@@ -1323,6 +1331,17 @@ static int get_next_history(void)
         return 0;
 }
 
+/* Lists command history. Used by shell 'history' builtins */
+void FAST_FUNC show_history(const line_input_t *st)
+{
+        int i;
+
+        if (!st)
+                return;
+        for (i = 0; i < st->cnt_history; i++)
+                printf("%4d %s\n", i, st->history[i]);
+}
+
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
 /* We try to ensure that concurrent additions to the history
  * do not overwrite each other.
@@ -1762,34 +1781,36 @@ static void ask_terminal(void)
 #define ask_terminal() ((void)0)
 #endif
 
+/* Called just once at read_line_input() init time */
 #if !ENABLE_FEATURE_EDITING_FANCY_PROMPT
 static void parse_and_put_prompt(const char *prmt_ptr)
 {
+        const char *p;
         cmdedit_prompt = prmt_ptr;
-        cmdedit_prmt_len = strlen(prmt_ptr);
+        p = strrchr(prmt_ptr, '\n');
+        cmdedit_prmt_len = unicode_strwidth(p ? p+1 : prmt_ptr);
         put_prompt();
 }
 #else
 static void parse_and_put_prompt(const char *prmt_ptr)
 {
-        int prmt_len = 0;
-        size_t cur_prmt_len = 0;
-        char flg_not_length = '[';
+        int prmt_size = 0;
         char *prmt_mem_ptr = xzalloc(1);
 # if ENABLE_USERNAME_OR_HOMEDIR
         char *cwd_buf = NULL;
 # endif
-        char timebuf[sizeof("HH:MM:SS")];
+        char flg_not_length = '[';
         char cbuf[2];
-        char c;
-        char *pbuf;
 
-        cmdedit_prmt_len = 0;
+        /*cmdedit_prmt_len = 0; - already is */
 
         cbuf[1] = '\0'; /* never changes */
 
         while (*prmt_ptr) {
+                char timebuf[sizeof("HH:MM:SS")];
                 char *free_me = NULL;
+                char *pbuf;
+                char c;
 
                 pbuf = cbuf;
                 c = *prmt_ptr++;
@@ -1922,7 +1943,8 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                 }
                                 case '[': case ']':
                                         if (c == flg_not_length) {
-                                                flg_not_length = (flg_not_length == '[' ? ']' : '[');
+                                                /* Toggle '['/']' hex 5b/5d */
+                                                flg_not_length ^= 6;
                                                 continue;
                                         }
                                         break;
@@ -1930,11 +1952,22 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                         } /* if */
                 } /* if */
                 cbuf[0] = c;
-                cur_prmt_len = strlen(pbuf);
-                prmt_len += cur_prmt_len;
-                if (flg_not_length != ']')
-                        cmdedit_prmt_len += cur_prmt_len;
-                prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_len+1), pbuf);
+                {
+                        int n = strlen(pbuf);
+                        prmt_size += n;
+                        if (c == '\n')
+                                cmdedit_prmt_len = 0;
+                        else if (flg_not_length != ']') {
+#if 0 /*ENABLE_UNICODE_SUPPORT*/
+/* Won't work, pbuf is one BYTE string here instead of an one Unicode char string. */
+/* FIXME */
+                                cmdedit_prmt_len += unicode_strwidth(pbuf);
+#else
+                                cmdedit_prmt_len += n;
+#endif
+                        }
+                }
+                prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_size+1), pbuf);
                 free(free_me);
         } /* while */
 
@@ -2003,7 +2036,15 @@ static int lineedit_read_key(char *read_key_buffer, int timeout)
                         S.sent_ESC_br6n = 0;
                         if (cursor == 0) { /* otherwise it may be bogus */
                                 int col = ((ic >> 32) & 0x7fff) - 1;
-                                if (col > cmdedit_prmt_len) {
+                                /*
+                                 * Is col > cmdedit_prmt_len?
+                                 * If yes (terminal says cursor is farther to the right
+                                 * of where we think it should be),
+                                 * the prompt wasn't printed starting at col 1,
+                                 * there was additional text before it.
+                                 */
+                                if ((int)(col - cmdedit_prmt_len) > 0) {
+                                        /* Fix our understanding of current x position */
                                         cmdedit_x += (col - cmdedit_prmt_len);
                                         while (cmdedit_x >= cmdedit_termw) {
                                                 cmdedit_x -= cmdedit_termw;
@@ -2094,6 +2135,7 @@ static int32_t reverse_i_search(void)
         char read_key_buffer[KEYCODE_BUFFER_SIZE];
         const char *matched_history_line;
         const char *saved_prompt;
+        unsigned saved_prmt_len;
         int32_t ic;
 
         matched_history_line = NULL;
@@ -2102,6 +2144,7 @@ static int32_t reverse_i_search(void)
 
         /* Save and replace the prompt */
         saved_prompt = cmdedit_prompt;
+        saved_prmt_len = cmdedit_prmt_len;
         goto set_prompt;
 
         while (1) {
@@ -2177,7 +2220,7 @@ static int32_t reverse_i_search(void)
                                         free((char*)cmdedit_prompt);
  set_prompt:
                                         cmdedit_prompt = xasprintf("(reverse-i-search)'%s': ", match_buf);
-                                        cmdedit_prmt_len = strlen(cmdedit_prompt);
+                                        cmdedit_prmt_len = unicode_strwidth(cmdedit_prompt);
                                         goto do_redraw;
                                 }
                         }
@@ -2199,7 +2242,7 @@ static int32_t reverse_i_search(void)
 
         free((char*)cmdedit_prompt);
         cmdedit_prompt = saved_prompt;
-        cmdedit_prmt_len = strlen(cmdedit_prompt);
+        cmdedit_prmt_len = saved_prmt_len;
         redraw(cmdedit_y, command_len - cursor);
 
         return ic;
@@ -2774,8 +2817,9 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         free(command_ps);
 #endif
 
-        if (command_len > 0)
+        if (command_len > 0) {
                 remember_in_history(command);
+        }
 
         if (break_out > 0) {
                 command[command_len++] = '\n';
diff --git a/libbb/printable.c b/libbb/printable.c
index f6ada4904..9a423431e 100644
--- a/libbb/printable.c
+++ b/libbb/printable.c
@@ -32,3 +32,27 @@ void FAST_FUNC fputc_printable(int ch, FILE *file)
         }
         fputc(ch, file);
 }
+
+void FAST_FUNC visible(unsigned ch, char *buf, int flags)
+{
+        if (ch == '\t' && !(flags & VISIBLE_SHOW_TABS)) {
+                goto raw;
+        }
+        if (ch == '\n') {
+                if (flags & VISIBLE_ENDLINE)
+                        *buf++ = '$';
+        } else {
+                if (ch >= 128) {
+                        ch -= 128;
+                        *buf++ = 'M';
+                        *buf++ = '-';
+                }
+                if (ch < 32 || ch == 127) {
+                        *buf++ = '^';
+                        ch ^= 0x40;
+                }
+        }
+ raw:
+        *buf++ = ch;
+        *buf = '\0';
+}
diff --git a/libbb/time.c b/libbb/time.c
index 57e14b66c..ea2f72e3b 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -23,14 +23,16 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                 if (sscanf(date_str, "%u:%u%c",
                                         &ptm->tm_hour,
                                         &ptm->tm_min,
-                                        &end) >= 2) {
+                                        &end) >= 2
+                ) {
                         /* no adjustments needed */
                 } else
                 /* mm.dd-HH:MM */
                 if (sscanf(date_str, "%u.%u-%u:%u%c",
                                         &ptm->tm_mon, &ptm->tm_mday,
                                         &ptm->tm_hour, &ptm->tm_min,
-                                        &end) >= 4) {
+                                        &end) >= 4
+                ) {
                         /* Adjust month from 1-12 to 0-11 */
                         ptm->tm_mon -= 1;
                 } else
@@ -38,15 +40,13 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                 if (sscanf(date_str, "%u.%u.%u-%u:%u%c", &ptm->tm_year,
                                         &ptm->tm_mon, &ptm->tm_mday,
                                         &ptm->tm_hour, &ptm->tm_min,
-                                        &end) >= 5) {
-                        ptm->tm_year -= 1900; /* Adjust years */
-                        ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
-                } else
+                                        &end) >= 5
                 /* yyyy-mm-dd HH:MM */
-                if (sscanf(date_str, "%u-%u-%u %u:%u%c", &ptm->tm_year,
+                 || sscanf(date_str, "%u-%u-%u %u:%u%c", &ptm->tm_year,
                                         &ptm->tm_mon, &ptm->tm_mday,
                                         &ptm->tm_hour, &ptm->tm_min,
-                                        &end) >= 5) {
+                                        &end) >= 5
+                ) {
                         ptm->tm_year -= 1900; /* Adjust years */
                         ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
                 } else
@@ -58,7 +58,6 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                         return; /* don't fall through to end == ":" check */
                 } else
 #endif
-//TODO: coreutils 6.9 also accepts "yyyy-mm-dd HH" (no minutes)
                 {
                         bb_error_msg_and_die(bb_msg_invalid_date, date_str);
                 }
@@ -68,7 +67,21 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                                 end = '\0';
                         /* else end != NUL and we error out */
                 }
-        } else if (date_str[0] == '@') {
+        } else
+        /* yyyy-mm-dd HH */
+        if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
+                                &ptm->tm_mon, &ptm->tm_mday,
+                                &ptm->tm_hour,
+                                &end) >= 4
+        /* yyyy-mm-dd */
+         || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
+                                &ptm->tm_mon, &ptm->tm_mday,
+                                &end) >= 3
+        ) {
+                ptm->tm_year -= 1900; /* Adjust years */
+                ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
+        } else
+        if (date_str[0] == '@') {
                 time_t t = bb_strtol(date_str + 1, NULL, 10);
                 if (!errno) {
                         struct tm *lt = localtime(&t);
diff --git a/libbb/unicode.c b/libbb/unicode.c
index 99dc1dfa6..9c4da50d3 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -28,19 +28,37 @@ void FAST_FUNC reinit_unicode(const char *LANG)
         static const char unicode_0x394[] = { 0xce, 0x94, 0 };
         size_t width;
 
+        /* We pass "" instead of "C" because some libc's have
+         * non-ASCII default locale for setlocale("") call
+         * (this allows users of such libc to have Unicoded
+         * system without having to mess with env).
+         *
+         * We set LC_CTYPE because (a) we may be called with $LC_CTYPE
+         * value in LANG, not with $LC_ALL, (b) internationalized
+         * LC_NUMERIC and LC_TIME are more PITA than benefit
+         * (for one, some utilities have hard time with comma
+         * used as a fractional separator).
+         */
 //TODO: avoid repeated calls by caching last string?
-        setlocale(LC_ALL, (LANG && LANG[0]) ? LANG : "C");
+        setlocale(LC_CTYPE, LANG ? LANG : "");
 
         /* In unicode, this is a one character string */
-// can use unicode_strlen(string) too, but otherwise unicode_strlen() is unused
-        width = mbstowcs(NULL, unicode_0x394, INT_MAX);
+        width = unicode_strlen(unicode_0x394);
         unicode_status = (width == 1 ? UNICODE_ON : UNICODE_OFF);
 }
 
 void FAST_FUNC init_unicode(void)
 {
-        if (unicode_status == UNICODE_UNKNOWN)
-                reinit_unicode(getenv("LANG"));
+        /* Some people set only $LC_CTYPE, not $LC_ALL, because they want
+         * only Unicode to be activated on their system, not the whole
+         * shebang of wrong decimal points, strange date formats and so on.
+         */
+        if (unicode_status == UNICODE_UNKNOWN) {
+                char *s = getenv("LC_ALL");
+                if (!s) s = getenv("LC_CTYPE");
+                if (!s) s = getenv("LANG");
+                reinit_unicode(s);
+        }
 }
 
 #else
@@ -58,8 +76,12 @@ void FAST_FUNC reinit_unicode(const char *LANG)
 
 void FAST_FUNC init_unicode(void)
 {
-        if (unicode_status == UNICODE_UNKNOWN)
-                reinit_unicode(getenv("LANG"));
+        if (unicode_status == UNICODE_UNKNOWN) {
+                char *s = getenv("LC_ALL");
+                if (!s) s = getenv("LC_CTYPE");
+                if (!s) s = getenv("LANG");
+                reinit_unicode(s);
+        }
 }
 # endif
 
@@ -963,7 +985,6 @@ int FAST_FUNC unicode_bidi_is_neutral_wchar(wint_t wc)
 
 /* The rest is mostly same for libc and for "homegrown" support */
 
-#if 0 // UNUSED
 size_t FAST_FUNC unicode_strlen(const char *string)
 {
         size_t width = mbstowcs(NULL, string, INT_MAX);
@@ -971,7 +992,6 @@ size_t FAST_FUNC unicode_strlen(const char *string)
                 return strlen(string);
         return width;
 }
-#endif
 
 size_t FAST_FUNC unicode_strwidth(const char *string)
 {
diff --git a/libbb/xatonum.c b/libbb/xatonum.c
index 62bbe53e7..6f4e023bb 100644
--- a/libbb/xatonum.c
+++ b/libbb/xatonum.c
@@ -68,3 +68,10 @@ uint16_t FAST_FUNC xatou16(const char *numstr)
 {
         return xatou_range(numstr, 0, 0xffff);
 }
+
+const struct suffix_mult bkm_suffixes[] = {
+        { "b", 512 },
+        { "k", 1024 },
+        { "m", 1024*1024 },
+        { "", 0 }
+};
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 05aa07ce8..a70683241 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -541,13 +541,11 @@ int FAST_FUNC bb_xioctl(int fd, unsigned request, void *argp)
 
 char* FAST_FUNC xmalloc_ttyname(int fd)
 {
-        char *buf = xzalloc(128);
-        int r = ttyname_r(fd, buf, 127);
-        if (r) {
-                free(buf);
-                buf = NULL;
-        }
-        return buf;
+        char buf[128];
+        int r = ttyname_r(fd, buf, sizeof(buf) - 1);
+        if (r)
+                return NULL;
+        return xstrdup(buf);
 }
 
 void FAST_FUNC generate_uuid(uint8_t *buf)
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index a36f920f4..29f0fbe91 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -92,6 +92,7 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv)
 {
         char salt[MAX_PW_SALT_LEN];
         char *salt_ptr;
+        char *password;
         const char *opt_m, *opt_S;
         int fd;
 
@@ -123,15 +124,19 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv)
 
         xmove_fd(fd, STDIN_FILENO);
 
-        puts(pw_encrypt(
-                argv[0] ? argv[0] : (
-                        /* Only mkpasswd, and only from tty, prompts.
-                         * Otherwise it is a plain read. */
-                        (isatty(STDIN_FILENO) && applet_name[0] == 'm')
+        password = argv[0];
+        if (!password) {
+                /* Only mkpasswd, and only from tty, prompts.
+                 * Otherwise it is a plain read. */
+                password = (isatty(STDIN_FILENO) && applet_name[0] == 'm')
                         ? bb_ask_stdin("Password: ")
                         : xmalloc_fgetline(stdin)
-                ),
-                salt, 1));
+                ;
+                /* may still be NULL on EOF/error */
+        }
+
+        if (password)
+                puts(pw_encrypt(password, salt, 1));
 
         return EXIT_SUCCESS;
 }
diff --git a/loginutils/getty.c b/loginutils/getty.c
index e5d13bed6..0f060ae6c 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -695,6 +695,6 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
         /* We use PATH because we trust that root doesn't set "bad" PATH,
          * and getty is not suid-root applet */
         /* With -n, logname == NULL, and login will ask for username instead */
-        BB_EXECLP(G.login, G.login, "--", logname, NULL);
+        BB_EXECLP(G.login, G.login, "--", logname, (char *)0);
         bb_error_msg_and_die("can't execute '%s'", G.login);
 }
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index bd2b09eed..65e638489 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -79,12 +79,12 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
                 char *encrypted;
                 int r;
 
-                /* cp points to a static buffer that is zeroed every time */
+                /* cp points to a static buffer */
                 cp = bb_ask(STDIN_FILENO, timeout,
                                 "Give root password for system maintenance\n"
                                 "(or type Control-D for normal startup):");
-
-                if (!cp || !*cp) {
+                if (!cp) {
+                        /* ^D, ^C, timeout, or read error */
                         bb_info_msg("Normal startup");
                         return 0;
                 }
diff --git a/miscutils/chrt.c b/miscutils/chrt.c
index 91b5397c4..f2f559fd7 100644
--- a/miscutils/chrt.c
+++ b/miscutils/chrt.c
@@ -23,9 +23,6 @@
 
 #include <sched.h>
 #include "libbb.h"
-#ifndef _POSIX_PRIORITY_SCHEDULING
-#warning your system may be foobared
-#endif
 
 static const struct {
         int policy;
diff --git a/miscutils/less.c b/miscutils/less.c
index 5ce0a1203..60105f42b 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -1608,6 +1608,9 @@ static void sigwinch_handler(int sig UNUSED_PARAM)
 int less_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int less_main(int argc, char **argv)
 {
+        char *tty_name;
+        int tty_fd;
+
         INIT_G();
 
         /* TODO: -x: do not interpret backspace, -xx: tab also */
@@ -1637,10 +1640,28 @@ int less_main(int argc, char **argv)
         if (option_mask32 & FLAG_TILDE)
                 empty_line_marker = "";
 
-        kbd_fd = open(CURRENT_TTY, O_RDONLY);
-        if (kbd_fd < 0)
-                return bb_cat(argv);
-        ndelay_on(kbd_fd);
+        /* Some versions of less can survive w/o controlling tty,
+         * try to do the same. This also allows to specify an alternative
+         * tty via "less 1<>TTY".
+         * We don't try to use STDOUT_FILENO directly,
+         * since we want to set this fd to non-blocking mode,
+         * and not bother with restoring it on exit.
+         */
+        tty_name = xmalloc_ttyname(STDOUT_FILENO);
+        if (tty_name) {
+                tty_fd = open(tty_name, O_RDONLY);
+                free(tty_name);
+                if (tty_fd < 0)
+                        goto try_ctty;
+        } else {
+                /* Try controlling tty */
+ try_ctty:
+                tty_fd = open(CURRENT_TTY, O_RDONLY);
+                if (tty_fd < 0)
+                        return bb_cat(argv);
+        }
+        ndelay_on(tty_fd);
+        kbd_fd = tty_fd; /* save in a global */
 
         tcgetattr(kbd_fd, &term_orig);
         term_less = term_orig;
diff --git a/miscutils/man.c b/miscutils/man.c
index b8b15b83b..429898643 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -162,7 +162,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         opt = getopt32(argv, "+aw");
         argv += optind;
 
-        sec_list = xstrdup("1:2:3:4:5:6:7:8:9");
+        sec_list = xstrdup("0p:1:1p:2:3:3p:4:5:6:7:8:9");
         /* Last valid man_path_list[] is [0x10] */
         count_mp = 0;
         man_path_list = xzalloc(0x11 * sizeof(man_path_list[0]));
diff --git a/miscutils/setsid.c b/miscutils/setsid.c
index ad2c8a4de..637081b6c 100644
--- a/miscutils/setsid.c
+++ b/miscutils/setsid.c
@@ -31,7 +31,17 @@ int setsid_main(int argc UNUSED_PARAM, char **argv)
 
         /* setsid() is allowed only when we are not a process group leader.
          * Otherwise our PID serves as PGID of some existing process group
-         * and cannot be used as PGID of a new process group. */
+         * and cannot be used as PGID of a new process group.
+         *
+         * Example: setsid() below fails when run alone in interactive shell:
+         *  $ setsid PROG
+         * because shell's child (setsid) is put in a new process group.
+         * But doesn't fail if shell is not interactive
+         * (and therefore doesn't create process groups for pipes),
+         * or if setsid is not the first process in the process group:
+         *  $ true | setsid PROG
+         * or if setsid is executed in backquotes (`setsid PROG`)...
+         */
         if (setsid() < 0) {
                 pid_t pid = fork_or_rexec(argv);
                 if (pid != 0) {
@@ -43,7 +53,7 @@ int setsid_main(int argc UNUSED_PARAM, char **argv)
                          * However, the code is larger and upstream
                          * does not do such trick.
                          */
-                        exit(EXIT_SUCCESS);
+                        return EXIT_SUCCESS;
                 }
 
                 /* child */
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index dd99a44f4..b71393532 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -66,14 +66,6 @@
 #endif
 #include <mtd/ubi-user.h>
 
-#define OPTION_M  (1 << 0)
-#define OPTION_D  (1 << 1)
-#define OPTION_n  (1 << 2)
-#define OPTION_N  (1 << 3)
-#define OPTION_s  (1 << 4)
-#define OPTION_a  (1 << 5)
-#define OPTION_t  (1 << 6)
-
 #define do_attach (ENABLE_UBIATTACH && applet_name[3] == 'a')
 #define do_detach (ENABLE_UBIDETACH && applet_name[3] == 'd')
 #define do_mkvol  (ENABLE_UBIMKVOL  && applet_name[3] == 'm')
@@ -81,191 +73,250 @@
 #define do_rsvol  (ENABLE_UBIRSVOL  && applet_name[4] == 's')
 #define do_update (ENABLE_UBIUPDATEVOL && applet_name[3] == 'u')
 
-//usage:#define ubiattach_trivial_usage
-//usage:       "-m MTD_NUM [-d UBI_NUM] UBI_CTRL_DEV"
-//usage:#define ubiattach_full_usage "\n\n"
-//usage:       "Attach MTD device to UBI\n"
-//usage:     "\n        -m MTD_NUM      MTD device number to attach"
-//usage:     "\n        -d UBI_NUM      UBI device number to assign"
-//usage:
-//usage:#define ubidetach_trivial_usage
-//usage:       "-d UBI_NUM UBI_CTRL_DEV"
-//usage:#define ubidetach_full_usage "\n\n"
-//usage:       "Detach MTD device from UBI\n"
-//usage:     "\n        -d UBI_NUM      UBI device number"
-//usage:
-//usage:#define ubimkvol_trivial_usage
-//usage:       "UBI_DEVICE -N NAME -s SIZE"
-//usage:#define ubimkvol_full_usage "\n\n"
-//usage:       "Create UBI volume\n"
-//usage:     "\n        -a ALIGNMENT    Volume alignment (default 1)"
-//usage:     "\n        -n VOLID        Volume ID, if not specified, it"
-//usage:     "\n                        will be assigned automatically"
-//usage:     "\n        -N NAME         Volume name"
-//usage:     "\n        -s SIZE         Size in bytes"
-//usage:     "\n        -t TYPE         Volume type (static|dynamic)"
-//usage:
-//usage:#define ubirmvol_trivial_usage
-//usage:       "UBI_DEVICE -n VOLID"
-//usage:#define ubirmvol_full_usage "\n\n"
-//usage:       "Remove UBI volume\n"
-//usage:     "\n        -n VOLID        Volume ID"
-//usage:
-//usage:#define ubirsvol_trivial_usage
-//usage:       "UBI_DEVICE -n VOLID -s SIZE"
-//usage:#define ubirsvol_full_usage "\n\n"
-//usage:       "Resize UBI volume\n"
-//usage:     "\n        -n VOLID        Volume ID to resize"
-//usage:     "\n        -s SIZE         Size in bytes"
-//usage:
-//usage:#define ubiupdatevol_trivial_usage
-//usage:       "UBI_DEVICE [IMG_FILE]"
-//usage:#define ubiupdatevol_full_usage "\n\n"
-//usage:       "Update UBI volume\n"
-//usage:     "\n        -t      Truncate UBI volume"
-//usage:     "\n        -s SIZE Bytes in input (if reading stdin)"
+static unsigned get_num_from_file(const char *path, unsigned max, const char *errmsg)
+{
+        char buf[sizeof(long long)*3];
+        unsigned long long num;
+
+        if (open_read_close(path, buf, sizeof(buf)) < 0)
+                bb_perror_msg_and_die(errmsg, path);
+        /* It can be \n terminated, xatoull won't work well */
+        if (sscanf(buf, "%llu", &num) != 1 || num > max)
+                bb_error_msg_and_die(errmsg, path);
+        return num;
+}
 
+/* To prevent malloc(1G) accidents */
+#define MAX_SANE_ERASEBLOCK (16*1024*1024)
 
 int ubi_tools_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
 {
+        static const struct suffix_mult size_suffixes[] = {
+                { "KiB", 1024 },
+                { "MiB", 1024*1024 },
+                { "GiB", 1024*1024*1024 },
+                { "", 0 }
+        };
+
         unsigned opts;
         char *ubi_ctrl;
-        //struct stat st;
         int fd;
         int mtd_num;
         int dev_num = UBI_DEV_NUM_AUTO;
         int vol_id = UBI_VOL_NUM_AUTO;
-        char *vol_name = NULL;
-        int size_bytes;
+        char *vol_name;
+        unsigned long long size_bytes = size_bytes; /* for compiler */
+        char *size_bytes_str;
         int alignment = 1;
-        char *type = NULL;
+        char *type;
+        union {
+                struct ubi_attach_req attach_req;
+                struct ubi_mkvol_req  mkvol_req;
+                struct ubi_rsvol_req  rsvol_req;
+        } req_structs;
+#define attach_req req_structs.attach_req
+#define mkvol_req  req_structs.mkvol_req
+#define rsvol_req  req_structs.rsvol_req
+        char path[sizeof("/sys/class/ubi/ubi%d_%d/usable_eb_size")
+                                + 2 * sizeof(int)*3 + /*just in case:*/ 16];
+#define path_sys_class_ubi_ubi (path + sizeof("/sys/class/ubi/ubi")-1)
+
+        strcpy(path, "/sys/class/ubi/ubi");
+        memset(&req_structs, 0, sizeof(req_structs));
+
+        if (do_mkvol) {
+                opt_complementary = "-1:d+:n+:a+";
+                opts = getopt32(argv, "md:n:N:s:a:t:",
+                                &dev_num, &vol_id,
+                                &vol_name, &size_bytes_str, &alignment, &type
+                        );
+        } else {
+                opt_complementary = "-1:m+:d+:n+:a+";
+                opts = getopt32(argv, "m:d:n:N:s:a:t:",
+                                &mtd_num, &dev_num, &vol_id,
+                                &vol_name, &size_bytes_str, &alignment, &type
+                );
+        }
+#define OPTION_m  (1 << 0)
+#define OPTION_d  (1 << 1)
+#define OPTION_n  (1 << 2)
+#define OPTION_N  (1 << 3)
+#define OPTION_s  (1 << 4)
+#define OPTION_a  (1 << 5)
+#define OPTION_t  (1 << 6)
 
-        opt_complementary = "-1:m+:d+:n+:s+:a+";
-        opts = getopt32(argv, "m:d:n:N:s:a:t::",
-                        &mtd_num, &dev_num, &vol_id,
-                        &vol_name, &size_bytes, &alignment, &type
-        );
-        ubi_ctrl = argv[optind];
+        if (opts & OPTION_s)
+                size_bytes = xatoull_sfx(size_bytes_str, size_suffixes);
+        argv += optind;
+        ubi_ctrl = *argv++;
 
         fd = xopen(ubi_ctrl, O_RDWR);
         //xfstat(fd, &st, ubi_ctrl);
         //if (!S_ISCHR(st.st_mode))
         //      bb_error_msg_and_die("%s: not a char device", ubi_ctrl);
 
+//usage:#define ubiattach_trivial_usage
+//usage:       "-m MTD_NUM [-d UBI_NUM] UBI_CTRL_DEV"
+//usage:#define ubiattach_full_usage "\n\n"
+//usage:       "Attach MTD device to UBI\n"
+//usage:     "\n        -m MTD_NUM      MTD device number to attach"
+//usage:     "\n        -d UBI_NUM      UBI device number to assign"
         if (do_attach) {
-                struct ubi_attach_req req;
-                if (!(opts & OPTION_M))
+                if (!(opts & OPTION_m))
                         bb_error_msg_and_die("%s device not specified", "MTD");
 
-                memset(&req, 0, sizeof(req));
-                req.mtd_num = mtd_num;
-                req.ubi_num = dev_num;
+                attach_req.mtd_num = mtd_num;
+                attach_req.ubi_num = dev_num;
 
-                xioctl(fd, UBI_IOCATT, &req);
+                xioctl(fd, UBI_IOCATT, &attach_req);
         } else
+
+//usage:#define ubidetach_trivial_usage
+//usage:       "-d UBI_NUM UBI_CTRL_DEV"
+//usage:#define ubidetach_full_usage "\n\n"
+//usage:       "Detach MTD device from UBI\n"
+//usage:     "\n        -d UBI_NUM      UBI device number"
         if (do_detach) {
-                if (!(opts & OPTION_D))
+                if (!(opts & OPTION_d))
                         bb_error_msg_and_die("%s device not specified", "UBI");
 
+                /* FIXME? kernel expects int32_t* here: */
                 xioctl(fd, UBI_IOCDET, &dev_num);
         } else
+
+//usage:#define ubimkvol_trivial_usage
+//usage:       "UBI_DEVICE -N NAME [-s SIZE | -m]"
+//usage:#define ubimkvol_full_usage "\n\n"
+//usage:       "Create UBI volume\n"
+//usage:     "\n        -a ALIGNMENT    Volume alignment (default 1)"
+//usage:     "\n        -m              Set volume size to maximum available"
+//usage:     "\n        -n VOLID        Volume ID. If not specified,"
+//usage:     "\n                        assigned automatically"
+//usage:     "\n        -N NAME         Volume name"
+//usage:     "\n        -s SIZE         Size in bytes"
+//usage:     "\n        -t TYPE         Volume type (static|dynamic)"
         if (do_mkvol) {
-                struct ubi_mkvol_req req;
-                int vol_name_len;
+                if (opts & OPTION_m) {
+                        unsigned leb_avail;
+                        unsigned leb_size;
+                        unsigned num;
+                        char *p;
+
+                        if (sscanf(ubi_ctrl, "/dev/ubi%u", &num) != 1)
+                                bb_error_msg_and_die("wrong format of UBI device name");
+
+                        p = path_sys_class_ubi_ubi + sprintf(path_sys_class_ubi_ubi, "%u/", num);
+
+                        strcpy(p, "avail_eraseblocks");
+                        leb_avail = get_num_from_file(path, UINT_MAX, "Can't get available eraseblocks from '%s'");
+
+                        strcpy(p, "eraseblock_size");
+                        leb_size = get_num_from_file(path, MAX_SANE_ERASEBLOCK, "Can't get eraseblock size from '%s'");
+
+                        size_bytes = leb_avail * (unsigned long long)leb_size;
+                        //if (size_bytes <= 0)
+                        //      bb_error_msg_and_die("%s invalid maximum size calculated", "UBI");
+                } else
                 if (!(opts & OPTION_s))
-                        bb_error_msg_and_die("%s size not specified", "UBI");
+                        bb_error_msg_and_die("size not specified");
+
                 if (!(opts & OPTION_N))
-                        bb_error_msg_and_die("%s name not specified", "UBI");
-                vol_name_len = strlen(vol_name);
-                if (vol_name_len > UBI_MAX_VOLUME_NAME)
-                        bb_error_msg_and_die("%s volume name too long", "UBI");
-
-                memset(&req, 0, sizeof(req));
-                req.vol_id = vol_id;
-                if ((opts & OPTION_t) && type) {
-                        if (type[0] == 's')
-                                req.vol_type = UBI_STATIC_VOLUME;
-                        else
-                                req.vol_type = UBI_DYNAMIC_VOLUME;
-                } else {
-                        req.vol_type = UBI_DYNAMIC_VOLUME;
-                }
-                req.alignment = alignment;
-                req.bytes = size_bytes;
-                strncpy(req.name, vol_name, UBI_MAX_VOLUME_NAME);
-                req.name_len = vol_name_len;
+                        bb_error_msg_and_die("name not specified");
+
+                mkvol_req.vol_id = vol_id;
+                mkvol_req.vol_type = UBI_DYNAMIC_VOLUME;
+                if ((opts & OPTION_t) && type[0] == 's')
+                        mkvol_req.vol_type = UBI_STATIC_VOLUME;
+                mkvol_req.alignment = alignment;
+                mkvol_req.bytes = size_bytes; /* signed int64_t */
+                strncpy(mkvol_req.name, vol_name, UBI_MAX_VOLUME_NAME);
+                mkvol_req.name_len = strlen(vol_name);
+                if (mkvol_req.name_len > UBI_MAX_VOLUME_NAME)
+                        bb_error_msg_and_die("volume name too long: '%s'", vol_name);
 
-                xioctl(fd, UBI_IOCMKVOL, &req);
+                xioctl(fd, UBI_IOCMKVOL, &mkvol_req);
         } else
+
+//usage:#define ubirmvol_trivial_usage
+//usage:       "UBI_DEVICE -n VOLID"
+//usage:#define ubirmvol_full_usage "\n\n"
+//usage:       "Remove UBI volume\n"
+//usage:     "\n        -n VOLID        Volume ID"
         if (do_rmvol) {
                 if (!(opts & OPTION_n))
-                        bb_error_msg_and_die("%s volume id not specified", "UBI");
+                        bb_error_msg_and_die("volume id not specified");
 
+                /* FIXME? kernel expects int32_t* here: */
                 xioctl(fd, UBI_IOCRMVOL, &vol_id);
         } else
+
+//usage:#define ubirsvol_trivial_usage
+//usage:       "UBI_DEVICE -n VOLID -s SIZE"
+//usage:#define ubirsvol_full_usage "\n\n"
+//usage:       "Resize UBI volume\n"
+//usage:     "\n        -n VOLID        Volume ID"
+//usage:     "\n        -s SIZE         Size in bytes"
         if (do_rsvol) {
-                struct ubi_rsvol_req req;
                 if (!(opts & OPTION_s))
-                        bb_error_msg_and_die("%s size not specified", "UBI");
+                        bb_error_msg_and_die("size not specified");
                 if (!(opts & OPTION_n))
-                        bb_error_msg_and_die("%s volume id not specified", "UBI");
+                        bb_error_msg_and_die("volume id not specified");
 
-                memset(&req, 0, sizeof(req));
-                req.bytes = size_bytes;
-                req.vol_id = vol_id;
+                rsvol_req.bytes = size_bytes; /* signed int64_t */
+                rsvol_req.vol_id = vol_id;
 
-                xioctl(fd, UBI_IOCRSVOL, &req);
+                xioctl(fd, UBI_IOCRSVOL, &rsvol_req);
         } else
+
+//usage:#define ubiupdatevol_trivial_usage
+//usage:       "UBI_DEVICE [-t | [-s SIZE] IMG_FILE]"
+//usage:#define ubiupdatevol_full_usage "\n\n"
+//usage:       "Update UBI volume\n"
+//usage:     "\n        -t      Truncate to zero size"
+//usage:     "\n        -s SIZE Size in bytes to resize to"
         if (do_update) {
-                long long bytes;
+                int64_t bytes64;
 
                 if (opts & OPTION_t) {
-                        // truncate the volume by starting an update for size 0
-                        bytes = 0;
-                        xioctl(fd, UBI_IOCVOLUP, &bytes);
+                        /* truncate the volume by starting an update for size 0 */
+                        bytes64 = 0;
+                        /* this ioctl expects int64_t* parameter */
+                        xioctl(fd, UBI_IOCVOLUP, &bytes64);
                 }
                 else {
                         struct stat st;
-                        char buf[sizeof("/sys/class/ubi/ubi%d_%d/usable_eb_size") + 2 * sizeof(int)*3];
-                        int input_fd;
                         unsigned ubinum, volnum;
                         unsigned leb_size;
                         ssize_t len;
                         char *input_data;
 
-                        // Make assumption that device not is in normal format.
-                        // Removes need for scanning sysfs tree as full libubi does
+                        /* Assume that device is in normal format. */
+                        /* Removes need for scanning sysfs tree as full libubi does. */
                         if (sscanf(ubi_ctrl, "/dev/ubi%u_%u", &ubinum, &volnum) != 2)
-                                bb_error_msg_and_die("%s volume node not in correct format", "UBI");
-
-                        sprintf(buf, "/sys/class/ubi/ubi%u_%u/usable_eb_size", ubinum, volnum);
-                        if (open_read_close(buf, buf, sizeof(buf)) <= 0)
-                                bb_error_msg_and_die("%s could not get LEB size", "UBI");
-                        if (sscanf(buf, "%u", &leb_size) != 1)
-                                bb_error_msg_and_die("%s could not get LEB size", "UBI");
-
-                        if (opts & OPTION_s) {
-                                input_fd = 0;
-                        } else {
-                                if (!argv[optind+1])
+                                bb_error_msg_and_die("wrong format of UBI device name");
+
+                        sprintf(path_sys_class_ubi_ubi, "%u_%u/usable_eb_size", ubinum, volnum);
+                        leb_size = get_num_from_file(path, MAX_SANE_ERASEBLOCK, "Can't get usable eraseblock size from '%s'");
+
+                        if (!(opts & OPTION_s)) {
+                                if (!*argv)
                                         bb_show_usage();
-                                xstat(argv[optind+1], &st);
+                                xstat(*argv, &st);
                                 size_bytes = st.st_size;
-                                input_fd = xopen(argv[optind+1], O_RDONLY);
+                                xmove_fd(xopen(*argv, O_RDONLY), STDIN_FILENO);
                         }
 
-                        bytes = size_bytes;
-                        xioctl(fd, UBI_IOCVOLUP, &bytes);
+                        bytes64 = size_bytes;
+                        /* this ioctl expects signed int64_t* parameter */
+                        xioctl(fd, UBI_IOCVOLUP, &bytes64);
 
                         input_data = xmalloc(leb_size);
-                        while ((len = full_read(input_fd, input_data, leb_size)) > 0) {
+                        while ((len = full_read(STDIN_FILENO, input_data, leb_size)) > 0) {
                                 xwrite(fd, input_data, len);
                         }
                         if (len < 0)
-                                bb_error_msg_and_die("%s volume update failed", "UBI");
-                        if (ENABLE_FEATURE_CLEAN_UP)
-                                close(input_fd);
+                                bb_perror_msg_and_die("UBI volume update failed");
                 }
         }
 
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index fb6c65990..7f7446d8e 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -171,7 +171,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*ptr_to_globals)
 #define INIT_G() do { \
-        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
 } while (0)
 
 
diff --git a/networking/httpd.c b/networking/httpd.c
index b46eb0fab..cef9b8baf 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1709,8 +1709,8 @@ static int pam_talker(int num_msg,
                         s = userinfo->pw;
                         break;
                 case PAM_ERROR_MSG:
-                case PAM_TEXT_INFO:
-                        s = "";
+                case PAM_TEXT_INFO:
+                        s = "";
                         break;
                 default:
                         free(response);
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 782374b35..8984b0207 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -56,7 +56,7 @@
 #endif
 
 #if ENABLE_FEATURE_IFCONFIG_SLIP
-# include <net/if_slip.h>
+# include <linux/if_slip.h>
 #endif
 
 /* I don't know if this is needed for busybox or not.  Anyone? */
@@ -265,49 +265,6 @@ static const struct options OptArray[] = {
         { NULL,          0,             ARG_HOSTNAME,    (IFF_UP | IFF_RUNNING) }
 };
 
-#if ENABLE_FEATURE_IFCONFIG_HW
-/* Input an Ethernet address and convert to binary. */
-static int in_ether(const char *bufp, struct sockaddr *sap)
-{
-        char *ptr;
-        int i, j;
-        unsigned char val;
-        unsigned char c;
-
-        sap->sa_family = ARPHRD_ETHER;
-        ptr = (char *) sap->sa_data;
-
-        i = 0;
-        do {
-                j = val = 0;
-
-                /* We might get a semicolon here - not required. */
-                if (i && (*bufp == ':')) {
-                        bufp++;
-                }
-
-                do {
-                        c = *bufp;
-                        if (((unsigned char)(c - '0')) <= 9) {
-                                c -= '0';
-                        } else if ((unsigned char)((c|0x20) - 'a') <= 5) {
-                                c = (unsigned char)((c|0x20) - 'a') + 10;
-                        } else if (j && (c == ':' || c == 0)) {
-                                break;
-                        } else {
-                                return -1;
-                        }
-                        ++bufp;
-                        val <<= 4;
-                        val += c;
-                } while (++j < 2);
-                *ptr++ = val;
-        } while (++i < ETH_ALEN);
-
-        return *bufp; /* Error if we don't end at end of string. */
-}
-#endif
-
 int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ifconfig_main(int argc UNUSED_PARAM, char **argv)
 {
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 3cdc2c9d2..b578f4c61 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -451,20 +451,24 @@ static smallint detect_link(void)
 static NOINLINE int check_existence_through_netlink(void)
 {
         int iface_len;
-        char replybuf[1024];
+        /* Buffer was 1K, but on linux-3.9.9 it was reported to be too small.
+         * netlink.h: "limit to 8K to avoid MSG_TRUNC when PAGE_SIZE is very large".
+         * Note: on error returns (-1) we exit, no need to free replybuf.
+         */
+        enum { BUF_SIZE = 8 * 1024 };
+        char *replybuf = xmalloc(BUF_SIZE);
 
         iface_len = strlen(G.iface);
         while (1) {
                 struct nlmsghdr *mhdr;
                 ssize_t bytes;
 
-                bytes = recv(netlink_fd, &replybuf, sizeof(replybuf), MSG_DONTWAIT);
+                bytes = recv(netlink_fd, replybuf, BUF_SIZE, MSG_DONTWAIT);
                 if (bytes < 0) {
                         if (errno == EAGAIN)
-                                return G.iface_exists;
+                                goto ret;
                         if (errno == EINTR)
                                 continue;
-
                         bb_perror_msg("netlink: recv");
                         return -1;
                 }
@@ -507,6 +511,8 @@ static NOINLINE int check_existence_through_netlink(void)
                 }
         }
 
+ ret:
+        free(replybuf);
         return G.iface_exists;
 }
 
diff --git a/networking/interface.c b/networking/interface.c
index 9ae8b3f03..bf7d2b1b4 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -722,68 +722,15 @@ static char* FAST_FUNC ether_print(unsigned char *ptr)
         return buff;
 }
 
-static int FAST_FUNC ether_input(const char *bufp, struct sockaddr *sap);
-
 static const struct hwtype ether_hwtype = {
         .name  = "ether",
         .title = "Ethernet",
         .type  = ARPHRD_ETHER,
         .alen  = ETH_ALEN,
         .print = ether_print,
-        .input = ether_input
+        .input = in_ether
 };
 
-static unsigned hexchar2int(char c)
-{
-        if (isdigit(c))
-                return c - '0';
-        c &= ~0x20; /* a -> A */
-        if ((unsigned)(c - 'A') <= 5)
-                return c - ('A' - 10);
-        return ~0U;
-}
-
-/* Input an Ethernet address and convert to binary. */
-static int FAST_FUNC ether_input(const char *bufp, struct sockaddr *sap)
-{
-        unsigned char *ptr;
-        char c;
-        int i;
-        unsigned val;
-
-        sap->sa_family = ether_hwtype.type;
-        ptr = (unsigned char*) sap->sa_data;
-
-        i = 0;
-        while ((*bufp != '\0') && (i < ETH_ALEN)) {
-                val = hexchar2int(*bufp++) * 0x10;
-                if (val > 0xff) {
-                        errno = EINVAL;
-                        return -1;
-                }
-                c = *bufp;
-                if (c == ':' || c == 0)
-                        val >>= 4;
-                else {
-                        val |= hexchar2int(c);
-                        if (val > 0xff) {
-                                errno = EINVAL;
-                                return -1;
-                        }
-                }
-                if (c != 0)
-                        bufp++;
-                *ptr++ = (unsigned char) val;
-                i++;
-
-                /* We might get a semicolon here - not required. */
-                if (*bufp == ':') {
-                        bufp++;
-                }
-        }
-        return 0;
-}
-
 static const struct hwtype ppp_hwtype = {
         .name =         "ppp",
         .title =        "Point-to-Point Protocol",
@@ -927,7 +874,7 @@ static void print_bytes_scaled(unsigned long long ull, const char *end)
 static void ife_print6(struct interface *ptr)
 {
         FILE *f;
-        char addr6[40], devname[20];
+        char addr6[40], devname[21];
         struct sockaddr_in6 sap;
         int plen, scope, dad_status, if_idx;
         char addr6p[8][5];
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 3fd3f4478..aa4779ad1 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -627,10 +627,12 @@ static int ipaddr_modify(int cmd, char **argv)
         req.ifa.ifa_family = preferred_family;
 
         while (*argv) {
-                const smalluint arg = index_in_strings(option, *argv);
-                if (arg <= 1) { /* peer, remote */
+                unsigned arg = index_in_strings(option, *argv);
+                /* if search fails, "local" is assumed */
+                if ((int)arg >= 0)
                         NEXT_ARG();
 
+                if (arg <= 1) { /* peer, remote */
                         if (peer_len) {
                                 duparg("peer", *argv);
                         }
@@ -643,7 +645,6 @@ static int ipaddr_modify(int cmd, char **argv)
                         req.ifa.ifa_prefixlen = peer.bitlen;
                 } else if (arg <= 3) { /* broadcast, brd */
                         inet_prefix addr;
-                        NEXT_ARG();
                         if (brd_len) {
                                 duparg("broadcast", *argv);
                         }
@@ -660,7 +661,6 @@ static int ipaddr_modify(int cmd, char **argv)
                         }
                 } else if (arg == 4) { /* anycast */
                         inet_prefix addr;
-                        NEXT_ARG();
                         if (any_len) {
                                 duparg("anycast", *argv);
                         }
@@ -672,22 +672,18 @@ static int ipaddr_modify(int cmd, char **argv)
                         any_len = addr.bytelen;
                 } else if (arg == 5) { /* scope */
                         uint32_t scope = 0;
-                        NEXT_ARG();
                         if (rtnl_rtscope_a2n(&scope, *argv)) {
                                 invarg(*argv, "scope");
                         }
                         req.ifa.ifa_scope = scope;
                         scoped = 1;
                 } else if (arg == 6) { /* dev */
-                        NEXT_ARG();
                         d = *argv;
                 } else if (arg == 7) { /* label */
-                        NEXT_ARG();
                         l = *argv;
                         addattr_l(&req.n, sizeof(req), IFA_LABEL, l, strlen(l) + 1);
                 } else {
-                        if (arg == 8) /* local */
-                                NEXT_ARG();
+                        /* local (specified or assumed) */
                         if (local_len) {
                                 duparg2("local", *argv);
                         }
@@ -724,7 +720,7 @@ static int ipaddr_modify(int cmd, char **argv)
                 }
                 brd = peer;
                 if (brd.bitlen <= 30) {
-                        for (i=31; i>=brd.bitlen; i--) {
+                        for (i = 31; i >= brd.bitlen; i--) {
                                 if (brd_len == -1)
                                         brd.data[0] |= htonl(1<<(31-i));
                                 else
@@ -754,11 +750,11 @@ int FAST_FUNC do_ipaddr(char **argv)
 {
         static const char commands[] ALIGN1 =
                 "add\0""delete\0""list\0""show\0""lst\0""flush\0";
-        smalluint cmd = 2;
+        int cmd = 2;
         if (*argv) {
                 cmd = index_in_substrings(commands, *argv);
-                if (cmd > 5)
-                        bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+                if (cmd < 0)
+                        invarg(*argv, applet_name);
                 argv++;
                 if (cmd <= 1)
                         return ipaddr_modify((cmd == 0) ? RTM_NEWADDR : RTM_DELADDR, argv);
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index bad2017fe..286e59ebf 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -1,18 +1,33 @@
 /* vi: set sw=4 ts=4: */
 /*
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ *                      Patrick McHardy <kaber@trash.net>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include <net/if.h>
-#include <net/if_packet.h>
+/*#include <net/if_packet.h> - not needed? */
 #include <netpacket/packet.h>
 #include <netinet/if_ether.h>
 
+#include <linux/if_vlan.h>
 #include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
 
+#undef  ETH_P_8021AD
+#define ETH_P_8021AD            0x88A8
+#undef  VLAN_FLAG_REORDER_HDR
+#define VLAN_FLAG_REORDER_HDR   0x1
+#undef  VLAN_FLAG_GVRP
+#define VLAN_FLAG_GVRP          0x2
+#undef  VLAN_FLAG_LOOSE_BINDING
+#define VLAN_FLAG_LOOSE_BINDING 0x4
+#undef  VLAN_FLAG_MVRP
+#define VLAN_FLAG_MVRP          0x8
+#undef  IFLA_VLAN_PROTOCOL
+#define IFLA_VLAN_PROTOCOL      5
+
 #ifndef IFLA_LINKINFO
 # define IFLA_LINKINFO 18
 # define IFLA_INFO_KIND 1
@@ -277,12 +292,103 @@ static int ipaddr_list_link(char **argv)
         return ipaddr_list_or_flush(argv, 0);
 }
 
+static void vlan_parse_opt(char **argv, struct nlmsghdr *n, unsigned int size)
+{
+        static const char keywords[] ALIGN1 =
+                "id\0"
+                "protocol\0"
+                "reorder_hdr\0"
+                "gvrp\0"
+                "mvrp\0"
+                "loose_binding\0"
+        ;
+        static const char protocols[] ALIGN1 =
+                "802.1q\0"
+                "802.1ad\0"
+        ;
+        static const char str_on_off[] ALIGN1 =
+                "on\0"
+                "off\0"
+        ;
+        enum {
+                ARG_id = 0,
+                ARG_reorder_hdr,
+                ARG_gvrp,
+                ARG_mvrp,
+                ARG_loose_binding,
+                ARG_protocol,
+        };
+        enum {
+                PROTO_8021Q = 0,
+                PROTO_8021AD,
+        };
+        enum {
+                PARM_on = 0,
+                PARM_off
+        };
+        int arg;
+        uint16_t id, proto;
+        struct ifla_vlan_flags flags = {};
+
+        while (*argv) {
+                arg = index_in_substrings(keywords, *argv);
+                if (arg < 0)
+                        invarg(*argv, "type vlan");
+
+                NEXT_ARG();
+                if (arg == ARG_id) {
+                        id = get_u16(*argv, "id");
+                        addattr_l(n, size, IFLA_VLAN_ID, &id, sizeof(id));
+                } else if (arg == ARG_protocol) {
+                        arg = index_in_substrings(protocols, *argv);
+                        if (arg == PROTO_8021Q)
+                                proto = ETH_P_8021Q;
+                        else if (arg == PROTO_8021AD)
+                                proto = ETH_P_8021AD;
+                        else
+                                bb_error_msg_and_die("unknown VLAN encapsulation protocol '%s'",
+                                                                     *argv);
+                        addattr_l(n, size, IFLA_VLAN_PROTOCOL, &proto, sizeof(proto));
+                } else {
+                        int param = index_in_strings(str_on_off, *argv);
+                        if (param < 0)
+                                die_must_be_on_off(nth_string(keywords, arg));
+
+                        if (arg == ARG_reorder_hdr) {
+                                flags.mask |= VLAN_FLAG_REORDER_HDR;
+                                flags.flags &= ~VLAN_FLAG_REORDER_HDR;
+                                if (param == PARM_on)
+                                        flags.flags |= VLAN_FLAG_REORDER_HDR;
+                        } else if (arg == ARG_gvrp) {
+                                flags.mask |= VLAN_FLAG_GVRP;
+                                flags.flags &= ~VLAN_FLAG_GVRP;
+                                if (param == PARM_on)
+                                        flags.flags |= VLAN_FLAG_GVRP;
+                        } else if (arg == ARG_mvrp) {
+                                flags.mask |= VLAN_FLAG_MVRP;
+                                flags.flags &= ~VLAN_FLAG_MVRP;
+                                if (param == PARM_on)
+                                        flags.flags |= VLAN_FLAG_MVRP;
+                        } else { /*if (arg == ARG_loose_binding) */
+                                flags.mask |= VLAN_FLAG_LOOSE_BINDING;
+                                flags.flags &= ~VLAN_FLAG_LOOSE_BINDING;
+                                if (param == PARM_on)
+                                        flags.flags |= VLAN_FLAG_LOOSE_BINDING;
+                        }
+                }
+                argv++;
+        }
+
+        if (flags.mask)
+                addattr_l(n, size, IFLA_VLAN_FLAGS, &flags, sizeof(flags));
+}
+
 #ifndef NLMSG_TAIL
 #define NLMSG_TAIL(nmsg) \
         ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
 #endif
 /* Return value becomes exitcode. It's okay to not return at all */
-static int do_change(char **argv, const unsigned rtm)
+static int do_add_or_delete(char **argv, const unsigned rtm)
 {
         static const char keywords[] ALIGN1 =
                 "link\0""name\0""type\0""dev\0";
@@ -312,15 +418,17 @@ static int do_change(char **argv, const unsigned rtm)
 
         while (*argv) {
                 arg = index_in_substrings(keywords, *argv);
+                if (arg == ARG_type) {
+                        NEXT_ARG();
+                        type_str = *argv++;
+                        break;
+                }
                 if (arg == ARG_link) {
                         NEXT_ARG();
                         link_str = *argv;
                 } else if (arg == ARG_name) {
                         NEXT_ARG();
                         name_str = *argv;
-                } else if (arg == ARG_type) {
-                        NEXT_ARG();
-                        type_str = *argv;
                 } else {
                         if (arg == ARG_dev) {
                                 if (dev_str)
@@ -339,6 +447,17 @@ static int do_change(char **argv, const unsigned rtm)
                 addattr_l(&req.n, sizeof(req), IFLA_LINKINFO, NULL, 0);
                 addattr_l(&req.n, sizeof(req), IFLA_INFO_KIND, type_str,
                                 strlen(type_str));
+
+                if (*argv) {
+                        struct rtattr *data = NLMSG_TAIL(&req.n);
+                        addattr_l(&req.n, sizeof(req), IFLA_INFO_DATA, NULL, 0);
+
+                        if (strcmp(type_str, "vlan") == 0)
+                                vlan_parse_opt(argv, &req.n, sizeof(req));
+
+                        data->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)data;
+                }
+
                 linkinfo->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)linkinfo;
         }
         if (rtm != RTM_NEWLINK) {
@@ -370,13 +489,13 @@ int FAST_FUNC do_iplink(char **argv)
         static const char keywords[] ALIGN1 =
                 "add\0""delete\0""set\0""show\0""lst\0""list\0";
         if (*argv) {
-                smalluint key = index_in_substrings(keywords, *argv);
-                if (key > 5) /* invalid argument */
-                        bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+                int key = index_in_substrings(keywords, *argv);
+                if (key < 0) /* invalid argument */
+                        invarg(*argv, applet_name);
                 argv++;
                 if (key <= 1) /* add/delete */
-                        return do_change(argv, key ? RTM_DELLINK : RTM_NEWLINK);
-                else if (key == 2) /* set */
+                        return do_add_or_delete(argv, key ? RTM_DELLINK : RTM_NEWLINK);
+                if (key == 2) /* set */
                         return do_set(argv);
         }
         /* show, lst, list */
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 241a6bf9d..8dbe6bd92 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -215,7 +215,7 @@ static int iprule_modify(int cmd, char **argv)
         while (*argv) {
                 key = index_in_substrings(keywords, *argv) + 1;
                 if (key == 0) /* no match found in keywords array, bail out. */
-                        bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+                        invarg(*argv, applet_name);
                 if (key == ARG_from) {
                         inet_prefix dst;
                         NEXT_ARG();
@@ -308,9 +308,9 @@ int FAST_FUNC do_iprule(char **argv)
         static const char ip_rule_commands[] ALIGN1 =
                 "add\0""delete\0""list\0""show\0";
         if (*argv) {
-                smalluint cmd = index_in_substrings(ip_rule_commands, *argv);
-                if (cmd > 3)
-                        bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+                int cmd = index_in_substrings(ip_rule_commands, *argv);
+                if (cmd < 0)
+                        invarg(*argv, applet_name);
                 argv++;
                 if (cmd < 2)
                         return iprule_modify((cmd == 0) ? RTM_NEWRULE : RTM_DELRULE, argv);
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 2b651b926..b54c3c53f 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -561,9 +561,9 @@ int FAST_FUNC do_iptunnel(char **argv)
         enum { ARG_add = 0, ARG_change, ARG_del, ARG_show, ARG_list, ARG_lst };
 
         if (*argv) {
-                smalluint key = index_in_substrings(keywords, *argv);
-                if (key > 5)
-                        bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+                int key = index_in_substrings(keywords, *argv);
+                if (key < 0)
+                        invarg(*argv, applet_name);
                 argv++;
                 if (key == ARG_add)
                         return do_add(SIOCADDTUNNEL, argv);
diff --git a/networking/nc.c b/networking/nc.c
index 126bec906..2f9e17466 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -261,7 +261,7 @@ int nc_main(int argc, char **argv)
                                         if (nread < 1) {
                                                 /* Close outgoing half-connection so they get EOF,
                                                  * but leave incoming alone so we can see response */
-                                                shutdown(cfd, 1);
+                                                shutdown(cfd, SHUT_WR);
                                                 FD_CLR(STDIN_FILENO, &readfds);
                                         }
                                         ofd = cfd;
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 00ba6f114..b9eff3da4 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -48,6 +48,12 @@
  * - TCP connects from wrong ip/ports (if peer ip:port is specified
  *   on the command line, but accept() says that it came from different addr)
  *   are closed, but we don't exit - we continue to listen/accept.
+ * Since bbox 1.22:
+ * - nc exits when _both_ stdin and network are closed.
+ *   This makes these two commands:
+ *    echo "Yes" | nc 127.0.0.1 1234
+ *    echo "no" | nc -lp 1234
+ *   exchange their data _and exit_ instead of being stuck.
  */
 
 /* done in nc.c: #include "libbb.h" */
@@ -134,8 +140,6 @@ struct globals {
 
         jmp_buf jbuf;                /* timer crud */
 
-        fd_set ding1;                /* for select loop */
-        fd_set ding2;
         char bigbuf_in[BIGSIZ];      /* data buffers */
         char bigbuf_net[BIGSIZ];
 };
@@ -147,8 +151,6 @@ struct globals {
 #define themaddr   (G.themaddr  )
 #define remend     (G.remend    )
 #define jbuf       (G.jbuf      )
-#define ding1      (G.ding1     )
-#define ding2      (G.ding2     )
 #define bigbuf_in  (G.bigbuf_in )
 #define bigbuf_net (G.bigbuf_net)
 #define o_verbose  (G.o_verbose )
@@ -590,26 +592,27 @@ static int readwrite(void)
         unsigned rzleft;
         unsigned rnleft;
         unsigned netretry;              /* net-read retry counter */
-        unsigned wretry;                /* net-write sanity counter */
-        unsigned wfirst;                /* one-shot flag to skip first net read */
+        unsigned fds_open;
 
         /* if you don't have all this FD_* macro hair in sys/types.h, you'll have to
          either find it or do your own bit-bashing: *ding1 |= (1 << fd), etc... */
-        FD_SET(netfd, &ding1);                /* global: the net is open */
+        fd_set ding1;                   /* for select loop */
+        fd_set ding2;
+        FD_ZERO(&ding1);
+        FD_SET(netfd, &ding1);
+        FD_SET(STDIN_FILENO, &ding1);
+        fds_open = 2;
+
         netretry = 2;
-        wfirst = 0;
         rzleft = rnleft = 0;
         if (o_interval)
                 sleep(o_interval);                /* pause *before* sending stuff, too */
 
-        errno = 0;                        /* clear from sleep, close, whatever */
         /* and now the big ol' select shoveling loop ... */
-        while (FD_ISSET(netfd, &ding1)) {        /* i.e. till the *net* closes! */
-                wretry = 8200;                        /* more than we'll ever hafta write */
-                if (wfirst) {                        /* any saved stdin buffer? */
-                        wfirst = 0;                        /* clear flag for the duration */
-                        goto shovel;                        /* and go handle it first */
-                }
+        /* nc 1.10 has "while (FD_ISSET(netfd)" here */
+        while (fds_open) {
+                unsigned wretry = 8200;               /* net-write sanity counter */
+
                 ding2 = ding1;                        /* FD_COPY ain't portable... */
         /* some systems, notably linux, crap into their select timers on return, so
          we create a expendable copy and give *that* to select.  */
@@ -629,13 +632,14 @@ static int readwrite(void)
         /* if we have a timeout AND stdin is closed AND we haven't heard anything
          from the net during that time, assume it's dead and close it too. */
                 if (rr == 0) {
-                        if (!FD_ISSET(STDIN_FILENO, &ding1))
+                        if (!FD_ISSET(STDIN_FILENO, &ding1)) {
                                 netretry--;                        /* we actually try a coupla times. */
-                        if (!netretry) {
-                                if (o_verbose > 1)                /* normally we don't care */
-                                        fprintf(stderr, "net timeout\n");
-                                close(netfd);
-                                return 0;                        /* not an error! */
+                                if (!netretry) {
+                                        if (o_verbose > 1)         /* normally we don't care */
+                                                fprintf(stderr, "net timeout\n");
+                                        /*close(netfd); - redundant, exit will do it */
+                                        return 0;                  /* not an error! */
+                                }
                         }
                 } /* select timeout */
         /* xxx: should we check the exception fds too?  The read fds seem to give
@@ -649,7 +653,8 @@ static int readwrite(void)
                                         /* nc 1.10 doesn't do this */
                                         bb_perror_msg("net read");
                                 }
-                                FD_CLR(netfd, &ding1);                /* net closed, we'll finish up... */
+                                FD_CLR(netfd, &ding1);                /* net closed */
+                                fds_open--;
                                 rzleft = 0;                        /* can't write anymore: broken pipe */
                         } else {
                                 rnleft = rr;
@@ -669,11 +674,12 @@ Debug("got %d from the net, errno %d", rr, errno);
         /* Considered making reads here smaller for UDP mode, but 8192-byte
          mobygrams are kinda fun and exercise the reassembler. */
                         if (rr <= 0) {                        /* at end, or fukt, or ... */
-                                FD_CLR(STDIN_FILENO, &ding1);                /* disable and close stdin */
-                                close(STDIN_FILENO);
-// Does it make sense to shutdown(net_fd, SHUT_WR)
-// to let other side know that we won't write anything anymore?
-// (and what about keeping compat if we do that?)
+                                FD_CLR(STDIN_FILENO, &ding1); /* disable stdin */
+                                /*close(STDIN_FILENO); - not really necessary */
+                                /* Let peer know we have no more data */
+                                /* nc 1.10 doesn't do this: */
+                                shutdown(netfd, SHUT_WR);
+                                fds_open--;
                         } else {
                                 rzleft = rr;
                                 zp = bigbuf_in;
@@ -684,24 +690,14 @@ Debug("got %d from the net, errno %d", rr, errno);
          Geez, why does this look an awful lot like the big loop in "rsh"? ...
          not sure if the order of this matters, but write net -> stdout first. */
 
-        /* sanity check.  Works because they're both unsigned... */
-                if ((rzleft > 8200) || (rnleft > 8200)) {
-                        holler_error("bogus buffers: %u, %u", rzleft, rnleft);
-                        rzleft = rnleft = 0;
-                }
-        /* net write retries sometimes happen on UDP connections */
-                if (!wretry) {                        /* is something hung? */
-                        holler_error("too many output retries");
-                        return 1;
-                }
                 if (rnleft) {
                         rr = write(STDOUT_FILENO, np, rnleft);
                         if (rr > 0) {
                                 if (o_ofile) /* log the stdout */
                                         oprint('<', (unsigned char *)np, rr);
-                                np += rr;                        /* fix up ptrs and whatnot */
-                                rnleft -= rr;                        /* will get sanity-checked above */
-                                wrote_out += rr;                /* global count */
+                                np += rr;
+                                rnleft -= rr;
+                                wrote_out += rr; /* global count */
                         }
 Debug("wrote %d to stdout, errno %d", rr, errno);
                 } /* rnleft */
@@ -716,20 +712,24 @@ Debug("wrote %d to stdout, errno %d", rr, errno);
                                         oprint('>', (unsigned char *)zp, rr);
                                 zp += rr;
                                 rzleft -= rr;
-                                wrote_net += rr;                /* global count */
+                                wrote_net += rr; /* global count */
                         }
 Debug("wrote %d to net, errno %d", rr, errno);
                 } /* rzleft */
                 if (o_interval) {                        /* cycle between slow lines, or ... */
                         sleep(o_interval);
-                        errno = 0;                        /* clear from sleep */
                         continue;                        /* ...with hairy select loop... */
                 }
-                if ((rzleft) || (rnleft)) {                /* shovel that shit till they ain't */
+                if (rzleft || rnleft) {                  /* shovel that shit till they ain't */
                         wretry--;                        /* none left, and get another load */
+        /* net write retries sometimes happen on UDP connections */
+                        if (!wretry) {                   /* is something hung? */
+                                holler_error("too many output retries");
+                                return 1;
+                        }
                         goto shovel;
                 }
-        } /* while ding1:netfd is open */
+        } /* while (fds_open) */
 
         /* XXX: maybe want a more graceful shutdown() here, or screw around with
          linger times??  I suspect that I don't need to since I'm always doing
@@ -876,9 +876,8 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
         }
 #endif
 
-        FD_SET(STDIN_FILENO, &ding1);                        /* stdin *is* initially open */
         if (proggie) {
-                close(0); /* won't need stdin */
+                close(STDIN_FILENO); /* won't need stdin */
                 option_mask32 &= ~OPT_o; /* -o with -e is meaningless! */
         }
 #if ENABLE_NC_EXTRA
diff --git a/networking/nslookup.c b/networking/nslookup.c
index f4fd407dd..dd4b1ffed 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -138,6 +138,9 @@ static void set_default_dns(const char *server)
 {
         len_and_sockaddr *lsa;
 
+        if (!server)
+                return;
+
         /* NB: this works even with, say, "[::1]:5353"! :) */
         lsa = xhost2sockaddr(server, 53);
 
@@ -181,9 +184,17 @@ int nslookup_main(int argc, char **argv)
         /* (but it also says "may be enabled in /etc/resolv.conf") */
         /*_res.options |= RES_USE_INET6;*/
 
-        if (argv[2])
-                set_default_dns(argv[2]);
+        set_default_dns(argv[2]);
 
         server_print();
+
+        /* getaddrinfo and friends are free to request a resolver
+         * reinitialization. Just in case, set_default_dns() again
+         * after getaddrinfo (in server_print). This reportedly helps
+         * with bug 675 "nslookup does not properly use second argument"
+         * at least on Debian Wheezy and Openwrt AA (eglibc based).
+         */
+        set_default_dns(argv[2]);
+
         return print_host(argv[1], "Name:");
 }
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 0f4319ef2..99817e83b 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -95,6 +95,7 @@
 #define RETRY_INTERVAL  5       /* on error, retry in N secs */
 #define RESPONSE_INTERVAL 15    /* wait for reply up to N secs */
 #define INITIAL_SAMPLES 4       /* how many samples do we want for init */
+#define BAD_DELAY_GROWTH 4      /* drop packet if its delay grew by more than this */
 
 /* Clock discipline parameters and constants */
 
@@ -227,8 +228,8 @@ typedef struct {
         uint8_t          lastpkt_status;
         uint8_t          lastpkt_stratum;
         uint8_t          reachable_bits;
-        /* when to send new query (if p_fd == -1)
-         * or when receive times out (if p_fd >= 0): */
+        /* when to send new query (if p_fd == -1)
+         * or when receive times out (if p_fd >= 0): */
         double           next_action_time;
         double           p_xmttime;
         double           lastpkt_recv_time;
@@ -804,22 +805,34 @@ send_query_to_peer(peer_t *p)
         p->p_xmt_msg.m_xmttime.fractionl = random();
         p->p_xmttime = gettime1900d();
 
+        /* Were doing it only if sendto worked, but
+         * loss of sync detection needs reachable_bits updated
+         * even if sending fails *locally*:
+         * "network is unreachable" because cable was pulled?
+         * We still need to declare "unsync" if this condition persists.
+         */
+        p->reachable_bits <<= 1;
+
         if (do_sendto(p->p_fd, /*from:*/ NULL, /*to:*/ &p->p_lsa->u.sa, /*addrlen:*/ p->p_lsa->len,
                         &p->p_xmt_msg, NTP_MSGSIZE_NOAUTH) == -1
         ) {
                 close(p->p_fd);
                 p->p_fd = -1;
+                /*
+                 * We know that we sent nothing.
+                 * We can retry *soon* without fearing
+                 * that we are flooding the peer.
+                 */
                 set_next(p, RETRY_INTERVAL);
                 return;
         }
 
-        p->reachable_bits <<= 1;
         set_next(p, RESPONSE_INTERVAL);
 }
 
 
 /* Note that there is no provision to prevent several run_scripts
- * to be done in quick succession. In fact, it happens rather often
+ * to be started in quick succession. In fact, it happens rather often
  * if initial syncronization results in a step.
  * You will see "step" and then "stratum" script runs, sometimes
  * as close as only 0.002 seconds apart.
@@ -830,6 +843,8 @@ static void run_script(const char *action, double offset)
         char *argv[3];
         char *env1, *env2, *env3, *env4;
 
+        G.last_script_run = G.cur_time;
+
         if (!G.script_name)
                 return;
 
@@ -866,8 +881,6 @@ static void run_script(const char *action, double offset)
         free(env2);
         free(env3);
         free(env4);
-
-        G.last_script_run = G.cur_time;
 }
 
 static NOINLINE void
@@ -1616,6 +1629,7 @@ recv_and_process_peer_pkt(peer_t *p)
         ssize_t     size;
         msg_t       msg;
         double      T1, T2, T3, T4;
+        double      dv;
         unsigned    interval;
         datapoint_t *datapoint;
         peer_t      *q;
@@ -1665,9 +1679,8 @@ recv_and_process_peer_pkt(peer_t *p)
 // TODO: stratum 0 responses may have commands in 32-bit m_refid field:
 // "DENY", "RSTR" - peer does not like us at all
 // "RATE" - peer is overloaded, reduce polling freq
-                interval = poll_interval(0);
-                bb_error_msg("reply from %s: peer is unsynced, next query in %us", p->p_dotted, interval);
-                goto set_next_and_ret;
+                bb_error_msg("reply from %s: peer is unsynced", p->p_dotted);
+                goto pick_normal_interval;
         }
 
 //      /* Verify valid root distance */
@@ -1700,21 +1713,31 @@ recv_and_process_peer_pkt(peer_t *p)
         T4 = G.cur_time;
 
         p->lastpkt_recv_time = T4;
-
         VERB5 bb_error_msg("%s->lastpkt_recv_time=%f", p->p_dotted, p->lastpkt_recv_time);
-        p->datapoint_idx = p->reachable_bits ? (p->datapoint_idx + 1) % NUM_DATAPOINTS : 0;
-        datapoint = &p->filter_datapoint[p->datapoint_idx];
-        datapoint->d_recv_time = T4;
-        datapoint->d_offset    = ((T2 - T1) + (T3 - T4)) / 2;
+
         /* The delay calculation is a special case. In cases where the
          * server and client clocks are running at different rates and
          * with very fast networks, the delay can appear negative. In
          * order to avoid violating the Principle of Least Astonishment,
          * the delay is clamped not less than the system precision.
          */
+        dv = p->lastpkt_delay;
         p->lastpkt_delay = (T4 - T1) - (T3 - T2);
         if (p->lastpkt_delay < G_precision_sec)
                 p->lastpkt_delay = G_precision_sec;
+        /*
+         * If this packet's delay is much bigger than the last one,
+         * it's better to just ignore it than use its much less precise value.
+         */
+        if (p->reachable_bits && p->lastpkt_delay > dv * BAD_DELAY_GROWTH) {
+                bb_error_msg("reply from %s: delay %f is too high, ignoring", p->p_dotted, p->lastpkt_delay);
+                goto pick_normal_interval;
+        }
+
+        p->datapoint_idx = p->reachable_bits ? (p->datapoint_idx + 1) % NUM_DATAPOINTS : 0;
+        datapoint = &p->filter_datapoint[p->datapoint_idx];
+        datapoint->d_recv_time = T4;
+        datapoint->d_offset    = ((T2 - T1) + (T3 - T4)) / 2;
         datapoint->d_dispersion = LOG2D(msg.m_precision_exp) + G_precision_sec;
         if (!p->reachable_bits) {
                 /* 1st datapoint ever - replicate offset in every element */
@@ -1811,6 +1834,7 @@ recv_and_process_peer_pkt(peer_t *p)
         }
 
         /* Decide when to send new query for this peer */
+ pick_normal_interval:
         interval = poll_interval(0);
 
  set_next_and_ret:
@@ -2159,12 +2183,14 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
  did_poll:
                 gettime1900d(); /* sets G.cur_time */
                 if (nfds <= 0) {
-                        if (G.script_name && G.cur_time - G.last_script_run > 11*60) {
+                        if (!bb_got_signal /* poll wasn't interrupted by a signal */
+                         && G.cur_time - G.last_script_run > 11*60
+                        ) {
                                 /* Useful for updating battery-backed RTC and such */
                                 run_script("periodic", G.last_update_offset);
                                 gettime1900d(); /* sets G.cur_time */
                         }
-                        continue;
+                        goto check_unsync;
                 }
 
                 /* Process any received packets */
@@ -2195,6 +2221,21 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
                                 gettime1900d(); /* sets G.cur_time */
                         }
                 }
+
+ check_unsync:
+                if (G.ntp_peers && G.stratum != MAXSTRAT) {
+                        for (item = G.ntp_peers; item != NULL; item = item->link) {
+                                peer_t *p = (peer_t *) item->data;
+                                if (p->reachable_bits)
+                                        goto have_reachable_peer;
+                        }
+                        /* No peer responded for last 8 packets, panic */
+                        G.polladj_count = 0;
+                        G.poll_exp = MINPOLL;
+                        G.stratum = MAXSTRAT;
+                        run_script("unsync", 0.0);
+ have_reachable_peer: ;
+                }
         } /* while (!bb_got_signal) */
 
         remove_pidfile(CONFIG_PID_FILE_PATH "/ntpd.pid");
diff --git a/networking/ping.c b/networking/ping.c
index e919b3a09..f27e2143d 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -149,8 +149,33 @@ enum {
         MAX_DUP_CHK = (8 * 128),
         MAXWAIT = 10,
         PINGINTERVAL = 1, /* 1 second */
+        pingsock = 0,
 };
 
+static void
+#if ENABLE_PING6
+create_icmp_socket(len_and_sockaddr *lsa)
+#else
+create_icmp_socket(void)
+#define create_icmp_socket(lsa) create_icmp_socket()
+#endif
+{
+        int sock;
+#if ENABLE_PING6
+        if (lsa->u.sa.sa_family == AF_INET6)
+                sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+        else
+#endif
+                sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
+        if (sock < 0) {
+                if (errno == EPERM)
+                        bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+                bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
+        }
+
+        xmove_fd(sock, pingsock);
+}
+
 #if !ENABLE_FEATURE_FANCY_PING
 
 /* Simple version */
@@ -171,12 +196,10 @@ static void noresp(int ign UNUSED_PARAM)
 static void ping4(len_and_sockaddr *lsa)
 {
         struct icmp *pkt;
-        int pingsock, c;
-
-        pingsock = create_icmp_socket();
+        int c;
 
         pkt = (struct icmp *) G.packet;
-        memset(pkt, 0, sizeof(G.packet));
+        /*memset(pkt, 0, sizeof(G.packet)); already is */
         pkt->icmp_type = ICMP_ECHO;
         pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, sizeof(G.packet));
 
@@ -184,11 +207,15 @@ static void ping4(len_and_sockaddr *lsa)
 
         /* listen for replies */
         while (1) {
+#if 0
                 struct sockaddr_in from;
                 socklen_t fromlen = sizeof(from);
 
                 c = recvfrom(pingsock, G.packet, sizeof(G.packet), 0,
                                 (struct sockaddr *) &from, &fromlen);
+#else
+                c = recv(pingsock, G.packet, sizeof(G.packet), 0);
+#endif
                 if (c < 0) {
                         if (errno != EINTR)
                                 bb_perror_msg("recvfrom");
@@ -210,13 +237,11 @@ static void ping4(len_and_sockaddr *lsa)
 static void ping6(len_and_sockaddr *lsa)
 {
         struct icmp6_hdr *pkt;
-        int pingsock, c;
+        int c;
         int sockopt;
 
-        pingsock = create_icmp6_socket();
-
         pkt = (struct icmp6_hdr *) G.packet;
-        memset(pkt, 0, sizeof(G.packet));
+        /*memset(pkt, 0, sizeof(G.packet)); already is */
         pkt->icmp6_type = ICMP6_ECHO_REQUEST;
 
         sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
@@ -226,18 +251,21 @@ static void ping6(len_and_sockaddr *lsa)
 
         /* listen for replies */
         while (1) {
+#if 0
                 struct sockaddr_in6 from;
                 socklen_t fromlen = sizeof(from);
 
                 c = recvfrom(pingsock, G.packet, sizeof(G.packet), 0,
                                 (struct sockaddr *) &from, &fromlen);
+#else
+                c = recv(pingsock, G.packet, sizeof(G.packet), 0);
+#endif
                 if (c < 0) {
                         if (errno != EINTR)
                                 bb_perror_msg("recvfrom");
                         continue;
                 }
-                if (c >= ICMP_MINLEN) {                 /* icmp6_hdr */
-                        pkt = (struct icmp6_hdr *) G.packet;
+                if (c >= ICMP_MINLEN) { /* icmp6_hdr */
                         if (pkt->icmp6_type == ICMP6_ECHO_REPLY)
                                 break;
                 }
@@ -285,6 +313,7 @@ static int common_ping_main(sa_family_t af, char **argv)
         signal(SIGALRM, noresp);
         alarm(5); /* give the host 5000ms to respond */
 
+        create_icmp_socket(lsa);
 #if ENABLE_PING6
         if (lsa->u.sa.sa_family == AF_INET6)
                 ping6(lsa);
@@ -318,7 +347,6 @@ enum {
 
 
 struct globals {
-        int pingsock;
         int if_index;
         char *str_I;
         len_and_sockaddr *source_lsa;
@@ -344,10 +372,9 @@ struct globals {
                 struct sockaddr_in6 sin6;
 #endif
         } pingaddr;
-        char rcvd_tbl[MAX_DUP_CHK / 8];
+        unsigned char rcvd_tbl[MAX_DUP_CHK / 8];
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
-#define pingsock     (G.pingsock    )
 #define if_index     (G.if_index    )
 #define source_lsa   (G.source_lsa  )
 #define str_I        (G.str_I       )
@@ -369,20 +396,17 @@ void BUG_ping_globals_too_big(void);
 #define INIT_G() do { \
         if (sizeof(G) > COMMON_BUFSIZE) \
                 BUG_ping_globals_too_big(); \
-        pingsock = -1; \
         datalen = DEFDATALEN; \
         timeout = MAXWAIT; \
         tmin = UINT_MAX; \
 } while (0)
 
 
-#define A(bit)          rcvd_tbl[(bit)>>3]      /* identify byte in array */
-#define B(bit)          (1 << ((bit) & 0x07))   /* identify bit in byte */
-#define SET(bit)        (A(bit) |= B(bit))
-#define CLR(bit)        (A(bit) &= (~B(bit)))
-#define TST(bit)        (A(bit) & B(bit))
-
-/**************************************************************************/
+#define BYTE(bit)       rcvd_tbl[(bit)>>3]
+#define MASK(bit)       (1 << ((bit) & 7))
+#define SET(bit)        (BYTE(bit) |= MASK(bit))
+#define CLR(bit)        (BYTE(bit) &= (~MASK(bit)))
+#define TST(bit)        (BYTE(bit) & MASK(bit))
 
 static void print_stats_and_exit(int junk) NORETURN;
 static void print_stats_and_exit(int junk UNUSED_PARAM)
@@ -552,11 +576,10 @@ static void unpack_tail(int sz, uint32_t *tp,
                 const char *from_str,
                 uint16_t recv_seq, int ttl)
 {
+        unsigned char *b, m;
         const char *dupmsg = " (DUP!)";
         unsigned triptime = triptime; /* for gcc */
 
-        ++G.nreceived;
-
         if (tp) {
                 /* (int32_t) cast is for hypothetical 64-bit unsigned */
                 /* (doesn't hurt 32-bit real-world anyway) */
@@ -568,11 +591,15 @@ static void unpack_tail(int sz, uint32_t *tp,
                         tmax = triptime;
         }
 
-        if (TST(recv_seq % MAX_DUP_CHK)) {
+        b = &BYTE(recv_seq % MAX_DUP_CHK);
+        m = MASK(recv_seq % MAX_DUP_CHK);
+        /*if TST(recv_seq % MAX_DUP_CHK):*/
+        if (*b & m) {
                 ++G.nrepeats;
-                --G.nreceived;
         } else {
-                SET(recv_seq % MAX_DUP_CHK);
+                /*SET(recv_seq % MAX_DUP_CHK):*/
+                *b |= m;
+                ++G.nreceived;
                 dupmsg += 7;
         }
 
@@ -655,7 +682,6 @@ static void ping4(len_and_sockaddr *lsa)
 {
         int sockopt;
 
-        pingsock = create_icmp_socket();
         pingaddr.sin = lsa->u.sin;
         if (source_lsa) {
                 if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF,
@@ -663,8 +689,6 @@ static void ping4(len_and_sockaddr *lsa)
                         bb_error_msg_and_die("can't set multicast source interface");
                 xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
         }
-        if (str_I)
-                setsockopt_bindtodevice(pingsock, str_I);
 
         /* enable broadcast pings */
         setsockopt_broadcast(pingsock);
@@ -713,13 +737,9 @@ static void ping6(len_and_sockaddr *lsa)
         struct iovec iov;
         char control_buf[CMSG_SPACE(36)];
 
-        pingsock = create_icmp6_socket();
         pingaddr.sin6 = lsa->u.sin6;
-        /* untested whether "-I addr" really works for IPv6: */
         if (source_lsa)
                 xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
-        if (str_I)
-                setsockopt_bindtodevice(pingsock, str_I);
 
 #ifdef ICMP6_FILTER
         {
@@ -806,6 +826,11 @@ static void ping(len_and_sockaddr *lsa)
         }
         printf(": %d data bytes\n", datalen);
 
+        create_icmp_socket(lsa);
+        /* untested whether "-I addr" really works for IPv6: */
+        if (str_I)
+                setsockopt_bindtodevice(pingsock, str_I);
+
         G.sizeof_rcv_packet = datalen + MAXIPLEN + MAXICMPLEN;
         G.rcv_packet = xzalloc(G.sizeof_rcv_packet);
 #if ENABLE_PING6
diff --git a/networking/tc.c b/networking/tc.c
index f968707a9..b9a4d16cc 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -65,7 +65,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 struct BUG_G_too_big {
-        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
 };
 #define filter_ifindex (G.filter_ifindex)
 #define filter_qdisc (G.filter_qdisc)
diff --git a/networking/telnet.c b/networking/telnet.c
index 58a691916..a25579773 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -125,12 +125,10 @@ static void subneg(byte c);
 
 static void iac_flush(void)
 {
-        write(netfd, G.iacbuf, G.iaclen);
+        full_write(netfd, G.iacbuf, G.iaclen);
         G.iaclen = 0;
 }
 
-#define write_str(fd, str) write(fd, str, sizeof(str) - 1)
-
 static void doexit(int ev) NORETURN;
 static void doexit(int ev)
 {
@@ -145,7 +143,7 @@ static void con_escape(void)
         if (bb_got_signal) /* came from line mode... go raw */
                 rawmode();
 
-        write_str(1, "\r\nConsole escape. Commands are:\r\n\n"
+        full_write1_str("\r\nConsole escape. Commands are:\r\n\n"
                         " l     go to line mode\r\n"
                         " c     go to character mode\r\n"
                         " z     suspend telnet\r\n"
@@ -176,7 +174,7 @@ static void con_escape(void)
                 doexit(EXIT_SUCCESS);
         }
 
-        write_str(1, "continuing...\r\n");
+        full_write1_str("continuing...\r\n");
 
         if (bb_got_signal)
                 cookmode();
@@ -383,10 +381,11 @@ static void put_iac_naws(byte c, int x, int y)
         put_iac(SB);
         put_iac(c);
 
-        put_iac((x >> 8) & 0xff);
-        put_iac(x & 0xff);
-        put_iac((y >> 8) & 0xff);
-        put_iac(y & 0xff);
+        /* "... & 0xff" implicitly done below */
+        put_iac(x >> 8);
+        put_iac(x);
+        put_iac(y >> 8);
+        put_iac(y);
 
         put_iac(IAC);
         put_iac(SE);
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index ae0e0d306..11b7b1f06 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -371,20 +371,23 @@ static NOINLINE void attach_option(
                 char *buffer,
                 int length)
 {
-        struct option_set *existing, *new, **curr;
-        char *allocated = NULL;
+        struct option_set *existing;
+        char *allocated;
 
-        existing = udhcp_find_option(*opt_list, optflag->code);
-        if (!existing) {
-                log2("Attaching option %02x to list", optflag->code);
-                allocated = allocate_tempopt_if_needed(optflag, buffer, &length);
+        allocated = allocate_tempopt_if_needed(optflag, buffer, &length);
 #if ENABLE_FEATURE_UDHCP_RFC3397
-                if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_DNS_STRING) {
-                        /* reuse buffer and length for RFC1035-formatted string */
-                        allocated = buffer = (char *)dname_enc(NULL, 0, buffer, &length);
-                }
+        if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_DNS_STRING) {
+                /* reuse buffer and length for RFC1035-formatted string */
+                allocated = buffer = (char *)dname_enc(NULL, 0, buffer, &length);
+        }
 #endif
+
+        existing = udhcp_find_option(*opt_list, optflag->code);
+        if (!existing) {
+                struct option_set *new, **curr;
+
                 /* make a new option */
+                log2("Attaching option %02x to list", optflag->code);
                 new = xmalloc(sizeof(*new));
                 new->data = xmalloc(length + OPT_DATA);
                 new->data[OPT_CODE] = optflag->code;
@@ -405,14 +408,7 @@ static NOINLINE void attach_option(
 
                 /* add it to an existing option */
                 log2("Attaching option %02x to existing member of list", optflag->code);
-                allocated = allocate_tempopt_if_needed(optflag, buffer, &length);
                 old_len = existing->data[OPT_LEN];
-#if ENABLE_FEATURE_UDHCP_RFC3397
-                if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_DNS_STRING) {
-                        /* reuse buffer and length for RFC1035-formatted string */
-                        allocated = buffer = (char *)dname_enc(existing->data + OPT_DATA, old_len, buffer, &length);
-                }
-#endif
                 if (old_len + length < 255) {
                         /* actually 255 is ok too, but adding a space can overlow it */
 
@@ -424,7 +420,7 @@ static NOINLINE void attach_option(
                                 existing->data[OPT_DATA + old_len] = ' ';
                                 old_len++;
                         }
-                        memcpy(existing->data + OPT_DATA + old_len, buffer, length);
+                        memcpy(existing->data + OPT_DATA + old_len, (allocated ? allocated : buffer), length);
                         existing->data[OPT_LEN] = old_len + length;
                 } /* else, ignore the data, we could put this in a second option in the future */
         } /* else, ignore the new data */
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 086228871..53d8a5e08 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1135,34 +1135,35 @@ static void client_background(void)
 //usage:# define IF_UDHCP_VERBOSE(...)
 //usage:#endif
 //usage:#define udhcpc_trivial_usage
-//usage:       "[-fbnq"IF_UDHCP_VERBOSE("v")"oCRB] [-i IFACE] [-r IP] [-s PROG] [-p PIDFILE]\n"
-//usage:       "        [-V VENDOR] [-x OPT:VAL]... [-O OPT]..." IF_FEATURE_UDHCP_PORT(" [-P N]")
+//usage:       "[-fbq"IF_UDHCP_VERBOSE("v")IF_FEATURE_UDHCPC_ARPING("a")"RB] [-t N] [-T SEC] [-A SEC/-n]\n"
+//usage:       "        [-i IFACE]"IF_FEATURE_UDHCP_PORT(" [-P PORT]")" [-s PROG] [-p PIDFILE]\n"
+//usage:       "        [-oC] [-r IP] [-V VENDOR] [-F NAME] [-x OPT:VAL]... [-O OPT]..."
 //usage:#define udhcpc_full_usage "\n"
 //usage:        IF_LONG_OPTS(
 //usage:     "\n        -i,--interface IFACE    Interface to use (default eth0)"
-//usage:     "\n        -p,--pidfile FILE       Create pidfile"
+//usage:        IF_FEATURE_UDHCP_PORT(
+//usage:     "\n        -P,--client-port PORT   Use PORT (default 68)"
+//usage:        )
 //usage:     "\n        -s,--script PROG        Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n        -p,--pidfile FILE       Create pidfile"
 //usage:     "\n        -B,--broadcast          Request broadcast replies"
-//usage:     "\n        -t,--retries N          Send up to N discover packets"
-//usage:     "\n        -T,--timeout N          Pause between packets (default 3 seconds)"
-//usage:     "\n        -A,--tryagain N         Wait N seconds after failure (default 20)"
+//usage:     "\n        -t,--retries N          Send up to N discover packets (default 3)"
+//usage:     "\n        -T,--timeout SEC        Pause between packets (default 3)"
+//usage:     "\n        -A,--tryagain SEC       Wait if lease is not obtained (default 20)"
+//usage:     "\n        -n,--now                Exit if lease is not obtained"
+//usage:     "\n        -q,--quit               Exit after obtaining lease"
+//usage:     "\n        -R,--release            Release IP on exit"
 //usage:     "\n        -f,--foreground         Run in foreground"
 //usage:        USE_FOR_MMU(
 //usage:     "\n        -b,--background         Background if lease is not obtained"
 //usage:        )
-//usage:     "\n        -n,--now                Exit if lease is not obtained"
-//usage:     "\n        -q,--quit               Exit after obtaining lease"
-//usage:     "\n        -R,--release            Release IP on exit"
 //usage:     "\n        -S,--syslog             Log to syslog too"
-//usage:        IF_FEATURE_UDHCP_PORT(
-//usage:     "\n        -P,--client-port N      Use port N (default 68)"
-//usage:        )
 //usage:        IF_FEATURE_UDHCPC_ARPING(
 //usage:     "\n        -a,--arping             Use arping to validate offered address"
 //usage:        )
-//usage:     "\n        -O,--request-option OPT Request option OPT from server (cumulative)"
-//usage:     "\n        -o,--no-default-options Don't request any options (unless -O is given)"
 //usage:     "\n        -r,--request IP         Request this IP address"
+//usage:     "\n        -o,--no-default-options Don't request any options (unless -O is given)"
+//usage:     "\n        -O,--request-option OPT Request option OPT from server (cumulative)"
 //usage:     "\n        -x OPT:VAL              Include option OPT in sent packets (cumulative)"
 //usage:     "\n                                Examples of string, numeric, and hex byte opts:"
 //usage:     "\n                                -x hostname:bbox - option 12"
@@ -1177,29 +1178,29 @@ static void client_background(void)
 //usage:        )
 //usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -i IFACE        Interface to use (default eth0)"
-//usage:     "\n        -p FILE         Create pidfile"
+//usage:        IF_FEATURE_UDHCP_PORT(
+//usage:     "\n        -P PORT         Use PORT (default 68)"
+//usage:        )
 //usage:     "\n        -s PROG         Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n        -p FILE         Create pidfile"
 //usage:     "\n        -B              Request broadcast replies"
-//usage:     "\n        -t N            Send up to N discover packets"
-//usage:     "\n        -T N            Pause between packets (default 3 seconds)"
-//usage:     "\n        -A N            Wait N seconds (default 20) after failure"
+//usage:     "\n        -t N            Send up to N discover packets (default 3)"
+//usage:     "\n        -T SEC          Pause between packets (default 3)"
+//usage:     "\n        -A SEC          Wait if lease is not obtained (default 20)"
+//usage:     "\n        -n              Exit if lease is not obtained"
+//usage:     "\n        -q              Exit after obtaining lease"
+//usage:     "\n        -R              Release IP on exit"
 //usage:     "\n        -f              Run in foreground"
 //usage:        USE_FOR_MMU(
 //usage:     "\n        -b              Background if lease is not obtained"
 //usage:        )
-//usage:     "\n        -n              Exit if lease is not obtained"
-//usage:     "\n        -q              Exit after obtaining lease"
-//usage:     "\n        -R              Release IP on exit"
 //usage:     "\n        -S              Log to syslog too"
-//usage:        IF_FEATURE_UDHCP_PORT(
-//usage:     "\n        -P N            Use port N (default 68)"
-//usage:        )
 //usage:        IF_FEATURE_UDHCPC_ARPING(
 //usage:     "\n        -a              Use arping to validate offered address"
 //usage:        )
-//usage:     "\n        -O OPT          Request option OPT from server (cumulative)"
-//usage:     "\n        -o              Don't request any options (unless -O is given)"
 //usage:     "\n        -r IP           Request this IP address"
+//usage:     "\n        -o              Don't request any options (unless -O is given)"
+//usage:     "\n        -O OPT          Request option OPT from server (cumulative)"
 //usage:     "\n        -x OPT:VAL      Include option OPT in sent packets (cumulative)"
 //usage:     "\n                        Examples of string, numeric, and hex byte opts:"
 //usage:     "\n                        -x hostname:bbox - option 12"
diff --git a/networking/wget.c b/networking/wget.c
index 4eafebe40..5dac2b500 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -62,14 +62,14 @@ struct globals {
         const char *curfile;      /* Name of current file being transferred */
         bb_progress_t pmt;
 #endif
-        char *dir_prefix;
+        char *dir_prefix;
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
-        char *post_data;
-        char *extra_headers;
+        char *post_data;
+        char *extra_headers;
 #endif
-        char *fname_out;        /* where to direct output (-O) */
-        const char *proxy_flag; /* Use proxies if env vars are set */
-        const char *user_agent; /* "User-Agent" header field */
+        char *fname_out;        /* where to direct output (-O) */
+        const char *proxy_flag; /* Use proxies if env vars are set */
+        const char *user_agent; /* "User-Agent" header field */
 #if ENABLE_FEATURE_WGET_TIMEOUT
         unsigned timeout_seconds;
 #endif
@@ -86,7 +86,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*ptr_to_globals)
 #define INIT_G() do { \
-        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
         IF_FEATURE_WGET_TIMEOUT(G.timeout_seconds = 900;) \
 } while (0)
 
@@ -328,8 +328,16 @@ static char *gethdr(FILE *fp)
                 return NULL;
 
         /* convert the header name to lower case */
-        for (s = G.wget_buf; isalnum(*s) || *s == '-' || *s == '.'; ++s) {
-                /* tolower for "A-Z", no-op for "0-9a-z-." */
+        for (s = G.wget_buf; isalnum(*s) || *s == '-' || *s == '.' || *s == '_'; ++s) {
+                /*
+                 * No-op for 20-3f and 60-7f. "0-9a-z-." are in these ranges.
+                 * 40-5f range ("@A-Z[\]^_") maps to 60-7f.
+                 * "A-Z" maps to "a-z".
+                 * "@[\]" can't occur in header names.
+                 * "^_" maps to "~,DEL" (which is wrong).
+                 * "^" was never seen yet, "_" was seen from web.archive.org
+                 * (x-archive-orig-x_commoncrawl_Signature: HEXSTRING).
+                 */
                 *s |= 0x20;
         }
 
diff --git a/procps/lsof.c b/procps/lsof.c
index 7e0ffa4e5..b0156a538 100644
--- a/procps/lsof.c
+++ b/procps/lsof.c
@@ -61,9 +61,12 @@ int lsof_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 d_fd = opendir(name);
                 if (d_fd) {
                         while ((entry = readdir(d_fd)) != NULL) {
-                                if (entry->d_type == DT_LNK) {
-                                        safe_strncpy(name + baseofs, entry->d_name, 10);
-                                        fdlink = xmalloc_readlink(name);
+                                /* Skip entries '.' and '..' (and any hidden file) */
+                                if (entry->d_name[0] == '.')
+                                        continue;
+
+                                safe_strncpy(name + baseofs, entry->d_name, 10);
+                                if ((fdlink = xmalloc_readlink(name)) != NULL) {
                                         printf("%d\t%s\t%s\n", proc->pid, proc->exe, fdlink);
                                         free(fdlink);
                                 }
diff --git a/procps/pstree.c b/procps/pstree.c
index 8ba30795d..ed1a41289 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -34,8 +34,15 @@
 
 struct child;
 
+#ifdef ENABLE_FEATURE_SHOW_THREADS
+/* For threads, we add {...} around the comm, so we need two extra bytes */
+# define COMM_DISP_LEN (COMM_LEN + 2)
+#else
+# define COMM_DISP_LEN COMM_LEN
+#endif
+
 typedef struct proc {
-        char comm[COMM_LEN + 1];
+        char comm[COMM_DISP_LEN + 1];
 //      char flags; - unused, delete?
         pid_t pid;
         uid_t uid;
@@ -341,8 +348,8 @@ static void dump_by_user(PROC *current, uid_t uid)
 #if ENABLE_FEATURE_SHOW_THREADS
 static void handle_thread(const char *comm, pid_t pid, pid_t ppid, uid_t uid)
 {
-        char threadname[COMM_LEN + 2];
-        sprintf(threadname, "{%.*s}", COMM_LEN - 2, comm);
+        char threadname[COMM_DISP_LEN + 1];
+        sprintf(threadname, "{%.*s}", (int)sizeof(threadname) - 3, comm);
         add_proc(threadname, pid, ppid, uid/*, 1*/);
 }
 #endif
diff --git a/runit/svlogd.c b/runit/svlogd.c
index b7a0a6e71..8b8a6d858 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -745,11 +745,6 @@ static NOINLINE unsigned logdir_open(struct logdir *ld, const char *fn)
                                 ld->inst = new;
                                 break;
                         case 's': {
-                                static const struct suffix_mult km_suffixes[] = {
-                                        { "k", 1024 },
-                                        { "m", 1024*1024 },
-                                        { "", 0 }
-                                };
                                 ld->sizemax = xatou_sfx(&s[1], km_suffixes);
                                 break;
                         }
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index bd2d70e19..303df0be7 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -474,7 +474,11 @@ int conf_write(const char *name)
                                                 fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
                                                 /* bbox */
                                                 fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                                                fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                                                fprintf(out_h, "#ifdef MAKE_SUID\n");
+                                                fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name);
+                                                fprintf(out_h, "#else\n");
+                                                fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name);
+                                                fprintf(out_h, "#endif\n");
                                                 fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                                         }
                                         break;
@@ -506,7 +510,11 @@ int conf_write(const char *name)
                                         fputs("\"\n", out_h);
                                         /* bbox */
                                         fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                                        fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                                        fprintf(out_h, "#ifdef MAKE_SUID\n");
+                                        fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name);
+                                        fprintf(out_h, "#else\n");
+                                        fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name);
+                                        fprintf(out_h, "#endif\n");
                                         fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                                 }
                                 break;
@@ -518,7 +526,11 @@ int conf_write(const char *name)
                                                 fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);
                                                 /* bbox */
                                                 fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                                                fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                                                fprintf(out_h, "#ifdef MAKE_SUID\n");
+                                                fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name);
+                                                fprintf(out_h, "#else\n");
+                                                fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name);
+                                                fprintf(out_h, "#endif\n");
                                                 fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                                         }
                                         break;
@@ -532,7 +544,11 @@ int conf_write(const char *name)
                                         fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);
                                         /* bbox */
                                         fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                                        fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                                        fprintf(out_h, "#ifdef MAKE_SUID\n");
+                                        fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name);
+                                        fprintf(out_h, "#else\n");
+                                        fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name);
+                                        fprintf(out_h, "#endif\n");
                                         fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                                 }
                                 break;
diff --git a/shell/ash.c b/shell/ash.c
index 8f59dccda..6e6fc6a71 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9501,6 +9501,9 @@ static int getoptscmd(int, char **) FAST_FUNC;
 #if !ENABLE_FEATURE_SH_EXTRA_QUIET
 static int helpcmd(int, char **) FAST_FUNC;
 #endif
+#if MAX_HISTORY
+static int historycmd(int, char **) FAST_FUNC;
+#endif
 #if ENABLE_SH_MATH_SUPPORT
 static int letcmd(int, char **) FAST_FUNC;
 #endif
@@ -9574,6 +9577,9 @@ static const struct builtincmd builtintab[] = {
 #if !ENABLE_FEATURE_SH_EXTRA_QUIET
         { BUILTIN_NOSPEC        "help"    , helpcmd    },
 #endif
+#if MAX_HISTORY
+        { BUILTIN_NOSPEC        "history" , historycmd },
+#endif
 #if JOBS
         { BUILTIN_REGULAR       "jobs"    , jobscmd    },
         { BUILTIN_REGULAR       "kill"    , killcmd    },
@@ -10155,7 +10161,12 @@ preadfd(void)
                  * _during_ shell execution, not only if it was set when
                  * shell was started. Therefore, re-check LANG every time:
                  */
-                reinit_unicode(lookupvar("LANG"));
+                {
+                        const char *s = lookupvar("LC_ALL");
+                        if (!s) s = lookupvar("LC_CTYPE");
+                        if (!s) s = lookupvar("LANG");
+                        reinit_unicode(s);
+                }
                 nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ, timeout);
                 if (nr == 0) {
                         /* Ctrl+C pressed */
@@ -13163,6 +13174,15 @@ helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 }
 #endif /* FEATURE_SH_EXTRA_QUIET */
 
+#if MAX_HISTORY
+static int FAST_FUNC
+historycmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+        show_history(line_input_state);
+        return EXIT_SUCCESS;
+}
+#endif
+
 /*
  * The export and readonly commands.
  */
diff --git a/shell/hush.c b/shell/hush.c
index b23325725..912ecf15f 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -850,6 +850,9 @@ static int builtin_jobs(char **argv) FAST_FUNC;
 #if ENABLE_HUSH_HELP
 static int builtin_help(char **argv) FAST_FUNC;
 #endif
+#if MAX_HISTORY && ENABLE_FEATURE_EDITING
+static int builtin_history(char **argv) FAST_FUNC;
+#endif
 #if ENABLE_HUSH_LOCAL
 static int builtin_local(char **argv) FAST_FUNC;
 #endif
@@ -919,6 +922,9 @@ static const struct built_in_command bltins1[] = {
 #if ENABLE_HUSH_HELP
         BLTIN("help"     , builtin_help    , NULL),
 #endif
+#if MAX_HISTORY && ENABLE_FEATURE_EDITING
+        BLTIN("history"  , builtin_history , "Show command history"),
+#endif
 #if ENABLE_HUSH_JOB
         BLTIN("jobs"     , builtin_jobs    , "List jobs"),
 #endif
@@ -1383,7 +1389,7 @@ static void restore_G_args(save_arg_t *sv, char **argv)
  * are set to '' (ignore) are NOT reset to defaults. We do the same.
  *
  * Problem: the above approach makes it unwieldy to catch signals while
- * we are in read builtin, of while we read commands from stdin:
+ * we are in read builtin, or while we read commands from stdin:
  * masked signals are not visible!
  *
  * New implementation
@@ -2038,7 +2044,10 @@ static void get_user_input(struct in_str *i)
                  * _during_ shell execution, not only if it was set when
                  * shell was started. Therefore, re-check LANG every time:
                  */
-                reinit_unicode(get_local_var_value("LANG"));
+                const char *s = get_local_var_value("LC_ALL");
+                if (!s) s = get_local_var_value("LC_CTYPE");
+                if (!s) s = get_local_var_value("LANG");
+                reinit_unicode(s);
 
                 G.flag_SIGINT = 0;
                 /* buglet: SIGINT will not make new prompt to appear _at once_,
@@ -7354,7 +7363,7 @@ static int run_list(struct pipe *pi)
                                  * and we should not execute CMD */
                                 debug_printf_exec("skipped cmd because of || or &&\n");
                                 last_followup = pi->followup;
-                                continue;
+                                goto dont_check_jobs_but_continue;
                         }
                 }
                 last_followup = pi->followup;
@@ -7493,8 +7502,10 @@ static int run_list(struct pipe *pi)
                                                         G.flag_break_continue = 0;
                                                 /* else: e.g. "continue 2" should *break* once, *then* continue */
                                         } /* else: "while... do... { we are here (innermost list is not a loop!) };...done" */
-                                        if (G.depth_break_continue != 0 || fbc == BC_BREAK)
-                                                goto check_jobs_and_break;
+                                        if (G.depth_break_continue != 0 || fbc == BC_BREAK) {
+                                                checkjobs(NULL);
+                                                break;
+                                        }
                                         /* "continue": simulate end of loop */
                                         rword = RES_DONE;
                                         continue;
@@ -7502,7 +7513,6 @@ static int run_list(struct pipe *pi)
 #endif
 #if ENABLE_HUSH_FUNCTIONS
                                 if (G.flag_return_in_progress == 1) {
-                                        /* same as "goto check_jobs_and_break" */
                                         checkjobs(NULL);
                                         break;
                                 }
@@ -7544,6 +7554,9 @@ static int run_list(struct pipe *pi)
                 if (rword == RES_IF || rword == RES_ELIF)
                         cond_code = rcode;
 #endif
+ check_jobs_and_continue:
+                checkjobs(NULL);
+ dont_check_jobs_but_continue: ;
 #if ENABLE_HUSH_LOOPS
                 /* Beware of "while false; true; do ..."! */
                 if (pi->next
@@ -7555,22 +7568,17 @@ static int run_list(struct pipe *pi)
                                         /* "while false; do...done" - exitcode 0 */
                                         G.last_exitcode = rcode = EXIT_SUCCESS;
                                         debug_printf_exec(": while expr is false: breaking (exitcode:EXIT_SUCCESS)\n");
-                                        goto check_jobs_and_break;
+                                        break;
                                 }
                         }
                         if (rword == RES_UNTIL) {
                                 if (!rcode) {
                                         debug_printf_exec(": until expr is true: breaking\n");
- check_jobs_and_break:
-                                        checkjobs(NULL);
                                         break;
                                 }
                         }
                 }
 #endif
-
- check_jobs_and_continue:
-                checkjobs(NULL);
         } /* for (pi) */
 
 #if ENABLE_HUSH_JOB
@@ -8628,6 +8636,14 @@ static int FAST_FUNC builtin_help(char **argv UNUSED_PARAM)
 }
 #endif
 
+#if MAX_HISTORY && ENABLE_FEATURE_EDITING
+static int FAST_FUNC builtin_history(char **argv UNUSED_PARAM)
+{
+        show_history(G.line_input_state);
+        return EXIT_SUCCESS;
+}
+#endif
+
 #if ENABLE_HUSH_JOB
 static int FAST_FUNC builtin_jobs(char **argv UNUSED_PARAM)
 {
diff --git a/shell/hush_test/hush-misc/while4.right b/shell/hush_test/hush-misc/while4.right
new file mode 100644
index 000000000..7b24a35ff
--- /dev/null
+++ b/shell/hush_test/hush-misc/while4.right
@@ -0,0 +1 @@
+Ok:0
diff --git a/shell/hush_test/hush-misc/while4.tests b/shell/hush_test/hush-misc/while4.tests
new file mode 100755
index 000000000..ba80e603a
--- /dev/null
+++ b/shell/hush_test/hush-misc/while4.tests
@@ -0,0 +1,6 @@
+false
+while false && echo Not reached; do
+    echo BUG
+    break
+done
+echo Ok:$?
diff --git a/shell/shell_common.c b/shell/shell_common.c
index f7503cac5..84e0604ed 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -39,7 +39,7 @@ int FAST_FUNC is_well_formed_var_name(const char *s, char terminator)
 
 /* read builtin */
 
-/* Needs to be interruptible: shell mush handle traps and shell-special signals
+/* Needs to be interruptible: shell must handle traps and shell-special signals
  * while inside read. To implement this, be sure to not loop on EINTR
  * and return errno == EINTR reliably.
  */
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index 993956904..2b6415f47 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -52,7 +52,7 @@ struct globals {
 static void error_exit(const char *str) NORETURN;
 static void error_exit(const char *str)
 {
-        //release all acquired resources
+        /* Release all acquired resources */
         shmdt(shbuf);
         bb_perror_msg_and_die(str);
 }
@@ -66,11 +66,10 @@ static void sem_up(int semid)
                 error_exit("semop[SMrup]");
 }
 
-static void interrupted(int sig UNUSED_PARAM)
+static void interrupted(int sig)
 {
-        signal(SIGINT, SIG_IGN);
         shmdt(shbuf);
-        exit(EXIT_SUCCESS);
+        kill_myself_with_sig(sig);
 }
 
 int logread_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -96,7 +95,7 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
         if (log_semid == -1)
                 error_exit("can't get access to semaphores for syslogd buffer");
 
-        signal(SIGINT, interrupted);
+        bb_signals(BB_FATAL_SIGS, interrupted);
 
         /* Suppose atomic memory read */
         /* Max possible value for tail is shbuf->size - 1 */
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 4f45b4f7f..a6a4ff25c 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -58,6 +58,9 @@
 #define SYSLOG_NAMES_CONST
 #include <syslog.h>
 */
+#ifndef _PATH_LOG
+#define _PATH_LOG       "/dev/log"
+#endif
 
 #include <sys/un.h>
 #include <sys/uio.h>
@@ -824,8 +827,8 @@ static NOINLINE int create_socket(void)
 
         /* Unlink old /dev/log or object it points to. */
         /* (if it exists, bind will fail) */
-        strcpy(sunx.sun_path, "/dev/log");
-        dev_log_name = xmalloc_follow_symlinks("/dev/log");
+        strcpy(sunx.sun_path, _PATH_LOG);
+        dev_log_name = xmalloc_follow_symlinks(_PATH_LOG);
         if (dev_log_name) {
                 safe_strncpy(sunx.sun_path, dev_log_name, sizeof(sunx.sun_path));
                 free(dev_log_name);
@@ -834,7 +837,7 @@ static NOINLINE int create_socket(void)
 
         sock_fd = xsocket(AF_UNIX, SOCK_DGRAM, 0);
         xbind(sock_fd, (struct sockaddr *) &sunx, sizeof(sunx));
-        chmod("/dev/log", 0666);
+        chmod(_PATH_LOG, 0666);
 
         return sock_fd;
 }
@@ -905,7 +908,7 @@ static void do_syslogd(void)
                 sz = read(sock_fd, recvbuf, MAX_READ - 1);
                 if (sz < 0) {
                         if (!bb_got_signal)
-                                bb_perror_msg("read from /dev/log");
+                                bb_perror_msg("read from %s", _PATH_LOG);
                         break;
                 }
 
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index dad49c3f5..6af6072b8 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -24,7 +24,7 @@ testing "awk if operator < "   "awk 'BEGIN{if(2 < 13) print \"foo\"}'" "foo\n" "
 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"
+testing "awk bitwise op"  "awk '{ print or(4294967295,1) }'" "4294967295\n" "" "\n"
 
 # we were testing for a non-empty body when deciding if a function was
 # defined or not. The testcase below caused:
@@ -44,9 +44,37 @@ testing "awk handles empty function f(arg){}" \
         "L1\n\nL2\n\n" \
         "" ""
 
+prg='
+function outer_fun() {
+  return 1
+}
+END {
+  i=1
+  print "L" i "\n"
+  i += outer_fun()
+  print "L" i "\n"
+}'
+testing "awk properly handles function from other scope" \
+        "awk '$prg'" \
+        "L1\n\nL2\n\n" \
+        "" ""
+
+prg='
+END {
+  i=1
+  print "L" i "\n"
+  i + trigger_error_fun()
+  print "L" i "\n"
+}'
+testing "awk properly handles undefined function" \
+        "awk '$prg' 2>&1" \
+        "L1\n\nawk: cmd. line:5: Call to undefined function\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"
+testing "awk hex const 1" "awk '{ print or(0xffffffff,1) }'" "4294967295\n" "" "\n"
+testing "awk hex const 2" "awk '{ print or(0x80000000,1) }'" "2147483649\n" "" "\n"
 testing "awk oct const"   "awk '{ print or(01234,1) }'"      "669\n"         "" "\n"
 SKIP=
 
@@ -241,6 +269,11 @@ testing "awk FS assignment" "awk '{FS=\":\"; print \$1}'" \
         "" \
         "a:b c:d\ne:f g:h"
 
+testing "awk large integer" \
+        "awk 'BEGIN{n=(2^31)-1; print n, int(n), n%1, ++n, int(n), n%1}'" \
+        "2147483647 2147483647 0 2147483648 2147483648 0\n" \
+        "" ""
+
 # testing "description" "command" "result" "infile" "stdin"
 
 exit $FAILCOUNT
diff --git a/testsuite/grep.tests b/testsuite/grep.tests
index 4781f2284..64d99a905 100755
--- a/testsuite/grep.tests
+++ b/testsuite/grep.tests
@@ -82,6 +82,20 @@ testing "grep -F handles -i" "grep -F -i foo input ; echo \$?" \
 testing "grep can read regexps from stdin" "grep -f - input ; echo \$?" \
         "two\nthree\n0\n" "tw\ntwo\nthree\n" "tw.\nthr\n"
 
+# -x (whole line match)
+testing "grep -x (full match)" "grep -x foo input ; echo \$?" \
+        "foo\n0\n" "foo\n" ""
+testing "grep -x (partial match 1)" "grep -x foo input ; echo \$?" \
+        "1\n" "foo bar\n" ""
+testing "grep -x (partial match 2)" "grep -x foo input ; echo \$?" \
+        "1\n" "bar foo\n" ""
+testing "grep -x -F (full match)" "grep -x -F foo input ; echo \$?" \
+        "foo\n0\n" "foo\n" ""
+testing "grep -x -F (partial match 1)" "grep -x -F foo input ; echo \$?" \
+        "1\n" "foo bar\n" ""
+testing "grep -x -F (partial match 2)" "grep -x -F foo input ; echo \$?" \
+        "1\n" "bar foo\n" ""
+
 optional FEATURE_GREP_EGREP_ALIAS
 testing "grep -E supports extended regexps" "grep -E fo+" "foo\n" "" \
         "b\ar\nfoo\nbaz"
@@ -127,6 +141,12 @@ testing "grep -Fw doesn't stop on 1st mismatch" \
         "foop foo\n" \
         ""
 
+testing "grep -w doesn't stop on 1st mismatch" \
+        "grep -w foo input" \
+        "foop foo\n" \
+        "foop foo\n" \
+        ""
+
 # testing "test name" "commands" "expected result" "file input" "stdin"
 #   file input will be file called "input"
 #   test can create a file "actual" instead of writing to stdout
diff --git a/testsuite/sed.tests b/testsuite/sed.tests
index 468565f47..2af1e4c97 100755
--- a/testsuite/sed.tests
+++ b/testsuite/sed.tests
@@ -310,6 +310,27 @@ testing "sed zero chars match/replace logic must not falsely trigger here 2" \
         "sed 's/ *$/_/g'" \
         "qwerty_\n" "" "qwerty\n"
 
+testing "sed /\$_in_regex/ should not match newlines, only end-of-line" \
+        "sed ': testcont; /\\\\$/{ =; N; b testcont }'" \
+        "\
+this is a regular line
+2
+line with \\
+continuation
+more regular lines
+5
+line with \\
+continuation
+" \
+        "" "\
+this is a regular line
+line with \\
+continuation
+more regular lines
+line with \\
+continuation
+"
+
 # testing "description" "commands" "result" "infile" "stdin"
 
 exit $FAILCOUNT
diff --git a/util-linux/Config.src b/util-linux/Config.src
index 6c1b928da..5a8b0063b 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -699,250 +699,6 @@ config FEATURE_MTAB_SUPPORT
           About the only reason to use this is if you've removed /proc from
           your kernel.
 
-config VOLUMEID
-        bool #No description makes it a hidden option
-        default n
-
-menu "Filesystem/Volume identification"
-        depends on VOLUMEID
-
-config FEATURE_VOLUMEID_EXT
-        bool "Ext filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_BTRFS
-        bool "btrfs filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_REISERFS
-        bool "Reiser filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_FAT
-        bool "fat filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_EXFAT
-        bool "exFAT filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          exFAT (extended FAT) is a proprietary file system designed especially
-          for flash drives. It has many features from NTFS, but with less
-          overhead. exFAT is used on most SDXC cards for consumer electronics.
-
-config FEATURE_VOLUMEID_HFS
-        bool "hfs filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_JFS
-        bool "jfs filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-### config FEATURE_VOLUMEID_UFS
-###     bool "ufs filesystem"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-config FEATURE_VOLUMEID_XFS
-        bool "xfs filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_NILFS
-        bool "nilfs filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_NTFS
-        bool "ntfs filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_ISO9660
-        bool "iso9660 filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_UDF
-        bool "udf filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_LUKS
-        bool "luks filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_LINUXSWAP
-        bool "linux swap filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-### config FEATURE_VOLUMEID_LVM
-###     bool "lvm"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-config FEATURE_VOLUMEID_CRAMFS
-        bool "cramfs filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-### config FEATURE_VOLUMEID_HPFS
-###     bool "hpfs filesystem"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-config FEATURE_VOLUMEID_ROMFS
-        bool "romfs filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-config FEATURE_VOLUMEID_SQUASHFS
-        bool "SquashFS filesystem"
-        default y
-        depends on VOLUMEID && FEATURE_BLKID_TYPE
-        help
-          Squashfs is a compressed read-only filesystem for Linux. Squashfs is
-          intended for general read-only filesystem use and in constrained block
-          device/memory systems (e.g. embedded systems) where low overhead is
-          needed.
-
-config FEATURE_VOLUMEID_SYSV
-        bool "sysv filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-### config FEATURE_VOLUMEID_MINIX
-###     bool "minix filesystem"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-### These only detect partition tables - not used (yet?)
-### config FEATURE_VOLUMEID_MAC
-###     bool "mac filesystem"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-###
-### config FEATURE_VOLUMEID_MSDOS
-###     bool "msdos filesystem"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-config FEATURE_VOLUMEID_OCFS2
-        bool "ocfs2 filesystem"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-### config FEATURE_VOLUMEID_HIGHPOINTRAID
-###     bool "highpoint raid"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-### config FEATURE_VOLUMEID_ISWRAID
-###     bool "intel raid"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-### config FEATURE_VOLUMEID_LSIRAID
-###     bool "lsi raid"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-### config FEATURE_VOLUMEID_VIARAID
-###     bool "via raid"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-### config FEATURE_VOLUMEID_SILICONRAID
-###     bool "silicon raid"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-### config FEATURE_VOLUMEID_NVIDIARAID
-###     bool "nvidia raid"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-### config FEATURE_VOLUMEID_PROMISERAID
-###     bool "promise raid"
-###     default y
-###     depends on VOLUMEID
-###     help
-###       TODO
-
-config FEATURE_VOLUMEID_LINUXRAID
-        bool "linuxraid"
-        default y
-        depends on VOLUMEID
-        help
-          TODO
-
-endmenu
+source util-linux/volume_id/Config.in
 
 endmenu
diff --git a/util-linux/fdisk_gpt.c b/util-linux/fdisk_gpt.c
index d43d9c709..f45f68af0 100644
--- a/util-linux/fdisk_gpt.c
+++ b/util-linux/fdisk_gpt.c
@@ -95,7 +95,7 @@ gpt_list_table(int xtra UNUSED_PARAM)
 
         numstr6[5] = '\0';
 
-        smart_ulltoa5(total_number_of_sectors, numstr6, " KMGTPEZY");
+        smart_ulltoa5(total_number_of_sectors * sector_size, numstr6, " KMGTPEZY");
         printf("Disk %s: %llu sectors, %s\n", disk_device,
                 (unsigned long long)total_number_of_sectors,
                 numstr6);
@@ -112,7 +112,7 @@ gpt_list_table(int xtra UNUSED_PARAM)
         for (i = 0; i < n_parts; i++) {
                 gpt_partition *p = gpt_part(i);
                 if (p->lba_start) {
-                        smart_ulltoa5(1 + SWAP_LE64(p->lba_end) - SWAP_LE64(p->lba_start),
+                        smart_ulltoa5((1 + SWAP_LE64(p->lba_end) - SWAP_LE64(p->lba_start)) * sector_size,
                                 numstr6, " KMGTPEZY");
                         printf("%4u %15llu %15llu %11s   %04x  ",
                                 i + 1,
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 4d998b916..ac7e24ff8 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -66,13 +66,6 @@ static const char add_first[] ALIGN1 = "\"%07.7_Ax\n\"";
 
 static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v" IF_FEATURE_HEXDUMP_REVERSE("R");
 
-static const struct suffix_mult suffixes[] = {
-        { "b", 512 },
-        { "k", 1024 },
-        { "m", 1024*1024 },
-        { "", 0 }
-};
-
 int hexdump_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int hexdump_main(int argc, char **argv)
 {
@@ -120,7 +113,7 @@ int hexdump_main(int argc, char **argv)
                                 optarg,
                                 /*base:*/ 0,
                                 /*lo:*/ 0, /*hi:*/ OFF_T_MAX,
-                                suffixes
+                                bkm_suffixes
                         );
                 } /* else */
                 if (ch == 'v') {
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index c69763335..d450b5a78 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -10,12 +10,12 @@
 //usage:#define losetup_trivial_usage
 //usage:       "[-r] [-o OFS] {-f|LOOPDEV} FILE - associate loop devices\n"
 //usage:       "        losetup -d LOOPDEV - disassociate\n"
-//usage:       "        losetup -a - show status of  all\n"
-//usage:       "        losetup -f - show next available"
+//usage:       "        losetup -a - show status\n"
+//usage:       "        losetup -f - show next free loop device"
 //usage:#define losetup_full_usage "\n\n"
 //usage:       "        -o OFS  Start OFS bytes into FILE"
 //usage:     "\n        -r      Read-only"
-//usage:     "\n        -f      Show/find first free loop device"
+//usage:     "\n        -f      Show/use next free loop device"
 //usage:
 //usage:#define losetup_notes_usage
 //usage:       "One argument (losetup /dev/loop1) will display the current association\n"
@@ -27,6 +27,10 @@
 
 #include "libbb.h"
 
+/* 1048575 is a max possible minor number in Linux circa 2010 */
+/* for now use something less extreme */
+#define MAX_LOOP_NUM 1023
+
 int losetup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int losetup_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -59,7 +63,7 @@ int losetup_main(int argc UNUSED_PARAM, char **argv)
         }
 
         /* -d LOOPDEV */
-        if (opt == OPT_d) {
+        if (opt == OPT_d && argv[0]) {
                 if (del_loop(argv[0]))
                         bb_simple_perror_msg_and_die(argv[0]);
                 return EXIT_SUCCESS;
@@ -68,15 +72,14 @@ int losetup_main(int argc UNUSED_PARAM, char **argv)
         /* -a */
         if (opt == OPT_a) {
                 int n;
-                for (n = 0; n < 10; n++) {
+                for (n = 0; n < MAX_LOOP_NUM; n++) {
                         char *s;
 
                         sprintf(dev, LOOP_FORMAT, n);
                         s = query_loop(dev);
                         if (s) {
                                 printf("%s: %s\n", dev, s);
-                                if (ENABLE_FEATURE_CLEAN_UP)
-                                        free(s);
+                                free(s);
                         }
                 }
                 return EXIT_SUCCESS;
@@ -88,11 +91,13 @@ int losetup_main(int argc UNUSED_PARAM, char **argv)
                 int n = 0;
 
                 do {
-                        sprintf(dev, LOOP_FORMAT, n);
+                        if (n > MAX_LOOP_NUM)
+                                bb_error_msg_and_die("no free loop devices");
+                        sprintf(dev, LOOP_FORMAT, n++);
                         s = query_loop(dev);
-                        if (s && ENABLE_FEATURE_CLEAN_UP)
-                                free(s);
+                        free(s);
                 } while (s);
+                /* now: dev is next free "/dev/loopN" */
                 if ((opt == OPT_f) && !argv[0]) {
                         puts(dev);
                         return EXIT_SUCCESS;
@@ -104,18 +109,18 @@ int losetup_main(int argc UNUSED_PARAM, char **argv)
                 unsigned long long offset = 0;
                 char *d = dev;
 
-                if (opt == OPT_o)
+                if (opt & OPT_o)
                         offset = xatoull(opt_o);
-                if (opt != OPT_f)
-                        d = *(argv++);
+                if (!(opt & OPT_f))
+                        d = *argv++;
 
                 if (argv[0]) {
-                        if (set_loop(&d, argv[0], offset, (opt / OPT_r)) < 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;
+        bb_show_usage(); /* does not return */
+        /*return EXIT_FAILURE;*/
 }
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 1d741367e..e80b58f2e 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -295,8 +295,8 @@ struct globals {
 /* Prevent infinite loops in /sys symlinks */
 #define MAX_SYSFS_DEPTH 3
 
-/* We use additional 64+ bytes in make_device() */
-#define SCRATCH_SIZE 80
+/* We use additional bytes in make_device() */
+#define SCRATCH_SIZE 128
 
 #if ENABLE_FEATURE_MDEV_CONF
 
@@ -541,7 +541,7 @@ static char *build_alias(char *alias, const char *device_name)
 
 /* mknod in /dev based on a path like "/sys/block/hda/hda1"
  * NB1: path parameter needs to have SCRATCH_SIZE scratch bytes
- * after NUL, but we promise to not mangle (IOW: to restore if needed)
+ * after NUL, but we promise to not mangle (IOW: to restore NUL if needed)
  * path string.
  * NB2: "mdev -s" may call us many times, do not leak memory/fds!
  *
@@ -551,6 +551,7 @@ static char *build_alias(char *alias, const char *device_name)
 static void make_device(char *device_name, char *path, int operation)
 {
         int major, minor, type, len;
+        char *path_end = path + strlen(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
@@ -559,17 +560,15 @@ static void make_device(char *device_name, char *path, int operation)
          */
         major = -1;
         if (operation == OP_add) {
-                char *dev_maj_min = path + strlen(path);
-
-                strcpy(dev_maj_min, "/dev");
-                len = open_read_close(path, dev_maj_min + 1, 64);
-                *dev_maj_min = '\0';
+                strcpy(path_end, "/dev");
+                len = open_read_close(path, path_end + 1, SCRATCH_SIZE - 1);
+                *path_end = '\0';
                 if (len < 1) {
                         if (!ENABLE_FEATURE_MDEV_EXEC)
                                 return;
                         /* no "dev" file, but we can still run scripts
                          * based on device name */
-                } else if (sscanf(++dev_maj_min, "%u:%u", &major, &minor) == 2) {
+                } else if (sscanf(path_end + 1, "%u:%u", &major, &minor) == 2) {
                         dbg1("dev %u,%u", major, minor);
                 } else {
                         major = -1;
@@ -577,9 +576,33 @@ static void make_device(char *device_name, char *path, int operation)
         }
         /* else: for delete, -1 still deletes the node, but < -1 suppresses that */
 
-        /* Determine device name, type, major and minor */
-        if (!device_name)
-                device_name = (char*) bb_basename(path);
+        /* Determine device name */
+        if (!device_name) {
+                /*
+                 * There was no $DEVNAME envvar (for example, mdev -s never has).
+                 * But it is very useful: it contains the *path*, not only basename,
+                 * Thankfully, uevent file has it.
+                 * Example of .../sound/card0/controlC0/uevent file on Linux-3.7.7:
+                 * MAJOR=116
+                 * MINOR=7
+                 * DEVNAME=snd/controlC0
+                 */
+                strcpy(path_end, "/uevent");
+                len = open_read_close(path, path_end + 1, SCRATCH_SIZE - 1);
+                if (len < 0)
+                        len = 0;
+                *path_end = '\0';
+                path_end[1 + len] = '\0';
+                device_name = strstr(path_end + 1, "\nDEVNAME=");
+                if (device_name) {
+                        device_name += sizeof("\nDEVNAME=")-1;
+                        strchrnul(device_name, '\n')[0] = '\0';
+                } else {
+                        /* Fall back to just basename */
+                        device_name = (char*) bb_basename(path);
+                }
+        }
+        /* Determine device type */
         /*
          * http://kernel.org/doc/pending/hotplug.txt says that only
          * "/sys/block/..." is for block devices. "/sys/bus" etc is not.
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 54867ec36..afad4ab8f 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -95,6 +95,20 @@ static int do_em_all(void)
                         if (applet_name[5] != 'n'
                          || hasmntopt(m, MNTOPT_NOAUTO) == NULL
                         ) {
+#if ENABLE_FEATURE_SWAPON_PRI
+                                char *p;
+                                g_flags = 0; /* each swap space might have different flags */
+                                p = strstr(m->mnt_opts, "pri=");
+                                if (p) {
+                                        /* Max allowed 32767 (==SWAP_FLAG_PRIO_MASK) */
+                                        int swap_prio = MIN(bb_strtoull(p + 4 , NULL, 10), SWAP_FLAG_PRIO_MASK);
+                                        /* We want to allow "NNNN,foo", thus errno == EINVAL is allowed too */
+                                        if (errno != ERANGE) {
+                                                g_flags = SWAP_FLAG_PREFER |
+                                                        (swap_prio << SWAP_FLAG_PRIO_SHIFT);
+                                        }
+                                }
+#endif
                                 err += swap_enable_disable(m->mnt_fsname);
                         }
                 }
diff --git a/util-linux/volume_id/Config.src b/util-linux/volume_id/Config.src
new file mode 100644
index 000000000..ac208c9cc
--- /dev/null
+++ b/util-linux/volume_id/Config.src
@@ -0,0 +1,15 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+config VOLUMEID
+        bool #No description makes it a hidden option
+        default n
+
+menu "Filesystem/Volume identification"
+        depends on VOLUMEID
+
+INSERT
+
+endmenu
diff --git a/util-linux/volume_id/Kbuild.src b/util-linux/volume_id/Kbuild.src
index 759fdaae5..6b4fb7470 100644
--- a/util-linux/volume_id/Kbuild.src
+++ b/util-linux/volume_id/Kbuild.src
@@ -7,41 +7,3 @@
 lib-y:=
 
 INSERT
-
-lib-$(CONFIG_BLKID)                             += get_devname.o
-lib-$(CONFIG_FINDFS)                            += get_devname.o
-lib-$(CONFIG_FEATURE_MOUNT_LABEL)               += get_devname.o
-
-lib-$(CONFIG_VOLUMEID)                          += volume_id.o util.o
-lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS)            += btrfs.o
-lib-$(CONFIG_FEATURE_VOLUMEID_EXT)              += ext.o
-lib-$(CONFIG_FEATURE_VOLUMEID_FAT)              += fat.o
-lib-$(CONFIG_FEATURE_VOLUMEID_HFS)              += hfs.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID)    += highpoint.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID)          += isw_raid.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID)          += lsi_raid.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID)          += via_raid.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID)      += silicon_raid.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID)       += nvidia_raid.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID)      += promise_raid.o
-lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660)          += iso9660.o
-lib-$(CONFIG_FEATURE_VOLUMEID_JFS)              += jfs.o
-lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID)        += linux_raid.o
-lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP)        += linux_swap.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_LVM)              += lvm.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_MAC)              += mac.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS)            += msdos.o
-lib-$(CONFIG_FEATURE_VOLUMEID_NILFS)            += nilfs.o
-lib-$(CONFIG_FEATURE_VOLUMEID_NTFS)             += ntfs.o
-lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT)            += exfat.o
-lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS)         += reiserfs.o
-lib-$(CONFIG_FEATURE_VOLUMEID_UDF)              += udf.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_UFS)              += ufs.o
-lib-$(CONFIG_FEATURE_VOLUMEID_XFS)              += xfs.o
-lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS)           += cramfs.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS)             += hpfs.o
-lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS)            += romfs.o
-lib-$(CONFIG_FEATURE_VOLUMEID_SYSV)             += sysv.o
-### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX)            += minix.o
-lib-$(CONFIG_FEATURE_VOLUMEID_LUKS)             += luks.o
-lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2)            += ocfs2.o
diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c
index ee71d2e00..e4dddf26d 100644
--- a/util-linux/volume_id/btrfs.c
+++ b/util-linux/volume_id/btrfs.c
@@ -19,6 +19,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o
+
+//config:
+//config:config FEATURE_VOLUMEID_BTRFS
+//config:       bool "btrfs filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 #define BTRFS_UUID_SIZE 16
diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c
index 28e997043..aeb7f20ac 100644
--- a/util-linux/volume_id/cramfs.c
+++ b/util-linux/volume_id/cramfs.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o
+
+//config:
+//config:config FEATURE_VOLUMEID_CRAMFS
+//config:       bool "cramfs filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct cramfs_super {
diff --git a/util-linux/volume_id/exfat.c b/util-linux/volume_id/exfat.c
index a38a8916d..c3aa36804 100644
--- a/util-linux/volume_id/exfat.c
+++ b/util-linux/volume_id/exfat.c
@@ -18,6 +18,19 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o
+
+//config:
+//config:config FEATURE_VOLUMEID_EXFAT
+//config:       bool "exFAT filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         exFAT (extended FAT) is a proprietary file system designed especially
+//config:         for flash drives. It has many features from NTFS, but with less
+//config:         overhead. exFAT is used on most SDXC cards for consumer electronics.
+//config:
+
 #include "volume_id_internal.h"
 
 #define EXFAT_SB_OFFSET         0
diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index 97451067f..df39d9342 100644
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o
+
+//config:
+//config:config FEATURE_VOLUMEID_EXT
+//config:       bool "Ext filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 #include "bb_e2fs_defs.h"
 
diff --git a/util-linux/volume_id/f2fs.c b/util-linux/volume_id/f2fs.c
new file mode 100644
index 000000000..bf0b66278
--- /dev/null
+++ b/util-linux/volume_id/f2fs.c
@@ -0,0 +1,95 @@
+/*
+ * volume_id - reads filesystem label and uuid
+ *
+ * Copyright (C) 2012 S-G Bergh <sgb@systemasis.org>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o
+
+//config:
+//config:config FEATURE_VOLUMEID_F2FS
+//config:       bool "f2fs filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         F2FS (aka Flash-Friendly File System) is a log-structured file system,
+//config:         which is adapted to newer forms of storage. F2FS also remedies some
+//config:         known issues of the older log structured file systems, such as high
+//config:         cleaning overhead.
+//config:
+
+#include "volume_id_internal.h"
+
+#define F2FS_MAGIC              0xF2F52010      // F2FS Magic Number
+#define F2FS_UUID_SIZE          16
+#define F2FS_LABEL_SIZE         512
+#define F2FS_LABEL_BYTES        1024
+#define F2FS_SB1_OFFSET         0x400           // offset for 1:st super block
+/*
+#define F2FS_SB2_OFFSET         0x1400          // offset for 2:nd super block
+*/
+
+struct f2fs_super_block {       // According to version 1.1
+/* 0x00 */      uint32_t        magic;                  // Magic Number
+/* 0x04 */      uint16_t        major_ver;              // Major Version
+/* 0x06 */      uint16_t        minor_ver;              // Minor Version
+/* 0x08 */      uint32_t        log_sectorsize;         // log2 sector size in bytes
+/* 0x0C */      uint32_t        log_sectors_per_block;  // log2 # of sectors per block
+/* 0x10 */      uint32_t        log_blocksize;          // log2 block size in bytes
+/* 0x14 */      uint32_t        log_blocks_per_seg;     // log2 # of blocks per segment
+/* 0x18 */      uint32_t        segs_per_sec;           // # of segments per section
+/* 0x1C */      uint32_t        secs_per_zone;          // # of sections per zone
+/* 0x20 */      uint32_t        checksum_offset;        // checksum offset inside super block
+/* 0x24 */      uint64_t        block_count;            // total # of user blocks
+/* 0x2C */      uint32_t        section_count;          // total # of sections
+/* 0x30 */      uint32_t        segment_count;          // total # of segments
+/* 0x34 */      uint32_t        segment_count_ckpt;     // # of segments for checkpoint
+/* 0x38 */      uint32_t        segment_count_sit;      // # of segments for SIT
+/* 0x3C */      uint32_t        segment_count_nat;      // # of segments for NAT
+/* 0x40 */      uint32_t        segment_count_ssa;      // # of segments for SSA
+/* 0x44 */      uint32_t        segment_count_main;     // # of segments for main area
+/* 0x48 */      uint32_t        segment0_blkaddr;       // start block address of segment 0
+/* 0x4C */      uint32_t        cp_blkaddr;             // start block address of checkpoint
+/* 0x50 */      uint32_t        sit_blkaddr;            // start block address of SIT
+/* 0x54 */      uint32_t        nat_blkaddr;            // start block address of NAT
+/* 0x58 */      uint32_t        ssa_blkaddr;            // start block address of SSA
+/* 0x5C */      uint32_t        main_blkaddr;           // start block address of main area
+/* 0x60 */      uint32_t        root_ino;               // root inode number
+/* 0x64 */      uint32_t        node_ino;               // node inode number
+/* 0x68 */      uint32_t        meta_ino;               // meta inode number
+/* 0x6C */      uint8_t         uuid[F2FS_UUID_SIZE];   // 128-bit uuid for volume
+/* 0x7C */      uint16_t        volume_name[F2FS_LABEL_SIZE];   // volume name
+// /* 0x47C */  uint32_t        extension_count;        // # of extensions below
+// /* 0x480 */  uint8_t         extension_list[64][8];  // extension array
+} PACKED;
+
+
+int FAST_FUNC volume_id_probe_f2fs(struct volume_id *id /*,uint64_t off*/)
+{
+        struct f2fs_super_block *sb;
+
+        // Go for primary super block (ignore second sb)
+        dbg("f2fs: probing at offset 0x%x", F2FS_SB1_OFFSET);
+        sb = volume_id_get_buffer(id, F2FS_SB1_OFFSET, sizeof(*sb));
+
+        if (!sb)
+                return -1;
+
+        if (sb->magic != cpu_to_le32(F2FS_MAGIC))
+                return -1;
+
+        IF_FEATURE_BLKID_TYPE(id->type = "f2fs");
+
+        // For version 1.0 we don't know sb structure and can't set label/uuid
+        if (sb->major_ver == cpu_to_le16(1) && sb->minor_ver == cpu_to_le16(0))
+                return 0;
+
+        volume_id_set_label_unicode16(id, (uint8_t *)sb->volume_name,
+                                      LE, MIN(F2FS_LABEL_BYTES, VOLUME_ID_LABEL_SIZE));
+
+        volume_id_set_uuid(id, sb->uuid, UUID_DCE);
+
+        return 0;
+}
diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c
index 904fbb201..476d500a6 100644
--- a/util-linux/volume_id/fat.c
+++ b/util-linux/volume_id/fat.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o
+
+//config:
+//config:config FEATURE_VOLUMEID_FAT
+//config:       bool "fat filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 /* linux/msdos_fs.h says: */
diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index 665cb9b6e..0c6bdfddf 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -7,6 +7,11 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//kbuild:lib-$(CONFIG_BLKID) += get_devname.o
+//kbuild:lib-$(CONFIG_FINDFS) += get_devname.o
+//kbuild:lib-$(CONFIG_FEATURE_MOUNT_LABEL) += get_devname.o
+
 #include <sys/mount.h> /* BLKGETSIZE64 */
 #if !defined(BLKGETSIZE64)
 # define BLKGETSIZE64 _IOR(0x12,114,size_t)
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index 3d9704d12..8d34aaf68 100644
--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o
+
+//config:
+//config:config FEATURE_VOLUMEID_HFS
+//config:       bool "hfs filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct hfs_finder_info{
diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c
index 1d7693a9c..3848de453 100644
--- a/util-linux/volume_id/iso9660.c
+++ b/util-linux/volume_id/iso9660.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o
+
+//config:
+//config:config FEATURE_VOLUMEID_ISO9660
+//config:       bool "iso9660 filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 #define ISO_SUPERBLOCK_OFFSET           0x8000
diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c
index 5333af2c3..a6eaff45b 100644
--- a/util-linux/volume_id/jfs.c
+++ b/util-linux/volume_id/jfs.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o
+
+//config:
+//config:config FEATURE_VOLUMEID_JFS
+//config:       bool "jfs filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct jfs_super_block {
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index 209eaabe9..f20823a6e 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o
+
+//config:
+//config:config FEATURE_VOLUMEID_LINUXRAID
+//config:       bool "linuxraid"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct mdp_super_block {
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index 1ee534ab0..39470d48c 100644
--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o
+
+//config:
+//config:config FEATURE_VOLUMEID_LINUXSWAP
+//config:       bool "linux swap filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct swap_header_v1_2 {
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index f9b376672..42bf87659 100644
--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o
+
+//config:
+//config:config FEATURE_VOLUMEID_LUKS
+//config:       bool "luks filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 #define LUKS_MAGIC_L             6
diff --git a/util-linux/volume_id/nilfs.c b/util-linux/volume_id/nilfs.c
index b88a9e435..f3a9ef58d 100644
--- a/util-linux/volume_id/nilfs.c
+++ b/util-linux/volume_id/nilfs.c
@@ -19,6 +19,26 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o
+
+//config:
+//config:config FEATURE_VOLUMEID_NILFS
+//config:       bool "nilfs filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         NILFS is a New Implementation of a Log-Structured File System (LFS)
+//config:         that supports continuous snapshots. This provides features like
+//config:         versioning of the entire filesystem, restoration of files that
+//config:         were deleted a few minutes ago. NILFS keeps consistency like
+//config:         conventional LFS, so it provides quick recovery after system crashes.
+//config:
+//config:         The possible use of NILFS includes versioning, tamper detection,
+//config:         SOX compliance logging, and so forth. It can serve as an alternative
+//config:         filesystem for Linux desktop environment, or as a basis of advanced
+//config:         storage appliances.
+//config:
+
 #include "volume_id_internal.h"
 
 #define NILFS_UUID_SIZE 16
diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c
index 7b2612f01..46f687a56 100644
--- a/util-linux/volume_id/ntfs.c
+++ b/util-linux/volume_id/ntfs.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o
+
+//config:
+//config:config FEATURE_VOLUMEID_NTFS
+//config:       bool "ntfs filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct ntfs_super_block {
@@ -150,7 +161,7 @@ int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/)
 
                 attr = (struct file_attribute*) &buf[attr_off];
                 attr_type = le32_to_cpu(attr->type);
-                attr_len = le16_to_cpu(attr->len);
+                attr_len = le32_to_cpu(attr->len);
                 val_off = le16_to_cpu(attr->value_offset);
                 val_len = le32_to_cpu(attr->value_len);
                 attr_off += attr_len;
diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c
index fcdb15192..415e0bf61 100644
--- a/util-linux/volume_id/ocfs2.c
+++ b/util-linux/volume_id/ocfs2.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o
+
+//config:
+//config:config FEATURE_VOLUMEID_OCFS2
+//config:       bool "ocfs2 filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 /* All these values are taken from ocfs2-tools's ocfs2_fs.h */
diff --git a/util-linux/volume_id/reiserfs.c b/util-linux/volume_id/reiserfs.c
index 67b4a1877..24979fb1c 100644
--- a/util-linux/volume_id/reiserfs.c
+++ b/util-linux/volume_id/reiserfs.c
@@ -19,6 +19,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o
+
+//config:
+//config:config FEATURE_VOLUMEID_REISERFS
+//config:       bool "Reiser filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct reiserfs_super_block {
diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c
index 15653bedf..4754fdb37 100644
--- a/util-linux/volume_id/romfs.c
+++ b/util-linux/volume_id/romfs.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
+
+//config:
+//config:config FEATURE_VOLUMEID_ROMFS
+//config:       bool "romfs filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct romfs_super {
diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c
index c5b4f9ced..079b6cc31 100644
--- a/util-linux/volume_id/squashfs.c
+++ b/util-linux/volume_id/squashfs.c
@@ -8,6 +8,18 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_SQUASHFS
+//config:       bool "SquashFS filesystem"
+//config:       default y
+//config:       depends on VOLUMEID && FEATURE_BLKID_TYPE
+//config:       help
+//config:         Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+//config:         intended for general read-only filesystem use and in constrained block
+//config:         device/memory systems (e.g. embedded systems) where low overhead is
+//config:         needed.
+//config:
+
 #include "volume_id_internal.h"
 
 struct squashfs_superblock {
diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c
index 6eb96464d..7b4b5360b 100644
--- a/util-linux/volume_id/sysv.c
+++ b/util-linux/volume_id/sysv.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o
+
+//config:
+//config:config FEATURE_VOLUMEID_SYSV
+//config:       bool "sysv filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 #define SYSV_NICINOD                    100
diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c
index d3747fb8e..921454503 100644
--- a/util-linux/volume_id/udf.c
+++ b/util-linux/volume_id/udf.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o
+
+//config:
+//config:config FEATURE_VOLUMEID_UDF
+//config:       bool "udf filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct volume_descriptor {
diff --git a/util-linux/volume_id/unused_highpoint.c b/util-linux/volume_id/unused_highpoint.c
index 17b7b3291..7231a1db2 100644
--- a/util-linux/volume_id/unused_highpoint.c
+++ b/util-linux/volume_id/unused_highpoint.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_HIGHPOINTRAID
+//config:###    bool "highpoint raid"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct hpt37x_meta {
diff --git a/util-linux/volume_id/unused_hpfs.c b/util-linux/volume_id/unused_hpfs.c
index 442952464..a87c89fb3 100644
--- a/util-linux/volume_id/unused_hpfs.c
+++ b/util-linux/volume_id/unused_hpfs.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_HPFS
+//config:###    bool "hpfs filesystem"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct hpfs_super {
diff --git a/util-linux/volume_id/unused_isw_raid.c b/util-linux/volume_id/unused_isw_raid.c
index 7ab47b3a1..851bd2f8f 100644
--- a/util-linux/volume_id/unused_isw_raid.c
+++ b/util-linux/volume_id/unused_isw_raid.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_ISWRAID
+//config:###    bool "intel raid"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct isw_meta {
diff --git a/util-linux/volume_id/unused_lsi_raid.c b/util-linux/volume_id/unused_lsi_raid.c
index e6cc8edd3..52d68deab 100644
--- a/util-linux/volume_id/unused_lsi_raid.c
+++ b/util-linux/volume_id/unused_lsi_raid.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_LSIRAID
+//config:###    bool "lsi raid"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct lsi_meta {
diff --git a/util-linux/volume_id/unused_lvm.c b/util-linux/volume_id/unused_lvm.c
index 2206498bf..08fa05243 100644
--- a/util-linux/volume_id/unused_lvm.c
+++ b/util-linux/volume_id/unused_lvm.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_LVM
+//config:###    bool "lvm"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct lvm1_super_block {
diff --git a/util-linux/volume_id/unused_mac.c b/util-linux/volume_id/unused_mac.c
index e8deb9720..a1a53d1fb 100644
--- a/util-linux/volume_id/unused_mac.c
+++ b/util-linux/volume_id/unused_mac.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_MAC
+//config:###    bool "mac filesystem"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct mac_driver_desc {
diff --git a/util-linux/volume_id/unused_minix.c b/util-linux/volume_id/unused_minix.c
index a3e1077b0..50afd5c3e 100644
--- a/util-linux/volume_id/unused_minix.c
+++ b/util-linux/volume_id/unused_minix.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_MINIX
+//config:###    bool "minix filesystem"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct minix_super_block {
diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c
index 2e8cb196a..d2fc66caa 100644
--- a/util-linux/volume_id/unused_msdos.c
+++ b/util-linux/volume_id/unused_msdos.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_MSDOS
+//config:###    bool "msdos filesystem"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct msdos_partition_entry {
diff --git a/util-linux/volume_id/unused_nvidia_raid.c b/util-linux/volume_id/unused_nvidia_raid.c
index 9e8472921..d99a108f3 100644
--- a/util-linux/volume_id/unused_nvidia_raid.c
+++ b/util-linux/volume_id/unused_nvidia_raid.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_NVIDIARAID
+//config:###    bool "nvidia raid"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct nvidia_meta {
diff --git a/util-linux/volume_id/unused_promise_raid.c b/util-linux/volume_id/unused_promise_raid.c
index 0b0d0063c..cebebe35f 100644
--- a/util-linux/volume_id/unused_promise_raid.c
+++ b/util-linux/volume_id/unused_promise_raid.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_PROMISERAID
+//config:###    bool "promise raid"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct promise_meta {
diff --git a/util-linux/volume_id/unused_silicon_raid.c b/util-linux/volume_id/unused_silicon_raid.c
index 878b88197..40c8faa9e 100644
--- a/util-linux/volume_id/unused_silicon_raid.c
+++ b/util-linux/volume_id/unused_silicon_raid.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_SILICONRAID
+//config:###    bool "silicon raid"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct silicon_meta {
diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c
index 9f925d983..d33c10fc4 100644
--- a/util-linux/volume_id/unused_ufs.c
+++ b/util-linux/volume_id/unused_ufs.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_UFS
+//config:###    bool "ufs filesystem"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct ufs_super_block {
diff --git a/util-linux/volume_id/unused_via_raid.c b/util-linux/volume_id/unused_via_raid.c
index a11eec13a..258f93a4f 100644
--- a/util-linux/volume_id/unused_via_raid.c
+++ b/util-linux/volume_id/unused_via_raid.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o
+
+//config:
+//config:### config FEATURE_VOLUMEID_VIARAID
+//config:###    bool "via raid"
+//config:###    default y
+//config:###    depends on VOLUMEID
+//config:###    help
+//config:###      TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct via_meta {
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c
index f0fc84c05..5c459a0e2 100644
--- a/util-linux/volume_id/volume_id.c
+++ b/util-linux/volume_id/volume_id.c
@@ -18,6 +18,8 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_VOLUMEID) += volume_id.o util.o
+
 #include "volume_id_internal.h"
 
 
@@ -136,6 +138,9 @@ static const probe_fptr fs2[] = {
 #if ENABLE_FEATURE_VOLUMEID_UFS
         volume_id_probe_ufs,
 #endif
+#if ENABLE_FEATURE_VOLUMEID_F2FS
+        volume_id_probe_f2fs,
+#endif
 #if ENABLE_FEATURE_VOLUMEID_NILFS
         volume_id_probe_nilfs,
 #endif
diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h
index 3f02bd50d..6e2dbd7bb 100644
--- a/util-linux/volume_id/volume_id_internal.h
+++ b/util-linux/volume_id/volume_id_internal.h
@@ -96,44 +96,24 @@ void FAST_FUNC free_volume_id(struct volume_id *id);
 /* size of seek buffer, FAT cluster is 32k max */
 #define SEEK_BUFFER_SIZE                        0x10000
 
-#define bswap16(x) (uint16_t)   ( \
-                                (((uint16_t)(x) & 0x00ffu) << 8) | \
-                                (((uint16_t)(x) & 0xff00u) >> 8))
-
-#define bswap32(x) (uint32_t)   ( \
-                                (((uint32_t)(x) & 0xff000000u) >> 24) | \
-                                (((uint32_t)(x) & 0x00ff0000u) >>  8) | \
-                                (((uint32_t)(x) & 0x0000ff00u) <<  8) | \
-                                (((uint32_t)(x) & 0x000000ffu) << 24))
-
-#define bswap64(x) (uint64_t)   ( \
-                                (((uint64_t)(x) & 0xff00000000000000ull) >> 56) | \
-                                (((uint64_t)(x) & 0x00ff000000000000ull) >> 40) | \
-                                (((uint64_t)(x) & 0x0000ff0000000000ull) >> 24) | \
-                                (((uint64_t)(x) & 0x000000ff00000000ull) >>  8) | \
-                                (((uint64_t)(x) & 0x00000000ff000000ull) <<  8) | \
-                                (((uint64_t)(x) & 0x0000000000ff0000ull) << 24) | \
-                                (((uint64_t)(x) & 0x000000000000ff00ull) << 40) | \
-                                (((uint64_t)(x) & 0x00000000000000ffull) << 56))
-
 #if BB_LITTLE_ENDIAN
-#define le16_to_cpu(x) (x)
-#define le32_to_cpu(x) (x)
-#define le64_to_cpu(x) (x)
-#define be16_to_cpu(x) bswap16(x)
-#define be32_to_cpu(x) bswap32(x)
-#define cpu_to_le16(x) (x)
-#define cpu_to_le32(x) (x)
-#define cpu_to_be32(x) bswap32(x)
+# define le16_to_cpu(x) (uint16_t)(x)
+# define le32_to_cpu(x) (uint32_t)(x)
+# define le64_to_cpu(x) (uint64_t)(x)
+# define be16_to_cpu(x) (uint16_t)(bswap_16(x))
+# define be32_to_cpu(x) (uint32_t)(bswap_32(x))
+# define cpu_to_le16(x) (uint16_t)(x)
+# define cpu_to_le32(x) (uint32_t)(x)
+# define cpu_to_be32(x) (uint32_t)(bswap_32(x))
 #else
-#define le16_to_cpu(x) bswap16(x)
-#define le32_to_cpu(x) bswap32(x)
-#define le64_to_cpu(x) bswap64(x)
-#define be16_to_cpu(x) (x)
-#define be32_to_cpu(x) (x)
-#define cpu_to_le16(x) bswap16(x)
-#define cpu_to_le32(x) bswap32(x)
-#define cpu_to_be32(x) (x)
+# define le16_to_cpu(x) (uint16_t)(bswap_16(x))
+# define le32_to_cpu(x) (uint32_t)(bswap_32(x))
+# define le64_to_cpu(x) (uint64_t)(bb_bswap_64(x))
+# define be16_to_cpu(x) (uint16_t)(x)
+# define be32_to_cpu(x) (uint32_t)(x)
+# define cpu_to_le16(x) (uint16_t)(bswap_16(x))
+# define cpu_to_le32(x) (uint32_t)(bswap_32(x))
+# define cpu_to_be32(x) (uint32_t)(x)
 #endif
 
 /* volume_id_set_uuid(id,buf,fmt) assumes size of uuid buf
@@ -215,6 +195,8 @@ int FAST_FUNC volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/);
 
 //int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/);
 
+int FAST_FUNC volume_id_probe_f2fs(struct volume_id *id /*,uint64_t off*/);
+
 int FAST_FUNC volume_id_probe_nilfs(struct volume_id *id /*,uint64_t off*/);
 
 int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/);
diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c
index 84746020e..5eefc201d 100644
--- a/util-linux/volume_id/xfs.c
+++ b/util-linux/volume_id/xfs.c
@@ -18,6 +18,17 @@
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
+
+//config:
+//config:config FEATURE_VOLUMEID_XFS
+//config:       bool "xfs filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
+//config:       help
+//config:         TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct xfs_super_block {