Merge branch 'busybox' into merge

70 files changed, 799 insertions, 187 deletions

diff --git a/archival/cpio.c b/archival/cpio.c
index 1d6cbd1e2..308ec1b25 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -508,6 +508,8 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
         while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
                 continue;
 
+        create_symlinks_from_list(archive_handle->symlink_placeholders);
+
         if (archive_handle->cpio__blocks != (off_t)-1
          && !(opt & OPT_QUIET)
         ) {
diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index 1114a95cb..0fcabb4a9 100644
--- a/archival/libarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -37,7 +37,7 @@ static const char *const tar_var[] = {
 static void xputenv(char *str)
 {
         if (putenv(str))
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
 }
 
 static void str2env(char *env[], int idx, const char *str)
diff --git a/archival/tar.c b/archival/tar.c
index d0684b69e..308ce7701 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -792,7 +792,7 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:        IF_FEATURE_SEAMLESS_LZMA("a")
 //usage:        IF_FEATURE_TAR_CREATE("h")
 //usage:        IF_FEATURE_TAR_NOPRESERVE_TIME("m")
-//usage:        "vO] "
+//usage:        "vokO] "
 //usage:        "[-f TARFILE] [-C DIR] "
 //usage:        IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[--exclude PATTERN]... "))
 //usage:        "[FILE]..."
@@ -809,6 +809,13 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:     "\n        -f FILE Name of TARFILE ('-' for stdin/out)"
 //usage:     "\n        -C DIR  Change to DIR before operation"
 //usage:     "\n        -v      Verbose"
+//usage:     "\n        -O      Extract to stdout"
+//usage:        IF_FEATURE_TAR_NOPRESERVE_TIME(
+//usage:     "\n        -m      Don't restore mtime"
+//usage:        )
+//usage:     "\n        -o      Don't restore user:group"
+///////:-p - accepted but ignored, restores mode (aliases in GNU tar: --preserve-permissions, --same-permissions)
+//usage:     "\n        -k      Don't replace existing files"
 //usage:        IF_FEATURE_SEAMLESS_Z(
 //usage:     "\n        -Z      (De)compress using compress"
 //usage:        )
@@ -824,13 +831,9 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:        IF_FEATURE_SEAMLESS_LZMA(
 //usage:     "\n        -a      (De)compress using lzma"
 //usage:        )
-//usage:     "\n        -O      Extract to stdout"
 //usage:        IF_FEATURE_TAR_CREATE(
 //usage:     "\n        -h      Follow symlinks"
 //usage:        )
-//usage:        IF_FEATURE_TAR_NOPRESERVE_TIME(
-//usage:     "\n        -m      Don't restore mtime"
-//usage:        )
 //usage:        IF_FEATURE_TAR_FROM(
 //usage:     "\n        -T FILE File with names to include"
 //usage:     "\n        -X FILE File with glob patterns to exclude"
@@ -844,9 +847,6 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:       "$ tar -cf /tmp/tarball.tar /usr/local\n"
 
 // Supported but aren't in --help:
-//      o       no-same-owner
-//      p       same-permissions
-//      k       keep-old
 //      no-recursion
 //      numeric-owner
 //      no-same-permissions
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 41f6d103c..2944cdfcb 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -211,7 +211,7 @@ static const char *human_fstype(uint32_t f_type)
                 { 0x52654973, "reiserfs" },
                 { 0x28cd3d45, "cramfs" },
                 { 0x7275,     "romfs" },
-                { 0x858458f6, "romfs" },
+                { 0x858458f6, "ramfs" },
                 { 0x73717368, "squashfs" },
                 { 0x62656572, "sysfs" },
                 { 0, "UNKNOWN" }
diff --git a/editors/sed.c b/editors/sed.c
index bb2809d3c..bf8a11613 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -994,7 +994,7 @@ static void flush_append(char *last_puts_char)
 static char *get_next_line(char *gets_char, char *last_puts_char)
 {
         char *temp = NULL;
-        int len;
+        size_t len;
         char gc;
 
         flush_append(last_puts_char);
diff --git a/examples/var_service/README_distro_proposal.txt b/examples/var_service/README_distro_proposal.txt
index ec887b4e1..f161406a7 100644
--- a/examples/var_service/README_distro_proposal.txt
+++ b/examples/var_service/README_distro_proposal.txt
@@ -246,7 +246,8 @@ relative to the system-wide service directory.
 This proposal asks developers of other daemontools implementations
 to add "svc" command to their projects]
 
-The "svok DIR" tool exits 0 if service is running, and nonzero if not.
+The "svok DIR" tool exits 0 if service supervisor is running
+(with service itself either running or stopped), and nonzero if not.
 
 Other tools with different names and APIs may exist; however
 for portability scripts should use the above tools.
diff --git a/examples/var_service/dnsmasq/README b/examples/var_service/dnsmasq/README
new file mode 100644
index 000000000..a20740d6e
--- /dev/null
+++ b/examples/var_service/dnsmasq/README
@@ -0,0 +1,10 @@
+Local DNS cache service.
+
+This service is useful if you have more than 3 DNS servers,
+or if you need a finer-grained control of which servers
+can serve which domain.
+
+To make programs use local DNS server, make sure
+/etc/resolv.conf says:
+
+nameserver 127.0.0.1
diff --git a/examples/var_service/dnsmasq/dnsmasq.conf b/examples/var_service/dnsmasq/dnsmasq.conf
new file mode 100644
index 000000000..2cfb0fe81
--- /dev/null
+++ b/examples/var_service/dnsmasq/dnsmasq.conf
@@ -0,0 +1,76 @@
+keep-in-foreground
+
+# "-" is stderr:
+log-facility=-
+
+# May also try log-queries=extra
+log-queries
+
+# No param = pidfile disabled:
+pid-file
+
+interface=lo
+listen-address=127.0.0.1
+bind-interfaces
+
+cache-size=999
+
+servers-file=/etc/dnsmasq_servers.conf
+
+# Don’t read /etc/resolv.conf and /etc/hosts:
+no-resolv
+#no-hosts
+
+# All reverse lookups for private IP ranges (ie 192.168.x.x, etc)
+# which are not found in /etc/hosts or the DHCP leases file are
+# answered with "no such domain" rather than being forwarded
+# upstream. The set of prefixes affected is the list given in
+# RFC6303.
+#bogus-priv
+
+#−T, --local-ttl=<time>
+# When replying with information from /etc/hosts or configuration
+# or the DHCP leases file dnsmasq by default sets the time-to-live
+# field to zero, meaning that the requester should not itself
+# cache the information. This is the correct thing to do in almost
+# all situations. This option allows a time-to-live (in seconds)
+# to be given for these replies. This will reduce the load on the
+# server at the expense of clients using stale data under some
+# circumstances.
+local-ttl=67
+
+#--dhcp-ttl=<time>
+# As for --local-ttl, but affects only replies with information
+# from DHCP leases. If both are given, --dhcp-ttl applies for DHCP
+# information, and --local-ttl for others. Setting this to zero
+# eliminates the effect of --local-ttl for DHCP.
+#
+#--neg-ttl=<time>
+# Negative replies from upstream servers normally contain time-to-
+# live information in SOA records which dnsmasq uses for caching.
+# If the replies from upstream servers omit this information, dns-
+# masq does not cache the reply. This option gives a default value
+# for time-to-live (in seconds) which dnsmasq uses to cache nega-
+# tive replies even in the absence of an SOA record.
+neg-ttl=67
+
+#--max-ttl=<time>
+# Set a maximum TTL value that will be handed out to clients. The
+# specified maximum TTL will be given to clients instead of the
+# true TTL value if it is lower. The true TTL value is however
+# kept in the cache to avoid flooding the upstream DNS servers.
+#
+#--max-cache-ttl=<time>
+# Set a maximum TTL value for entries in the cache.
+#
+#--min-cache-ttl=<time>
+# Extend short TTL values to the time given when caching them.
+# Note that artificially extending TTL values is in general a bad
+# idea, do not do it unless you have a good reason, and understand
+# what you are doing. Dnsmasq limits the value of this option to
+# one hour, unless recompiled.
+min-cache-ttl=67
+
+#--auth-ttl=<time>
+# Set the TTL value returned in answers from the authoritative
+# server.
diff --git a/examples/var_service/dnsmasq/log/run b/examples/var_service/dnsmasq/log/run
new file mode 100755
index 000000000..69d74b73f
--- /dev/null
+++ b/examples/var_service/dnsmasq/log/run
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+user=logger
+
+logdir="/var/log/service/`(cd ..;basename $PWD)`"
+mkdir -p "$logdir" 2>/dev/null
+chown -R "$user": "$logdir"
+chmod -R go-rwxst,u+rwX "$logdir"
+rm -rf logdir
+ln -s "$logdir" logdir
+
+# make this dir accessible to logger
+chmod a+rX .
+
+exec >/dev/null
+exec 2>&1
+exec \
+env - PATH="$PATH" \
+softlimit \
+setuidgid "$user" \
+svlogd -tt "$logdir"
diff --git a/examples/var_service/dnsmasq/p_log b/examples/var_service/dnsmasq/p_log
new file mode 100755
index 000000000..a2521be05
--- /dev/null
+++ b/examples/var_service/dnsmasq/p_log
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd log/logdir || exit 1
+cat @* current | $PAGER
diff --git a/examples/var_service/dnsmasq/run b/examples/var_service/dnsmasq/run
new file mode 100755
index 000000000..2ac94282f
--- /dev/null
+++ b/examples/var_service/dnsmasq/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+#exec >/dev/null
+exec 2>&1
+exec </dev/null
+
+echo "* Starting dnsmasq"
+exec \
+env - PATH="$PATH" \
+softlimit \
+setuidgid root \
+dnsmasq -C dnsmasq.conf
diff --git a/examples/var_service/dnsmasq/w_log b/examples/var_service/dnsmasq/w_log
new file mode 100755
index 000000000..aa36ef13b
--- /dev/null
+++ b/examples/var_service/dnsmasq/w_log
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd log/logdir || exit 1
+watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))'
diff --git a/examples/var_service/fw/etc/dnsmasq_servers.conf b/examples/var_service/fw/etc/dnsmasq_servers.conf
new file mode 100644
index 000000000..68313605f
--- /dev/null
+++ b/examples/var_service/fw/etc/dnsmasq_servers.conf
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+empty=true
+
+prio=0
+i=0; while test "${if[$i]}"; do
+        test x"${dns_prio[$i]}" != x"" \
+        && test "${dns_prio[$i]}" -gt "$prio" \
+        && prio="${dns_prio[$i]}"
+let i++; done
+
+i=0; while test "${if[$i]}"; do
+        if test "${dnsmasq[$i]}"; then
+                for d in ${dnsmasq[$i]}; do
+                        echo "$d"
+                        empty=false
+                done
+                let i++;
+                continue
+        fi
+        # This iface has no dnsmasq-extended config.
+        # Use simple DNS names instead, if those exist.
+        for d in ${dns[$i]}; do
+                p="${dns_prio[$i]}"
+                test x"$p" == x"" && p=0
+                test x"$p" == x"$prio" || continue
+                echo "server=$d"
+                empty=false
+        done
+        let i++;
+done
+
+# Use Google DNS servers if nothing else is configured
+$empty && echo "server=8.8.8.8"
+$empty && echo "server=8.8.4.4"
+
+# SIGHUP: make dnsmasq reload config
+sv h dnsmasq
diff --git a/examples/var_service/ifplugd_if/run b/examples/var_service/ifplugd_if/run
index c4f766e88..5d1d4e355 100755
--- a/examples/var_service/ifplugd_if/run
+++ b/examples/var_service/ifplugd_if/run
@@ -16,7 +16,7 @@ exec \
 env - PATH="$PATH" \
 softlimit \
 setuidgid root \
-ifplugd -apqns -t3 -u8 -d8 -i "$if" -r "$pwd/ifplugd_handler"
+ifplugd -aqlns -t3 -u8 -d8 -i "$if" -r "$pwd/ifplugd_handler"
 
 # We use -t3 to wake ifplugd up less often.
 # If after three tests (3*3=9 > 8) link state seen to be different,
@@ -24,19 +24,26 @@ ifplugd -apqns -t3 -u8 -d8 -i "$if" -r "$pwd/ifplugd_handler"
 # IOW: short link losses will be ignored, longer ones
 # will trigger DHCP reconfiguration and such (see handler code).
 
-#-a       Do not up interface automatically
-#-p       Dont run script on daemon startup
-#-q       Dont run script on daemon quit
+# -l makes ifplugd run either "up" or "down" script on startup.
+# For example, if wired eth cable is unplugged, this stops dhcp service
+# from pointlessly trying to get a lease.
+# -q means that stopping monitoring does not stop dhcp/zcip/etc:
+# presumably, admin decided to control them manually.
+
+#-a       Don't up interface automatically
+#-p       Don't run "up" script on startup
+#-q       Don't run "down" script on exit
+#-l       Always run script on startup
 #-n       Do not daemonize
 #-s       Do not log to syslog
 #-t SECS  Poll time in seconds
 #-u SECS  Delay before running script after link up
 #-d SECS  Delay after link down
 #-i IFACE Interface
-#-r PROG  Script to run
-#-f/-F    Treat link detection error as link down/link up (otherwise exit on error)
 #-M       Monitor creation/destruction of interface (otherwise it must exist)
+#-r PROG  Script to run
 #-x ARG   Extra argument for script
-#-I       Dont exit on nonzero exit code from script
-#-l       Run script on startup even if no cable is detected
+#-I       Don't exit on nonzero exit code from script
+#-f/-F    Treat link detection error as link down/link up (otherwise exit on error)
 #-m MODE  API mode (mii, priv, ethtool, wlan, auto)
+#-k       Kill running daemon
diff --git a/findutils/grep.c b/findutils/grep.c
index fc6de4b69..88de0d4ef 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -352,7 +352,7 @@ static int grep_file(FILE *file)
                                                         goto opt_f_not_found;
                                         } else
                                         if (option_mask32 & OPT_w) {
-                                                char c = (match != str) ? match[-1] : ' ';
+                                                char c = (match != line) ? match[-1] : ' ';
                                                 if (!isalnum(c) && c != '_') {
                                                         c = match[strlen(gl->pattern)];
                                                         if (!c || (!isalnum(c) && c != '_'))
diff --git a/include/libbb.h b/include/libbb.h
index 244d85e84..af234e7b0 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -952,7 +952,7 @@ extern void xprint_and_close_file(FILE *file) FAST_FUNC;
  * end of line. If end isn't NULL, length of the chunk is stored in it.
  * Returns NULL if EOF/error.
  */
-extern char *bb_get_chunk_from_file(FILE *file, int *end) FAST_FUNC;
+extern char *bb_get_chunk_from_file(FILE *file, size_t *end) FAST_FUNC;
 /* Reads up to (and including) TERMINATING_STRING: */
 extern char *xmalloc_fgets_str(FILE *file, const char *terminating_string) FAST_FUNC RETURNS_MALLOC;
 /* Same, with limited max size, and returns the length (excluding NUL): */
@@ -1325,20 +1325,21 @@ extern smallint syslog_level;
 extern smallint logmode;
 extern uint8_t xfunc_error_retval;
 extern void (*die_func)(void);
-extern void xfunc_die(void) NORETURN FAST_FUNC;
-extern void bb_show_usage(void) NORETURN FAST_FUNC;
-extern void bb_error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC;
-extern void bb_error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))) FAST_FUNC;
-extern void bb_perror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC;
-extern void bb_simple_perror_msg(const char *s) FAST_FUNC;
-extern void bb_perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))) FAST_FUNC;
-extern void bb_simple_perror_msg_and_die(const char *s) NORETURN FAST_FUNC;
-extern void bb_herror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC;
-extern void bb_herror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))) FAST_FUNC;
-extern void bb_perror_nomsg_and_die(void) NORETURN FAST_FUNC;
-extern void bb_perror_nomsg(void) FAST_FUNC;
-extern void bb_verror_msg(const char *s, va_list p, const char *strerr) FAST_FUNC;
-extern void bb_logenv_override(void) FAST_FUNC;
+void xfunc_die(void) NORETURN FAST_FUNC;
+void bb_show_usage(void) NORETURN FAST_FUNC;
+void bb_error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC;
+void bb_error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))) FAST_FUNC;
+void bb_perror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC;
+void bb_simple_perror_msg(const char *s) FAST_FUNC;
+void bb_perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))) FAST_FUNC;
+void bb_simple_perror_msg_and_die(const char *s) NORETURN FAST_FUNC;
+void bb_herror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC;
+void bb_herror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))) FAST_FUNC;
+void bb_perror_nomsg_and_die(void) NORETURN FAST_FUNC;
+void bb_perror_nomsg(void) FAST_FUNC;
+void bb_verror_msg(const char *s, va_list p, const char *strerr) FAST_FUNC;
+void bb_die_memory_exhausted(void) NORETURN FAST_FUNC;
+void bb_logenv_override(void) FAST_FUNC;
 
 /* We need to export XXX_main from libbusybox
  * only if we build "individual" binaries
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 4e09ddc80..09ccfba67 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -10,16 +10,19 @@
  */
 #include "libbb.h"
 
-char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
+char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end)
 {
         int ch;
-        unsigned idx = 0;
+        size_t idx = 0;
         char *linebuf = NULL;
 
         while ((ch = getc(file)) != EOF) {
                 /* grow the line buffer as necessary */
-                if (!(idx & 0xff))
+                if (!(idx & 0xff)) {
+                        if (idx == ((size_t)-1) - 0xff)
+                                bb_die_memory_exhausted();
                         linebuf = xrealloc(linebuf, idx + 0x100);
+                }
                 linebuf[idx++] = (char) ch;
                 if (ch == '\0')
                         break;
@@ -44,14 +47,12 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
 /* Get line, including trailing \n if any */
 char* FAST_FUNC xmalloc_fgets(FILE *file)
 {
-        int i;
-
-        return bb_get_chunk_from_file(file, &i);
+        return bb_get_chunk_from_file(file, NULL);
 }
 /* Get line.  Remove trailing \n */
 char* FAST_FUNC xmalloc_fgetline(FILE *file)
 {
-        int i;
+        size_t i;
         char *c = bb_get_chunk_from_file(file, &i);
 
         if (i && c[--i] == '\n')
diff --git a/libbb/wfopen.c b/libbb/wfopen.c
index 20fe18b23..1c7f7f3d7 100644
--- a/libbb/wfopen.c
+++ b/libbb/wfopen.c
@@ -42,7 +42,7 @@ static FILE* xfdopen_helper(unsigned fd_and_rw_bit)
 {
         FILE* fp = fdopen(fd_and_rw_bit >> 1, fd_and_rw_bit & 1 ? "w" : "r");
         if (!fp)
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
         return fp;
 }
 FILE* FAST_FUNC xfdopen_for_read(int fd)
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 43ae98065..e8c027f17 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -59,24 +59,23 @@ char* FAST_FUNC strncpy_IFNAMSIZ(char *dst, const char *src)
  * A truncated result contains the first few digits of the result ala strncpy.
  * Returns a pointer past last generated digit, does _not_ store NUL.
  */
-void BUG_sizeof(void);
 char* FAST_FUNC utoa_to_buf(unsigned n, char *buf, unsigned buflen)
 {
         unsigned i, out, res;
 
         if (buflen) {
                 out = 0;
+
+                BUILD_BUG_ON(sizeof(n) != 4 && sizeof(n) != 8);
                 if (sizeof(n) == 4)
                 // 2^32-1 = 4294967295
                         i = 1000000000;
-#if UINT_MAX > 4294967295 /* prevents warning about "const too large" */
+#if UINT_MAX > 0xffffffff /* prevents warning about "const too large" */
                 else
                 if (sizeof(n) == 8)
                 // 2^64-1 = 18446744073709551615
                         i = 10000000000000000000;
 #endif
-                else
-                        BUG_sizeof();
                 for (; i; i /= 10) {
                         res = n / i;
                         n = n % i;
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 7032e5f8f..21263ccfe 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -25,6 +25,11 @@
  * fail, so callers never need to check for errors.  If it returned, it
  * succeeded. */
 
+void FAST_FUNC bb_die_memory_exhausted(void)
+{
+        bb_error_msg_and_die(bb_msg_memory_exhausted);
+}
+
 #ifndef DMALLOC
 /* dmalloc provides variants of these that do abort() on failure.
  * Since dmalloc's prototypes overwrite the impls here as they are
@@ -44,7 +49,7 @@ void* FAST_FUNC xmalloc(size_t size)
 {
         void *ptr = malloc(size);
         if (ptr == NULL && size != 0)
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
         return ptr;
 }
 
@@ -55,7 +60,7 @@ void* FAST_FUNC xrealloc(void *ptr, size_t size)
 {
         ptr = realloc(ptr, size);
         if (ptr == NULL && size != 0)
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
         return ptr;
 }
 #endif /* DMALLOC */
@@ -79,7 +84,7 @@ char* FAST_FUNC xstrdup(const char *s)
         t = strdup(s);
 
         if (t == NULL)
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
 
         return t;
 }
@@ -327,14 +332,14 @@ char* FAST_FUNC xasprintf(const char *format, ...)
         va_end(p);
 
         if (r < 0)
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
         return string_ptr;
 }
 
 void FAST_FUNC xsetenv(const char *key, const char *value)
 {
         if (setenv(key, value, 1))
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
 }
 
 /* Handles "VAR=VAL" strings, even those which are part of environ
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 5b2e5ac56..bc3c61055 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -54,7 +54,7 @@
 //usage:     "\n        -d      Framebuffer device (default /dev/fb0)"
 //usage:     "\n        -i      Config file (var=value):"
 //usage:     "\n                        BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT"
-//usage:     "\n                        BAR_R,BAR_G,BAR_B"
+//usage:     "\n                        BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP"
 //usage:     "\n        -f      Control pipe (else exit after drawing image)"
 //usage:     "\n                        commands: 'NN' (% for progress bar) or 'exit'"
 
@@ -73,7 +73,7 @@ struct globals {
         FILE *logfile_fd;       // log file
 #endif
         unsigned char *addr;    // pointer to framebuffer memory
-        unsigned ns[7];         // n-parameters
+        unsigned ns[9];         // n-parameters
         const char *image_filename;
         struct fb_var_screeninfo scr_var;
         struct fb_fix_screeninfo scr_fix;
@@ -95,6 +95,8 @@ struct globals {
 #define nbar_colr       ns[4]   // progress bar color red component
 #define nbar_colg       ns[5]   // progress bar color green component
 #define nbar_colb       ns[6]   // progress bar color blue component
+#define img_posx        ns[7]   // image horizontal position
+#define img_posy        ns[8]   // image vertical position
 
 #if DEBUG
 #define DEBUG_MESSAGE(strMessage, args...) \
@@ -426,10 +428,10 @@ static void fb_drawimage(void)
         line_size = width*3;
         pixline = xmalloc(line_size);
 
-        if (width > G.scr_var.xres)
-                width = G.scr_var.xres;
-        if (height > G.scr_var.yres)
-                height = G.scr_var.yres;
+        if ((width + G.img_posx) > G.scr_var.xres)
+                width = G.scr_var.xres - G.img_posx;
+        if ((height + G.img_posy) > G.scr_var.yres)
+                height = G.scr_var.yres - G.img_posy;
         for (j = 0; j < height; j++) {
                 unsigned char *pixel;
                 unsigned char *src;
@@ -437,7 +439,7 @@ static void fb_drawimage(void)
                 if (fread(pixline, 1, line_size, theme_file) != line_size)
                         bb_error_msg_and_die("bad PPM file '%s'", G.image_filename);
                 pixel = pixline;
-                src = G.addr + j * G.scr_fix.line_length;
+                src = G.addr + (G.img_posy + j) * G.scr_fix.line_length + G.img_posx * G.bytes_per_pixel;
                 for (i = 0; i < width; i++) {
                         unsigned thispix = fb_pixel_value(pixel[0], pixel[1], pixel[2]);
                         fb_write_pixel(src, thispix);
@@ -460,6 +462,7 @@ static void init(const char *cfg_filename)
                 "BAR_WIDTH\0" "BAR_HEIGHT\0"
                 "BAR_LEFT\0" "BAR_TOP\0"
                 "BAR_R\0" "BAR_G\0" "BAR_B\0"
+                "IMG_LEFT\0" "IMG_TOP\0"
 #if DEBUG
                 "DEBUG\0"
 #endif
@@ -472,10 +475,10 @@ static void init(const char *cfg_filename)
                 int i = index_in_strings(param_names, token[0]);
                 if (i < 0)
                         bb_error_msg_and_die("syntax error: %s", token[0]);
-                if (i >= 0 && i < 7)
+                if (i >= 0 && i < 9)
                         G.ns[i] = val;
 #if DEBUG
-                if (i == 7) {
+                if (i == 9) {
                         G.bdebug_messages = val;
                         if (G.bdebug_messages)
                                 G.logfile_fd = xfopen_for_write("/tmp/fbsplash.log");
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 9bc1a075f..5059eaf73 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -367,7 +367,7 @@ static void up_iface(void)
                 /* Let user know we mess up with interface */
                 bb_error_msg("upping interface");
                 if (network_ioctl(SIOCSIFFLAGS, &ifrequest, "setting interface flags") < 0) {
-                        if (errno != ENODEV)
+                        if (errno != ENODEV && errno != EADDRNOTAVAIL)
                                 xfunc_die();
                         G.iface_exists = 0;
                         return;
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 534c9f0c7..5481134e5 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -138,6 +138,7 @@
 //usage:     "\n        -v      Print out what would happen before doing it"
 //usage:     "\n        -f      Force deconfiguration"
 
+#include <net/if.h>
 #include "libbb.h"
 #include "common_bufsiz.h"
 /* After libbb.h, since it needs sys/types.h on some systems */
@@ -503,6 +504,8 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
 
 static int FAST_FUNC static_down6(struct interface_defn_t *ifd, execfn *exec)
 {
+        if (!if_nametoindex(ifd->iface))
+                return 1; /* already gone */
 # if ENABLE_FEATURE_IFUPDOWN_IP
         return execute("ip link set %iface% down", ifd, exec);
 # else
@@ -598,6 +601,9 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec)
 static int FAST_FUNC static_down(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
+
+        if (!if_nametoindex(ifd->iface))
+                return 2; /* already gone */
 # if ENABLE_FEATURE_IFUPDOWN_IP
         /* Optional "label LBL" is necessary if interface is an alias (eth0:0),
          * otherwise "ip addr flush dev eth0:0" flushes all addresses on eth0.
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 2aa8b683b..9c164a71d 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -161,7 +161,7 @@ static int get_address(char *dev, int *htype)
 
         s = xsocket(PF_PACKET, SOCK_DGRAM, 0);
 
-        memset(&ifr, 0, sizeof(ifr));
+        /*memset(&ifr, 0, sizeof(ifr)); - SIOCGIFINDEX does not need to clear all */
         strncpy_IFNAMSIZ(ifr.ifr_name, dev);
         xioctl(s, SIOCGIFINDEX, &ifr);
 
diff --git a/networking/netstat.c b/networking/netstat.c
index 33281e333..f6bcd44ba 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -397,8 +397,11 @@ static char *ip_port_str(struct sockaddr *addr, int port, const char *proto, int
         /* Code which used "*" for INADDR_ANY is removed: it's ambiguous
          * in IPv6, while "0.0.0.0" is not. */
 
-        host = numeric ? xmalloc_sockaddr2dotted_noport(addr)
-                       : xmalloc_sockaddr2host_noport(addr);
+        host = NULL;
+        if (!numeric)
+                host = xmalloc_sockaddr2host_noport(addr);
+        if (!host)
+                host = xmalloc_sockaddr2dotted_noport(addr);
 
         host_port = xasprintf("%s:%s", host, get_sname(htons(port), proto, numeric));
         free(host);
diff --git a/networking/route.c b/networking/route.c
index 6edc0f6d7..8387ce1bb 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -444,7 +444,7 @@ static NOINLINE void INET6_setroute(int action, char **args)
 
         if (devname) {
                 struct ifreq ifr;
-                memset(&ifr, 0, sizeof(ifr));
+                /*memset(&ifr, 0, sizeof(ifr)); - SIOCGIFINDEX does not need to clear all */
                 strncpy_IFNAMSIZ(ifr.ifr_name, devname);
                 xioctl(skfd, SIOCGIFINDEX, &ifr);
                 rt.rtmsg_ifindex = ifr.ifr_ifindex;
diff --git a/networking/ssl_client.c b/networking/ssl_client.c
index e56d82fc1..49aec6b99 100644
--- a/networking/ssl_client.c
+++ b/networking/ssl_client.c
@@ -41,7 +41,6 @@ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
         tls = new_tls_state();
 #if !ENABLE_PLATFORM_MINGW32
         opt = getopt32(argv, "es:+r:+n:", &tls->ofd, &tls->ifd, &sni);
-
         if (!(opt & (1<<2))) {
                 /* -r N defaults to -s N */
                 tls->ifd = tls->ofd;
diff --git a/networking/udhcp/d6_socket.c b/networking/udhcp/d6_socket.c
index 315c8d98a..6ad53a9c2 100644
--- a/networking/udhcp/d6_socket.c
+++ b/networking/udhcp/d6_socket.c
@@ -63,7 +63,7 @@ int FAST_FUNC d6_read_interface(const char *interface, int *ifindex, struct in6_
                 struct ifreq ifr;
                 int fd;
 
-                memset(&ifr, 0, sizeof(ifr));
+                /*memset(&ifr, 0, sizeof(ifr)); - SIOCGIFINDEX does not need to clear all */
                 strncpy_IFNAMSIZ(ifr.ifr_name, interface);
                 fd = xsocket(AF_INET6, SOCK_RAW, IPPROTO_RAW);
                 if (ioctl(fd, SIOCGIFINDEX, &ifr) == 0) {
diff --git a/networking/wget.c b/networking/wget.c
index 194bf457a..aaa068ba9 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -409,7 +409,7 @@ static FILE *open_socket(len_and_sockaddr *lsa)
         /* hopefully it understands what ESPIPE means... */
         fp = fdopen(fd, "r+");
         if (!fp)
-                bb_perror_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
 
         return fp;
 }
@@ -1146,7 +1146,7 @@ static void download_one_url(const char *url)
 # endif
                         sfp = fdopen(fd, "r+");
                         if (!sfp)
-                                bb_perror_msg_and_die(bb_msg_memory_exhausted);
+                                bb_die_memory_exhausted();
                         goto socket_opened;
                 }
                 sfp = open_socket(lsa);
diff --git a/procps/top.c b/procps/top.c
index 075c96c27..1b49a5e6b 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -1157,7 +1157,7 @@ int top_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         while (scan_mask != EXIT_MASK) {
-                unsigned new_mask;
+                IF_FEATURE_TOP_INTERACTIVE(unsigned new_mask;)
                 procps_status_t *p = NULL;
 
                 if (OPT_BATCH_MODE) {
diff --git a/runit/sv.c b/runit/sv.c
index dc5dcceb3..86d181872 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -163,7 +163,7 @@ Exit Codes
 //config:config SV_DEFAULT_SERVICE_DIR
 //config:       string "Default directory for services"
 //config:       default "/var/service"
-//config:       depends on SV
+//config:       depends on SV || SVC || SVOK
 //config:       help
 //config:       Default directory for services.
 //config:       Defaults to "/var/service"
@@ -173,13 +173,22 @@ Exit Codes
 //config:       default y
 //config:       help
 //config:       svc controls the state of services monitored by the runsv supervisor.
-//config:       It is comaptible with daemontools command with the same name.
+//config:       It is compatible with daemontools command with the same name.
+//config:
+//config:config SVOK
+//config:       bool "svok"
+//config:       default y
+//config:       help
+//config:       svok checks whether runsv supervisor is running.
+//config:       It is compatible with daemontools command with the same name.
 
-//applet:IF_SV( APPLET_NOEXEC(sv,  sv,  BB_DIR_USR_BIN, BB_SUID_DROP, sv ))
-//applet:IF_SVC(APPLET_NOEXEC(svc, svc, BB_DIR_USR_BIN, BB_SUID_DROP, svc))
+//applet:IF_SV(  APPLET_NOEXEC(sv,   sv,   BB_DIR_USR_BIN, BB_SUID_DROP, sv  ))
+//applet:IF_SVC( APPLET_NOEXEC(svc,  svc,  BB_DIR_USR_BIN, BB_SUID_DROP, svc ))
+//applet:IF_SVOK(APPLET_NOEXEC(svok, svok, BB_DIR_USR_BIN, BB_SUID_DROP, svok))
 
 //kbuild:lib-$(CONFIG_SV) += sv.o
 //kbuild:lib-$(CONFIG_SVC) += sv.o
+//kbuild:lib-$(CONFIG_SVOK) += sv.o
 
 #include <sys/file.h>
 #include "libbb.h"
@@ -615,7 +624,7 @@ static int sv(char **argv)
         service = argv;
         while ((x = *service) != NULL) {
                 if (x[0] != '/' && x[0] != '.'
-                 && x[0] != '\0' && x[strlen(x) - 1] != '/'
+                 && !last_char_is(x, '/')
                 ) {
                         if (chdir(varservice) == -1)
                                 goto chdir_failed_0;
@@ -742,3 +751,41 @@ int svc_main(int argc UNUSED_PARAM, char **argv)
         return 0;
 }
 #endif
+
+//usage:#define svok_trivial_usage
+//usage:       "SERVICE_DIR"
+//usage:#define svok_full_usage "\n\n"
+//usage:       "Check whether runsv supervisor is running.\n"
+//usage:       "Exit code is 0 if it does, 100 if it does not,\n"
+//usage:       "111 (with error message) if SERVICE_DIR does not exist."
+#if ENABLE_SVOK
+int svok_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int svok_main(int argc UNUSED_PARAM, char **argv)
+{
+        const char *dir = argv[1];
+
+        if (!dir)
+                bb_show_usage();
+
+        xfunc_error_retval = 111;
+
+        /*
+         * daemontools has no concept of "default service dir", runit does.
+         * Let's act as runit.
+         */
+        if (dir[0] != '/' && dir[0] != '.'
+         && !last_char_is(dir, '/')
+        ) {
+                xchdir(CONFIG_SV_DEFAULT_SERVICE_DIR);
+        }
+
+        xchdir(dir);
+        if (open("supervise/ok", O_WRONLY) < 0) {
+                if (errno == ENOENT || errno == ENXIO)
+                        return 100;
+                bb_perror_msg_and_die("can't open '%s'", "supervise/ok");
+        }
+
+        return 0;
+}
+#endif
diff --git a/shell/ash.c b/shell/ash.c
index 2ab46576c..7448b668a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -282,6 +282,12 @@ typedef long arith_t;
 # define IF_NOT_FEATURE_SH_STANDALONE(...) __VA_ARGS__
 #endif
 
+#ifndef F_DUPFD_CLOEXEC
+# define F_DUPFD_CLOEXEC F_DUPFD
+#endif
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
 #ifndef PIPE_BUF
 # define PIPE_BUF 4096           /* amount of buffering in a pipe */
 #endif
@@ -4196,12 +4202,13 @@ setjobctl(int on)
                                         goto out;
                 }
                 /* fd is a tty at this point */
-                fd = fcntl(fd, F_DUPFD, 10);
+                fd = fcntl(fd, F_DUPFD_CLOEXEC, 10);
                 if (ofd >= 0) /* if it is "/dev/tty", close. If 0/1/2, don't */
                         close(ofd);
                 if (fd < 0)
                         goto out; /* F_DUPFD failed */
-                close_on_exec_on(fd);
+                if (F_DUPFD_CLOEXEC == F_DUPFD) /* if old libc (w/o F_DUPFD_CLOEXEC) */
+                        close_on_exec_on(fd);
                 while (1) { /* while we are in the background */
                         pgrp = tcgetpgrp(fd);
                         if (pgrp < 0) {
@@ -5791,13 +5798,14 @@ savefd(int from)
         int newfd;
         int err;
 
-        newfd = fcntl(from, F_DUPFD, 10);
+        newfd = fcntl(from, F_DUPFD_CLOEXEC, 10);
         err = newfd < 0 ? errno : 0;
         if (err != EBADF) {
                 if (err)
                         ash_msg_and_raise_perror("%d", from);
                 close(from);
-                fcntl(newfd, F_SETFD, FD_CLOEXEC);
+                if (F_DUPFD_CLOEXEC == F_DUPFD)
+                        close_on_exec_on(newfd);
         }
 
         return newfd;
@@ -5815,12 +5823,15 @@ dup2_or_raise(int from, int to)
         return newfd;
 }
 static int
-fcntl_F_DUPFD(int fd, int avoid_fd)
+dup_CLOEXEC(int fd, int avoid_fd)
 {
         int newfd;
  repeat:
-        newfd = fcntl(fd, F_DUPFD, avoid_fd + 1);
-        if (newfd < 0) {
+        newfd = fcntl(fd, F_DUPFD_CLOEXEC, avoid_fd + 1);
+        if (newfd >= 0) {
+                if (F_DUPFD_CLOEXEC == F_DUPFD) /* if old libc (w/o F_DUPFD_CLOEXEC) */
+                        close_on_exec_on(newfd);
+        } else { /* newfd < 0 */
                 if (errno == EBUSY)
                         goto repeat;
                 if (errno == EINTR)
@@ -5833,7 +5844,7 @@ xdup_CLOEXEC_and_close(int fd, int avoid_fd)
 {
         int newfd;
  repeat:
-        newfd = fcntl(fd, F_DUPFD, avoid_fd + 1);
+        newfd = fcntl(fd, F_DUPFD_CLOEXEC, avoid_fd + 1);
         if (newfd < 0) {
                 if (errno == EBUSY)
                         goto repeat;
@@ -5844,7 +5855,8 @@ xdup_CLOEXEC_and_close(int fd, int avoid_fd)
                         return fd;
                 ash_msg_and_raise_perror("%d", newfd);
         }
-        fcntl(newfd, F_SETFD, FD_CLOEXEC);
+        if (F_DUPFD_CLOEXEC == F_DUPFD)
+                close_on_exec_on(newfd);
         close(fd);
         return newfd;
 }
@@ -5936,7 +5948,7 @@ save_fd_on_redirect(int fd, int avoid_fd, struct redirtab *sq)
         for (i = 0; sq->two_fd[i].orig_fd != EMPTY; i++) {
                 /* If we collide with an already moved fd... */
                 if (fd == sq->two_fd[i].moved_to) {
-                        new_fd = fcntl_F_DUPFD(fd, avoid_fd);
+                        new_fd = dup_CLOEXEC(fd, avoid_fd);
                         sq->two_fd[i].moved_to = new_fd;
                         TRACE(("redirect_fd %d: already busy, moving to %d\n", fd, new_fd));
                         if (new_fd < 0) /* what? */
@@ -5951,7 +5963,7 @@ save_fd_on_redirect(int fd, int avoid_fd, struct redirtab *sq)
         }
 
         /* If this fd is open, we move and remember it; if it's closed, new_fd = CLOSED (-1) */
-        new_fd = fcntl_F_DUPFD(fd, avoid_fd);
+        new_fd = dup_CLOEXEC(fd, avoid_fd);
         TRACE(("redirect_fd %d: previous fd is moved to %d (-1 if it was closed)\n", fd, new_fd));
         if (new_fd < 0) {
                 if (errno != EBADF)
@@ -7559,7 +7571,7 @@ varvalue(char *name, int varflags, int flags, int *quotedp)
         case '-':
                 expdest = makestrspace(NOPTS, expdest);
                 for (i = NOPTS - 1; i >= 0; i--) {
-                        if (optlist[i]) {
+                        if (optlist[i] && optletters(i)) {
                                 USTPUTC(optletters(i), expdest);
                                 len++;
                         }
@@ -7806,13 +7818,13 @@ hasmeta(const char *p)
                 p = strpbrk(p, chars);
                 if (!p)
                         break;
-                switch ((unsigned char) *p) {
+                switch ((unsigned char)*p) {
                 case CTLQUOTEMARK:
                         for (;;) {
                                 p++;
-                                if (*p == CTLQUOTEMARK)
+                                if ((unsigned char)*p == CTLQUOTEMARK)
                                         break;
-                                if (*p == CTLESC)
+                                if ((unsigned char)*p == CTLESC)
                                         p++;
                                 if (*p == '\0') /* huh? */
                                         return 0;
@@ -11262,7 +11274,7 @@ setinputfile(const char *fname, int flags)
         int fd;
 
         INT_OFF;
-        fd = open(fname, O_RDONLY);
+        fd = open(fname, O_RDONLY | O_CLOEXEC);
         if (fd < 0) {
                 if (flags & INPUT_NOFILE_OK)
                         goto out;
@@ -11271,8 +11283,9 @@ setinputfile(const char *fname, int flags)
         }
         if (fd < 10)
                 fd = savefd(fd);
-        else
+        else if (O_CLOEXEC == 0) /* old libc */
                 close_on_exec_on(fd);
+
         setinputfd(fd, flags & INPUT_PUSH_FILE);
  out:
         INT_ON;
@@ -12595,6 +12608,12 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                         break;
 #endif
                 case CBQUOTE:   /* '`' */
+                        if (checkkwd & CHKEOFMARK) {
+                                quotef = 1;
+                                USTPUTC('`', out);
+                                break;
+                        }
+
                         PARSEBACKQOLD();
                         break;
                 case CENDFILE:
@@ -12727,7 +12746,7 @@ parseredir: {
         np = stzalloc(sizeof(struct nfile));
         if (c == '>') {
                 np->nfile.fd = 1;
-                c = pgetc();
+                c = pgetc_eatbnl();
                 if (c == '>')
                         np->type = NAPPEND;
                 else if (c == '|')
@@ -12749,7 +12768,7 @@ parseredir: {
 #endif
         else { /* c == '<' */
                 /*np->nfile.fd = 0; - stzalloc did it */
-                c = pgetc();
+                c = pgetc_eatbnl();
                 switch (c) {
                 case '<':
                         if (sizeof(struct nfile) != sizeof(struct nhere)) {
@@ -12759,7 +12778,7 @@ parseredir: {
                         np->type = NHERE;
                         heredoc = stzalloc(sizeof(struct heredoc));
                         heredoc->here = np;
-                        c = pgetc();
+                        c = pgetc_eatbnl();
                         if (c == '-') {
                                 heredoc->striptabs = 1;
                         } else {
@@ -12989,23 +13008,13 @@ parsebackq: {
                         int pc;
 
                         setprompt_if(needprompt, 2);
-                        pc = pgetc();
+                        pc = pgetc_eatbnl();
                         switch (pc) {
                         case '`':
                                 goto done;
 
                         case '\\':
-                                pc = pgetc();
-                                if (pc == '\n') {
-                                        nlprompt();
-                                        /*
-                                         * If eating a newline, avoid putting
-                                         * the newline into the new character
-                                         * stream (via the STPUTC after the
-                                         * switch).
-                                         */
-                                        continue;
-                                }
+                                pc = pgetc(); /* or pgetc_eatbnl()? why (example)? */
                                 if (pc != '\\' && pc != '`' && pc != '$'
                                  && (!dblquote || pc != '"')
                                 ) {
@@ -13137,7 +13146,7 @@ xxreadtoken(void)
         }
         setprompt_if(needprompt, 2);
         for (;;) {                      /* until token or start of word found */
-                c = pgetc();
+                c = pgetc_eatbnl();
                 if (c == ' ' || c == '\t' IF_ASH_ALIAS( || c == PEOA))
                         continue;
 
@@ -13146,11 +13155,7 @@ xxreadtoken(void)
                                 continue;
                         pungetc();
                 } else if (c == '\\') {
-                        if (pgetc() != '\n') {
-                                pungetc();
-                                break; /* return readtoken1(...) */
-                        }
-                        nlprompt();
+                        break; /* return readtoken1(...) */
                 } else {
                         const char *p;
 
@@ -13165,7 +13170,7 @@ xxreadtoken(void)
                                         break; /* return readtoken1(...) */
 
                                 if ((int)(p - xxreadtoken_chars) >= xxreadtoken_singles) {
-                                        int cc = pgetc();
+                                        int cc = pgetc_eatbnl();
                                         if (cc == c) {    /* double occurrence? */
                                                 p += xxreadtoken_doubles + 1;
                                         } else {
@@ -13197,7 +13202,7 @@ xxreadtoken(void)
         }
         setprompt_if(needprompt, 2);
         for (;;) {      /* until token or start of word found */
-                c = pgetc();
+                c = pgetc_eatbnl();
                 switch (c) {
                 case ' ': case '\t':
                 IF_ASH_ALIAS(case PEOA:)
@@ -13207,30 +13212,23 @@ xxreadtoken(void)
                                 continue;
                         pungetc();
                         continue;
-                case '\\':
-                        if (pgetc() == '\n') {
-                                nlprompt();
-                                continue;
-                        }
-                        pungetc();
-                        goto breakloop;
                 case '\n':
                         nlnoprompt();
                         RETURN(TNL);
                 case PEOF:
                         RETURN(TEOF);
                 case '&':
-                        if (pgetc() == '&')
+                        if (pgetc_eatbnl() == '&')
                                 RETURN(TAND);
                         pungetc();
                         RETURN(TBACKGND);
                 case '|':
-                        if (pgetc() == '|')
+                        if (pgetc_eatbnl() == '|')
                                 RETURN(TOR);
                         pungetc();
                         RETURN(TPIPE);
                 case ';':
-                        if (pgetc() == ';')
+                        if (pgetc_eatbnl() == ';')
                                 RETURN(TENDCASE);
                         pungetc();
                         RETURN(TSEMI);
@@ -13238,11 +13236,9 @@ xxreadtoken(void)
                         RETURN(TLP);
                 case ')':
                         RETURN(TRP);
-                default:
-                        goto breakloop;
                 }
+                break;
         }
- breakloop:
         return readtoken1(c, BASESYNTAX, (char *)NULL, 0);
 #undef RETURN
 }
diff --git a/shell/ash_test/ash-heredoc/heredoc_backquote1.right b/shell/ash_test/ash-heredoc/heredoc_backquote1.right
new file mode 100644
index 000000000..0be2a3296
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_backquote1.right
@@ -0,0 +1,5 @@
+heredoc1
+Ok1:0
+heredoc2
+EO`false`F
+Ok2:0
diff --git a/shell/ash_test/ash-heredoc/heredoc_backquote1.tests b/shell/ash_test/ash-heredoc/heredoc_backquote1.tests
new file mode 100755
index 000000000..ec3d8fe1d
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_backquote1.tests
@@ -0,0 +1,10 @@
+cat <<EO`true`F
+heredoc1
+EO`true`F
+echo Ok1:$?
+
+cat <<EO`true`F
+heredoc2
+EO`false`F
+EO`true`F
+echo Ok2:$?
diff --git a/shell/ash_test/ash-heredoc/heredoc_backslash1.right b/shell/ash_test/ash-heredoc/heredoc_backslash1.right
new file mode 100644
index 000000000..6a6114821
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_backslash1.right
@@ -0,0 +1,43 @@
+Quoted heredoc:
+a\
+        b
+a\\
+        b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+        -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+
+Unquoted heredoc:
+a       b
+a\
+        b
+ 123456 -qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+        -qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\-\"-\x-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-
+cEOF2
+
+Quoted -heredoc:
+a\
+b
+a\\
+b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+
+Unquoted -heredoc:
+a       b
+a\
+b
+ 123456 -qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+-qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\-\"-\x-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-
+cEOF4
+
+Done: 0
diff --git a/shell/ash_test/ash-heredoc/heredoc_backslash1.tests b/shell/ash_test/ash-heredoc/heredoc_backslash1.tests
new file mode 100755
index 000000000..501af5490
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_backslash1.tests
@@ -0,0 +1,70 @@
+# Test for correct handling of backslashes.
+# Note that some lines in each heredoc start with a tab.
+
+a=qwerty
+
+echo Quoted heredoc:
+cat <<"EOF1"
+a\
+        b
+a\\
+        b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+        -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+EOF1
+echo
+
+echo Unquoted heredoc:
+cat <<EOF2
+a\
+        b
+a\\
+        b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+        -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-')
+c\
+EOF2
+EOF2
+echo
+
+echo Quoted -heredoc:
+cat <<-"EOF3"
+a\
+        b
+a\\
+        b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+        -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+        EOF3
+# In -heredoc case the marker is detected even if it is indented.
+echo
+
+echo Unquoted -heredoc:
+cat <<-EOF4
+a\
+        b
+a\\
+        b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+        -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-')
+c\
+EOF4
+        EOF4
+# The marker is not detected if preceding line ends in backslash.
+# TODO: marker should be detected even if it is split by line continuation:
+# EOF\
+# 4
+# but currently hush doesn't do it. (Tab before "4" is not allowed, though.)
+echo
+
+echo "Done: $?"
diff --git a/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.right b/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.right
new file mode 100644
index 000000000..fdb7ebd03
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.right
@@ -0,0 +1,8 @@
+heredoc0
+Ok0:0
+heredoc1
+Ok1:0
+heredoc2
+Ok2:0
+heredoc3
+Ok4:0
diff --git a/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.tests b/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.tests
new file mode 100755
index 000000000..584edd0e4
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.tests
@@ -0,0 +1,25 @@
+cat <\
+<\
+EOF
+heredoc0
+EOF
+echo Ok0:$?
+
+cat <<\
+ EOF
+heredoc1
+EOF
+echo Ok1:$?
+
+cat <<\
+- EOF
+heredoc2
+        EOF
+echo Ok2:$?
+
+cat <\
+<\
+- EOF
+heredoc3
+        EOF
+echo Ok4:$?
diff --git a/shell/ash_test/ash-parsing/bkslash_newline1.right b/shell/ash_test/ash-parsing/bkslash_newline1.right
new file mode 100644
index 000000000..97ea0c197
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline1.right
@@ -0,0 +1,4 @@
+and1
+and2
+or1
+ok
diff --git a/shell/ash_test/ash-parsing/bkslash_newline1.tests b/shell/ash_test/ash-parsing/bkslash_newline1.tests
new file mode 100755
index 000000000..6e374c4fb
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline1.tests
@@ -0,0 +1,8 @@
+echo and1 &\
+& echo and2
+
+echo or1 |\
+| echo NOT SHOWN
+
+case w in a) echo SKIP;\
+; w) echo ok;; esac;
diff --git a/shell/ash_test/ash-parsing/bkslash_newline2.right b/shell/ash_test/ash-parsing/bkslash_newline2.right
new file mode 100644
index 000000000..c863c5453
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline2.right
@@ -0,0 +1,4 @@
+Line with one backslash:
+\
+
+Ok:0
diff --git a/shell/ash_test/ash-parsing/bkslash_newline2.tests b/shell/ash_test/ash-parsing/bkslash_newline2.tests
new file mode 100755
index 000000000..47d63042d
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline2.tests
@@ -0,0 +1,4 @@
+echo Line with one backslash:
+echo '\
+'
+echo Ok:$?
diff --git a/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.right b/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.right
new file mode 100644
index 000000000..2aead7129
--- /dev/null
+++ b/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.right
@@ -0,0 +1 @@
+\/a\/bc\/def\/file
diff --git a/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.tests b/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.tests
new file mode 100755
index 000000000..64ca0c170
--- /dev/null
+++ b/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.tests
@@ -0,0 +1,2 @@
+var="/a/bc/def/file"
+echo "${var//\//\\/}"
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.right b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.tests b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.tests
new file mode 100755
index 000000000..544c810e3
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+busybox find /proc/self/fd >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.right b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.tests b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.tests
new file mode 100755
index 000000000..43777cade
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+{ busybox find /proc/self/fd; } >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.right b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.tests b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.tests
new file mode 100755
index 000000000..0a21173bd
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+{ busybox find /proc/self/fd; true; } >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/ash_test/ash-vars/var_LINENO1.right b/shell/ash_test/ash-vars/var_LINENO1.right
new file mode 100644
index 000000000..31e1a4478
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_LINENO1.right
@@ -0,0 +1,8 @@
+2:2
+3:3
+4:4
+5:5
+2:2
+3:3
+4:4
+5:5
diff --git a/shell/ash_test/ash-vars/var_LINENO1.tests b/shell/ash_test/ash-vars/var_LINENO1.tests
new file mode 100755
index 000000000..775861e64
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_LINENO1.tests
@@ -0,0 +1,6 @@
+env | grep ^LINENO
+echo 2:$LINENO
+echo 3:$LINENO >&2 \
+| { sleep 0.1; echo 4:$LINENO; }
+echo 5:$LINENO
+test "$1" || . ./var_LINENO1.tests norepeat
diff --git a/shell/hush.c b/shell/hush.c
index 6e64efb70..06fe0e405 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1501,12 +1501,15 @@ static void free_strings(char **strings)
         free(strings);
 }
 
-static int fcntl_F_DUPFD(int fd, int avoid_fd)
+static int dup_CLOEXEC(int fd, int avoid_fd)
 {
         int newfd;
  repeat:
-        newfd = fcntl(fd, F_DUPFD, avoid_fd + 1);
-        if (newfd < 0) {
+        newfd = fcntl(fd, F_DUPFD_CLOEXEC, avoid_fd + 1);
+        if (newfd >= 0) {
+                if (F_DUPFD_CLOEXEC == F_DUPFD) /* if old libc (w/o F_DUPFD_CLOEXEC) */
+                        fcntl(newfd, F_SETFD, FD_CLOEXEC);
+        } else { /* newfd < 0 */
                 if (errno == EBUSY)
                         goto repeat;
                 if (errno == EINTR)
@@ -2691,6 +2694,42 @@ static int i_peek2(struct in_str *i)
         return ch;
 }
 
+static int i_getch_and_eat_bkslash_nl(struct in_str *input)
+{
+        for (;;) {
+                int ch, ch2;
+
+                ch = i_getch(input);
+                if (ch != '\\')
+                        return ch;
+                ch2 = i_peek(input);
+                if (ch2 != '\n')
+                        return ch;
+                /* backslash+newline, skip it */
+                i_getch(input);
+        }
+}
+
+/* Note: this function _eats_ \<newline> pairs, safe to use plain
+ * i_getch() after it instead of i_getch_and_eat_bkslash_nl().
+ */
+static int i_peek_and_eat_bkslash_nl(struct in_str *input)
+{
+        for (;;) {
+                int ch, ch2;
+
+                ch = i_peek(input);
+                if (ch != '\\')
+                        return ch;
+                ch2 = i_peek2(input);
+                if (ch2 != '\n')
+                        return ch;
+                /* backslash+newline, skip it */
+                i_getch(input);
+                i_getch(input);
+        }
+}
+
 static void setup_file_in_str(struct in_str *i, FILE *f)
 {
         memset(i, 0, sizeof(*i));
@@ -3119,7 +3158,7 @@ static int glob_brace(char *pattern, o_string *o, int n)
                                 return o_save_ptr_helper(o, n);
                         }
                         if (gr == GLOB_NOSPACE)
-                                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                                bb_die_memory_exhausted();
                         /* GLOB_ABORTED? Only happens with GLOB_ERR flag,
                          * but we didn't specify it. Paranoia again. */
                         bb_error_msg_and_die("glob error %d on '%s'", gr, pattern);
@@ -3221,7 +3260,7 @@ static int perform_glob(o_string *o, int n)
                         goto literal;
                 }
                 if (gr == GLOB_NOSPACE)
-                        bb_error_msg_and_die(bb_msg_memory_exhausted);
+                        bb_die_memory_exhausted();
                 /* GLOB_ABORTED? Only happens with GLOB_ERR flag,
                  * but we didn't specify it. Paranoia again. */
                 bb_error_msg_and_die("glob error %d on '%s'", gr, pattern);
@@ -3812,16 +3851,28 @@ static int done_word(o_string *word, struct parse_context *ctx)
         if (ctx->pending_redirect) {
                 /* We do not glob in e.g. >*.tmp case. bash seems to glob here
                  * only if run as "bash", not "sh" */
-                /* http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
+                /* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html
                  * "2.7 Redirection
-                 * ...the word that follows the redirection operator
-                 * shall be subjected to tilde expansion, parameter expansion,
-                 * command substitution, arithmetic expansion, and quote
-                 * removal. Pathname expansion shall not be performed
+                 * If the redirection operator is "<<" or "<<-", the word
+                 * that follows the redirection operator shall be
+                 * subjected to quote removal; it is unspecified whether
+                 * any of the other expansions occur. For the other
+                 * redirection operators, the word that follows the
+                 * redirection operator shall be subjected to tilde
+                 * expansion, parameter expansion, command substitution,
+                 * arithmetic expansion, and quote removal.
+                 * Pathname expansion shall not be performed
                  * on the word by a non-interactive shell; an interactive
                  * shell may perform it, but shall do so only when
                  * the expansion would result in one word."
                  */
+//bash does not do parameter/command substitution or arithmetic expansion
+//for _heredoc_ redirection word: these constructs look for exact eof marker
+// as written:
+// <<EOF$t
+// <<EOF$((1))
+// <<EOF`true`  [this case also makes heredoc "quoted", a-la <<"EOF". Probably bash-4.3.43 bug]
+
                 ctx->pending_redirect->rd_filename = xstrdup(word->data);
                 /* Cater for >\file case:
                  * >\a creates file a; >\\a, >"\a", >"\\a" create file \a
@@ -4011,7 +4062,7 @@ static int parse_redirect(struct parse_context *ctx,
                 if (dup_num == REDIRFD_SYNTAX_ERR)
                         return 1;
         } else {
-                int ch = i_peek(input);
+                int ch = i_peek_and_eat_bkslash_nl(input);
                 dup_num = (ch == '-'); /* HEREDOC_SKIPTABS bit is 1 */
                 if (dup_num) { /* <<-... */
                         ch = i_getch(input);
@@ -4021,7 +4072,7 @@ static int parse_redirect(struct parse_context *ctx,
         }
 
         if (style == REDIRECT_OVERWRITE && dup_num == REDIRFD_TO_FILE) {
-                int ch = i_peek(input);
+                int ch = i_peek_and_eat_bkslash_nl(input);
                 if (ch == '|') {
                         /* >|FILE redirect ("clobbering" >).
                          * Since we do not support "set -o noclobber" yet,
@@ -4189,6 +4240,7 @@ static int fetch_heredocs(int heredoc_cnt, struct parse_context *ctx, struct in_
 
                                         redir->rd_type = REDIRECT_HEREDOC2;
                                         /* redir->rd_dup is (ab)used to indicate <<- */
+bb_error_msg("redir->rd_filename:'%s'",  redir->rd_filename);
                                         p = fetch_till_str(&ctx->as_string, input,
                                                         redir->rd_filename, redir->rd_dup);
                                         if (!p) {
@@ -4340,39 +4392,6 @@ static int parse_group(o_string *dest, struct parse_context *ctx,
         /* command remains "open", available for possible redirects */
 }
 
-static int i_getch_and_eat_bkslash_nl(struct in_str *input)
-{
-        for (;;) {
-                int ch, ch2;
-
-                ch = i_getch(input);
-                if (ch != '\\')
-                        return ch;
-                ch2 = i_peek(input);
-                if (ch2 != '\n')
-                        return ch;
-                /* backslash+newline, skip it */
-                i_getch(input);
-        }
-}
-
-static int i_peek_and_eat_bkslash_nl(struct in_str *input)
-{
-        for (;;) {
-                int ch, ch2;
-
-                ch = i_peek(input);
-                if (ch != '\\')
-                        return ch;
-                ch2 = i_peek2(input);
-                if (ch2 != '\n')
-                        return ch;
-                /* backslash+newline, skip it */
-                i_getch(input);
-                i_getch(input);
-        }
-}
-
 #if ENABLE_HUSH_TICK || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_DOLLAR_OPS
 /* Subroutines for copying $(...) and `...` things */
 static int add_till_backquote(o_string *dest, struct in_str *input, int in_dquote);
@@ -4974,8 +4993,14 @@ static struct pipe *parse_stream(char **pstring,
                 nommu_addchr(&ctx.as_string, ch);
 
                 next = '\0';
-                if (ch != '\n')
+                if (ch != '\n') {
                         next = i_peek(input);
+                        /* Can't use i_peek_and_eat_bkslash_nl(input) here:
+                         *  echo '\
+                         *  '
+                         * will break.
+                         */
+                }
 
                 is_special = "{}<>;&|()#'" /* special outside of "str" */
                                 "\\$\"" IF_HUSH_TICK("`") /* always special */
@@ -5178,6 +5203,8 @@ static struct pipe *parse_stream(char **pstring,
                                 goto parse_error;
                         }
                         redir_style = REDIRECT_OVERWRITE;
+                        if (next == '\\')
+                                next = i_peek_and_eat_bkslash_nl(input);
                         if (next == '>') {
                                 redir_style = REDIRECT_APPEND;
                                 ch = i_getch(input);
@@ -5198,6 +5225,8 @@ static struct pipe *parse_stream(char **pstring,
                                 goto parse_error;
                         }
                         redir_style = REDIRECT_INPUT;
+                        if (next == '\\')
+                                next = i_peek_and_eat_bkslash_nl(input);
                         if (next == '<') {
                                 redir_style = REDIRECT_HEREDOC;
                                 heredoc_cnt++;
@@ -5365,7 +5394,7 @@ static struct pipe *parse_stream(char **pstring,
                         /* Eat multiple semicolons, detect
                          * whether it means something special */
                         while (1) {
-                                ch = i_peek(input);
+                                ch = i_peek_and_eat_bkslash_nl(input);
                                 if (ch != ';')
                                         break;
                                 ch = i_getch(input);
@@ -5387,6 +5416,8 @@ static struct pipe *parse_stream(char **pstring,
                         if (done_word(&dest, &ctx)) {
                                 goto parse_error;
                         }
+                        if (next == '\\')
+                                next = i_peek_and_eat_bkslash_nl(input);
                         if (next == '&') {
                                 ch = i_getch(input);
                                 nommu_addchr(&ctx.as_string, ch);
@@ -5403,6 +5434,8 @@ static struct pipe *parse_stream(char **pstring,
                         if (ctx.ctx_res_w == RES_MATCH)
                                 break; /* we are in case's "word | word)" */
 #endif
+                        if (next == '\\')
+                                next = i_peek_and_eat_bkslash_nl(input);
                         if (next == '|') { /* || */
                                 ch = i_getch(input);
                                 nommu_addchr(&ctx.as_string, ch);
@@ -6123,7 +6156,7 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg)
                         } else
                         /* If EXP_FLAG_SINGLEWORD, we handle assignment 'a=....$@.....'
                          * and in this case should treat it like '$*' - see 'else...' below */
-                        if (first_ch == ('@'|0x80)  /* quoted $@ */
+                        if (first_ch == (char)('@'|0x80)  /* quoted $@ */
                          && !(output->o_expflags & EXP_FLAG_SINGLEWORD) /* not v="$@" case */
                         ) {
                                 while (1) {
@@ -6890,7 +6923,7 @@ static struct squirrel *add_squirrel(struct squirrel *sq, int fd, int avoid_fd)
         if (sq) for (; sq[i].orig_fd >= 0; i++) {
                 /* If we collide with an already moved fd... */
                 if (fd == sq[i].moved_to) {
-                        sq[i].moved_to = fcntl_F_DUPFD(sq[i].moved_to, avoid_fd);
+                        sq[i].moved_to = dup_CLOEXEC(sq[i].moved_to, avoid_fd);
                         debug_printf_redir("redirect_fd %d: already busy, moving to %d\n", fd, sq[i].moved_to);
                         if (sq[i].moved_to < 0) /* what? */
                                 xfunc_die();
@@ -6904,7 +6937,7 @@ static struct squirrel *add_squirrel(struct squirrel *sq, int fd, int avoid_fd)
         }
 
         /* If this fd is open, we move and remember it; if it's closed, moved_to = -1 */
-        moved_to = fcntl_F_DUPFD(fd, avoid_fd);
+        moved_to = dup_CLOEXEC(fd, avoid_fd);
         debug_printf_redir("redirect_fd %d: previous fd is moved to %d (-1 if it was closed)\n", fd, moved_to);
         if (moved_to < 0 && errno != EBADF)
                 xfunc_die();
@@ -7622,6 +7655,10 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
                                  */
                                 close_saved_fds_and_FILE_fds();
 //FIXME: should also close saved redir fds
+//This casuses test failures in
+//redir_children_should_not_see_saved_fd_2.tests
+//redir_children_should_not_see_saved_fd_3.tests
+//if you replace "busybox find" with just "find" in them
                                 /* Without this, "rm -i FILE" can't be ^C'ed: */
                                 switch_off_special_sigs(G.special_sig_mask);
                                 debug_printf_exec("running applet '%s'\n", argv[0]);
@@ -8166,6 +8203,12 @@ static NOINLINE int run_pipe(struct pipe *pi)
                 rcode = 1; /* exitcode if redir failed */
                 if (setup_redirects(command, &squirrel) == 0) {
                         debug_printf_exec(": run_list\n");
+//FIXME: we need to pass squirrel down into run_list()
+//for SH_STANDALONE case, or else this construct:
+// { find /proc/self/fd; true; } >FILE; cmd2
+//has no way of closing saved fd#1 for "find",
+//and in SH_STANDALONE mode, "find" is not execed,
+//therefore CLOEXEC on saved fd does not help.
                         rcode = run_list(command->group) & 0xff;
                 }
                 restore_redirects(squirrel);
@@ -9347,7 +9390,7 @@ int hush_main(int argc, char **argv)
                         G_saved_tty_pgrp = 0;
 
                 /* try to dup stdin to high fd#, >= 255 */
-                G_interactive_fd = fcntl_F_DUPFD(STDIN_FILENO, 254);
+                G_interactive_fd = dup_CLOEXEC(STDIN_FILENO, 254);
                 if (G_interactive_fd < 0) {
                         /* try to dup to any fd */
                         G_interactive_fd = dup(STDIN_FILENO);
@@ -9420,10 +9463,10 @@ int hush_main(int argc, char **argv)
 #elif ENABLE_HUSH_INTERACTIVE
         /* No job control compiled in, only prompt/line editing */
         if (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {
-                G_interactive_fd = fcntl_F_DUPFD(STDIN_FILENO, 254);
+                G_interactive_fd = dup_CLOEXEC(STDIN_FILENO, 254);
                 if (G_interactive_fd < 0) {
                         /* try to dup to any fd */
-                        G_interactive_fd = dup(STDIN_FILENO);
+                        G_interactive_fd = dup_CLOEXEC(STDIN_FILENO);
                         if (G_interactive_fd < 0)
                                 /* give up */
                                 G_interactive_fd = 0;
diff --git a/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.right b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.right
new file mode 100644
index 000000000..fdb7ebd03
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.right
@@ -0,0 +1,8 @@
+heredoc0
+Ok0:0
+heredoc1
+Ok1:0
+heredoc2
+Ok2:0
+heredoc3
+Ok4:0
diff --git a/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.tests b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.tests
new file mode 100755
index 000000000..584edd0e4
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.tests
@@ -0,0 +1,25 @@
+cat <\
+<\
+EOF
+heredoc0
+EOF
+echo Ok0:$?
+
+cat <<\
+ EOF
+heredoc1
+EOF
+echo Ok1:$?
+
+cat <<\
+- EOF
+heredoc2
+        EOF
+echo Ok2:$?
+
+cat <\
+<\
+- EOF
+heredoc3
+        EOF
+echo Ok4:$?
diff --git a/shell/hush_test/hush-parsing/bkslash_newline1.right b/shell/hush_test/hush-parsing/bkslash_newline1.right
new file mode 100644
index 000000000..97ea0c197
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline1.right
@@ -0,0 +1,4 @@
+and1
+and2
+or1
+ok
diff --git a/shell/hush_test/hush-parsing/bkslash_newline1.tests b/shell/hush_test/hush-parsing/bkslash_newline1.tests
new file mode 100755
index 000000000..6e374c4fb
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline1.tests
@@ -0,0 +1,8 @@
+echo and1 &\
+& echo and2
+
+echo or1 |\
+| echo NOT SHOWN
+
+case w in a) echo SKIP;\
+; w) echo ok;; esac;
diff --git a/shell/hush_test/hush-parsing/bkslash_newline2.right b/shell/hush_test/hush-parsing/bkslash_newline2.right
new file mode 100644
index 000000000..c863c5453
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline2.right
@@ -0,0 +1,4 @@
+Line with one backslash:
+\
+
+Ok:0
diff --git a/shell/hush_test/hush-parsing/bkslash_newline2.tests b/shell/hush_test/hush-parsing/bkslash_newline2.tests
new file mode 100755
index 000000000..47d63042d
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline2.tests
@@ -0,0 +1,4 @@
+echo Line with one backslash:
+echo '\
+'
+echo Ok:$?
diff --git a/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.right b/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.right
new file mode 100644
index 000000000..2aead7129
--- /dev/null
+++ b/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.right
@@ -0,0 +1 @@
+\/a\/bc\/def\/file
diff --git a/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.tests b/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.tests
new file mode 100755
index 000000000..64ca0c170
--- /dev/null
+++ b/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.tests
@@ -0,0 +1,2 @@
+var="/a/bc/def/file"
+echo "${var//\//\\/}"
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.right b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.tests b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.tests
new file mode 100755
index 000000000..544c810e3
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+busybox find /proc/self/fd >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.right b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.tests b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.tests
new file mode 100755
index 000000000..43777cade
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+{ busybox find /proc/self/fd; } >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.right b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.tests b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.tests
new file mode 100755
index 000000000..0a21173bd
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+{ busybox find /proc/self/fd; true; } >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/hush_test/hush-vars/var_LINENO1.tests b/shell/hush_test/hush-vars/var_LINENO1.tests
index 851b52cf5..775861e64 100755
--- a/shell/hush_test/hush-vars/var_LINENO1.tests
+++ b/shell/hush_test/hush-vars/var_LINENO1.tests
@@ -1,4 +1,4 @@
-env | grep LINENO
+env | grep ^LINENO
 echo 2:$LINENO
 echo 3:$LINENO >&2 \
 | { sleep 0.1; echo 4:$LINENO; }
diff --git a/testsuite/grep.tests b/testsuite/grep.tests
index ed4ba455e..d0b0d2767 100755
--- a/testsuite/grep.tests
+++ b/testsuite/grep.tests
@@ -165,6 +165,12 @@ testing "grep -w word doesn't match wordword" \
         "wordword\n" \
         ""
 
+testing "grep -F -w w doesn't match ww" \
+        "grep -F -w w input" \
+        "" \
+        "ww\n" \
+        ""
+
 testing "grep -w word match second word" \
         "grep -w word input" \
         "bword,word\n""wordb,word\n""bwordb,word\n" \
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index 205d1e42b..558a94a9e 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -70,7 +70,9 @@ int fstrim_main(int argc UNUSED_PARAM, char **argv)
                 ;
 #endif
 
-        opts = getopt32long(argv, "^" "o:l:m:v" "\0" "=1", fstrim_longopts,
+        opts = getopt32long(argv, "^"
+                        "o:l:m:v"
+                        "\0" "=1", fstrim_longopts,
                         &arg_o, &arg_l, &arg_m
         );
 
@@ -85,15 +87,21 @@ int fstrim_main(int argc UNUSED_PARAM, char **argv)
                 range.minlen = xatoull_sfx(arg_m, kmg_i_suffixes);
 
         mp = argv[optind];
-        if (find_block_device(mp)) {
+//Wwhy bother checking that it's a blockdev?
+//      if (find_block_device(mp)) {
                 fd = xopen_nonblocking(mp);
+
+                /* On ENOTTY error, util-linux 2.31 says:
+                 * "fstrim: FILE: the discard operation is not supported"
+                 */
                 xioctl(fd, FITRIM, &range);
+
                 if (ENABLE_FEATURE_CLEAN_UP)
                         close(fd);
 
                 if (opts & OPT_v)
                         printf("%s: %llu bytes trimmed\n", mp, (unsigned long long)range.len);
                 return EXIT_SUCCESS;
-        }
+//      }
         return EXIT_FAILURE;
 }