Merge branch 'busybox' into merge

27 files changed, 397 insertions, 182 deletions

diff --git a/Makefile b/Makefile
index 333795e0d..3857dbc95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERSION = 1
-PATCHLEVEL = 36
+PATCHLEVEL = 37
 SUBLEVEL = 0
 EXTRAVERSION = .git
 NAME = Unnamed
diff --git a/Makefile.flags b/Makefile.flags
index bf77c2492..aa6565cf7 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -196,6 +196,9 @@ ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
 ifneq (,$(findstring linux,$(shell $(CC) $(CFLAGS) -dumpmachine)))
 LDLIBS += resolv
 endif
+ifneq (,$(findstring gnu,$(shell $(CC) $(CFLAGS) -dumpmachine)))
+LDLIBS += resolv
+endif
 endif
 
 ifeq ($(CONFIG_EFENCE),y)
diff --git a/archival/unzip.c b/archival/unzip.c
index edfd73652..ff4f6325c 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -121,6 +121,8 @@ typedef union {
 #define FIX_ENDIANNESS_ZIP(zip) \
 do { if (BB_BIG_ENDIAN) { \
         (zip).fmt.method        = SWAP_LE16((zip).fmt.method      ); \
+        (zip).fmt.modtime       = SWAP_LE16((zip).fmt.modtime     ); \
+        (zip).fmt.moddate       = SWAP_LE16((zip).fmt.moddate     ); \
         (zip).fmt.crc32         = SWAP_LE32((zip).fmt.crc32       ); \
         (zip).fmt.cmpsize       = SWAP_LE32((zip).fmt.cmpsize     ); \
         (zip).fmt.ucmpsize      = SWAP_LE32((zip).fmt.ucmpsize    ); \
diff --git a/coreutils/dd.c b/coreutils/dd.c
index a3c9ababf..a704ca99b 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -203,6 +203,7 @@ static void dd_output_status(int UNUSED_PARAM cur_signal)
 }
 
 #if ENABLE_FEATURE_DD_IBS_OBS
+# ifdef O_DIRECT
 static int clear_O_DIRECT(int fd)
 {
         if (errno == EINVAL) {
@@ -214,6 +215,7 @@ static int clear_O_DIRECT(int fd)
         }
         return 0;
 }
+# endif
 #endif
 
 static ssize_t dd_read(void *ibuf, size_t ibs)
@@ -228,8 +230,10 @@ static ssize_t dd_read(void *ibuf, size_t ibs)
 #endif
                 n = safe_read(ifd, ibuf, ibs);
 #if ENABLE_FEATURE_DD_IBS_OBS
+# ifdef O_DIRECT
         if (n < 0 && (G.flags & FLAG_IDIRECT) && clear_O_DIRECT(ifd))
                 goto read_again;
+# endif
 #endif
         return n;
 }
@@ -242,8 +246,10 @@ static bool write_and_stats(const void *buf, size_t len, size_t obs,
  IF_FEATURE_DD_IBS_OBS(write_again:)
         n = full_write(ofd, buf, len);
 #if ENABLE_FEATURE_DD_IBS_OBS
+# ifdef O_DIRECT
         if (n < 0 && (G.flags & FLAG_ODIRECT) && clear_O_DIRECT(ofd))
                 goto write_again;
+# endif
 #endif
 
 #if ENABLE_FEATURE_DD_THIRD_STATUS_LINE
@@ -506,8 +512,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         if (infile) {
                 int iflag = O_RDONLY;
 #if ENABLE_FEATURE_DD_IBS_OBS
-                if (G.flags & FLAG_IDIRECT)
+                if (G.flags & FLAG_IDIRECT) {
+# ifdef O_DIRECT
                         iflag |= O_DIRECT;
+# else
+                        bb_error_msg_and_die("O_DIRECT not supported on this platform");
+# endif
+                }
 #endif
                 xmove_fd(MINGW_SPECIAL(xopen)(infile, iflag), ifd);
 #if ENABLE_PLATFORM_MINGW32
@@ -524,8 +535,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 if (G.flags & FLAG_APPEND)
                         oflag |= O_APPEND;
 #if ENABLE_FEATURE_DD_IBS_OBS
-                if (G.flags & FLAG_ODIRECT)
+                if (G.flags & FLAG_ODIRECT) {
+# ifdef O_DIRECT
                         oflag |= O_DIRECT;
+# else
+                        bb_error_msg_and_die("O_DIRECT not supported on this platform");
+# endif
+                }
 #endif
                 xmove_fd(xopen(outfile, oflag), ofd);
 
diff --git a/coreutils/mv.c b/coreutils/mv.c
index fd2422683..cf6169a1e 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -71,9 +71,9 @@ int mv_main(int argc, char **argv)
                         "no-target-directory\0" No_argument "T"
                         "target-directory\0" Required_argument "t"
                         IF_FEATURE_VERBOSE(
-                        "verbose\0"     No_argument "v",
-                        &last
+                        "verbose\0"     No_argument "v"
                         )
+                        , &last
         );
         argc -= optind;
         argv += optind;
diff --git a/editors/sed.c b/editors/sed.c
index f4a5f7b8a..07f7b7a9b 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -102,7 +102,7 @@ enum {
 
 struct sed_FILE {
         struct sed_FILE *next; /* Next (linked list, NULL terminated) */
-        const char *fname;
+        char *fname;
         FILE *fp;
 };
 
@@ -194,9 +194,6 @@ static void sed_free_and_close_stuff(void)
         while (sed_cmd) {
                 sed_cmd_t *sed_cmd_next = sed_cmd->next;
 
-                if (sed_cmd->sw_file)
-                        fclose(sed_cmd->sw_file);
-
                 /* Used to free regexps, but now there is code
                  * in get_address() which can reuse a regexp
                  * for constructs as /regexp/cmd1;//cmd2
@@ -223,6 +220,18 @@ static void sed_free_and_close_stuff(void)
 
         if (G.current_fp)
                 fclose(G.current_fp);
+
+        if (G.FILE_head) {
+                struct sed_FILE *cur = G.FILE_head;
+                do {
+                        struct sed_FILE *p;
+                        fclose(cur->fp);
+                        free(cur->fname);
+                        p = cur;
+                        cur = cur->next;
+                        free(p);
+                } while (cur);
+        }
 }
 #else
 void sed_free_and_close_stuff(void);
diff --git a/findutils/xargs.c b/findutils/xargs.c
index a0ba89c1e..dd6aa9592 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -114,6 +114,8 @@ struct globals {
 #endif
         const char *eof_str;
         int idx;
+        int fd_tty;
+        int fd_stdin;
 #if ENABLE_FEATURE_XARGS_SUPPORT_PARALLEL
         int running_procs;
         int max_procs;
@@ -147,6 +149,42 @@ struct globals {
         IF_FEATURE_XARGS_SUPPORT_QUOTES(G.process_stdin__q = '\0';) \
 } while (0)
 
+/* Correct regardless of combination of CONFIG_xxx */
+enum {
+        OPTBIT_VERBOSE = 0,
+        OPTBIT_NO_EMPTY,
+        OPTBIT_UPTO_NUMBER,
+        OPTBIT_UPTO_SIZE,
+        OPTBIT_EOF_STRING,
+        OPTBIT_EOF_STRING1,
+        OPTBIT_STDIN_TTY,
+        IF_FEATURE_XARGS_SUPPORT_CONFIRMATION(OPTBIT_INTERACTIVE,)
+        IF_FEATURE_XARGS_SUPPORT_TERMOPT(     OPTBIT_TERMINATE  ,)
+        IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(   OPTBIT_ZEROTERM   ,)
+        IF_FEATURE_XARGS_SUPPORT_REPL_STR(    OPTBIT_REPLSTR    ,)
+        IF_FEATURE_XARGS_SUPPORT_REPL_STR(    OPTBIT_REPLSTR1   ,)
+
+        OPT_VERBOSE     = 1 << OPTBIT_VERBOSE    ,
+        OPT_NO_EMPTY    = 1 << OPTBIT_NO_EMPTY   ,
+        OPT_UPTO_NUMBER = 1 << OPTBIT_UPTO_NUMBER,
+        OPT_UPTO_SIZE   = 1 << OPTBIT_UPTO_SIZE  ,
+        OPT_EOF_STRING  = 1 << OPTBIT_EOF_STRING , /* GNU: -e[<param>] */
+        OPT_EOF_STRING1 = 1 << OPTBIT_EOF_STRING1, /* SUS: -E<param> */
+        OPT_STDIN_TTY   = 1 << OPTBIT_STDIN_TTY,
+        OPT_INTERACTIVE = IF_FEATURE_XARGS_SUPPORT_CONFIRMATION((1 << OPTBIT_INTERACTIVE)) + 0,
+        OPT_TERMINATE   = IF_FEATURE_XARGS_SUPPORT_TERMOPT(     (1 << OPTBIT_TERMINATE  )) + 0,
+        OPT_ZEROTERM    = IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(   (1 << OPTBIT_ZEROTERM   )) + 0,
+        OPT_REPLSTR     = IF_FEATURE_XARGS_SUPPORT_REPL_STR(    (1 << OPTBIT_REPLSTR    )) + 0,
+        OPT_REPLSTR1    = IF_FEATURE_XARGS_SUPPORT_REPL_STR(    (1 << OPTBIT_REPLSTR1   )) + 0,
+};
+#define OPTION_STR "+trn:s:e::E:o" \
+        IF_FEATURE_XARGS_SUPPORT_CONFIRMATION("p") \
+        IF_FEATURE_XARGS_SUPPORT_TERMOPT(     "x") \
+        IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(   "0") \
+        IF_FEATURE_XARGS_SUPPORT_REPL_STR(    "I:i::") \
+        IF_FEATURE_XARGS_SUPPORT_PARALLEL(    "P:+") \
+        IF_FEATURE_XARGS_SUPPORT_ARGS_FILE(   "a:")
+
 
 #if ENABLE_FEATURE_XARGS_SUPPORT_PARALLEL && ENABLE_PLATFORM_MINGW32
 static int wait_for_slot(int *idx)
@@ -206,6 +244,9 @@ static int xargs_exec(void)
 {
         int status;
 
+        if (option_mask32 & OPT_STDIN_TTY)
+                xdup2(G.fd_tty, STDIN_FILENO);
+
 #if !ENABLE_FEATURE_XARGS_SUPPORT_PARALLEL
         status = spawn_and_wait(G.args);
 #else
@@ -310,6 +351,8 @@ static int xargs_exec(void)
  ret:
         if (status != 0)
                 G.xargs_exitcode = status;
+        if (option_mask32 & OPT_STDIN_TTY)
+                xdup2(G.fd_stdin, STDIN_FILENO);
         return status;
 }
 
@@ -628,6 +671,7 @@ static int xargs_ask_confirmation(void)
 //usage:        IF_FEATURE_XARGS_SUPPORT_ARGS_FILE(
 //usage:     "\n        -a FILE Read from FILE instead of stdin"
 //usage:        )
+//usage:     "\n        -o      Reopen stdin as /dev/tty"
 //usage:     "\n        -r      Don't run command if input is empty"
 //usage:     "\n        -t      Print the command on stderr before execution"
 //usage:        IF_FEATURE_XARGS_SUPPORT_CONFIRMATION(
@@ -649,40 +693,6 @@ static int xargs_ask_confirmation(void)
 //usage:       "$ ls | xargs gzip\n"
 //usage:       "$ find . -name '*.c' -print | xargs rm\n"
 
-/* Correct regardless of combination of CONFIG_xxx */
-enum {
-        OPTBIT_VERBOSE = 0,
-        OPTBIT_NO_EMPTY,
-        OPTBIT_UPTO_NUMBER,
-        OPTBIT_UPTO_SIZE,
-        OPTBIT_EOF_STRING,
-        OPTBIT_EOF_STRING1,
-        IF_FEATURE_XARGS_SUPPORT_CONFIRMATION(OPTBIT_INTERACTIVE,)
-        IF_FEATURE_XARGS_SUPPORT_TERMOPT(     OPTBIT_TERMINATE  ,)
-        IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(   OPTBIT_ZEROTERM   ,)
-        IF_FEATURE_XARGS_SUPPORT_REPL_STR(    OPTBIT_REPLSTR    ,)
-        IF_FEATURE_XARGS_SUPPORT_REPL_STR(    OPTBIT_REPLSTR1   ,)
-
-        OPT_VERBOSE     = 1 << OPTBIT_VERBOSE    ,
-        OPT_NO_EMPTY    = 1 << OPTBIT_NO_EMPTY   ,
-        OPT_UPTO_NUMBER = 1 << OPTBIT_UPTO_NUMBER,
-        OPT_UPTO_SIZE   = 1 << OPTBIT_UPTO_SIZE  ,
-        OPT_EOF_STRING  = 1 << OPTBIT_EOF_STRING , /* GNU: -e[<param>] */
-        OPT_EOF_STRING1 = 1 << OPTBIT_EOF_STRING1, /* SUS: -E<param> */
-        OPT_INTERACTIVE = IF_FEATURE_XARGS_SUPPORT_CONFIRMATION((1 << OPTBIT_INTERACTIVE)) + 0,
-        OPT_TERMINATE   = IF_FEATURE_XARGS_SUPPORT_TERMOPT(     (1 << OPTBIT_TERMINATE  )) + 0,
-        OPT_ZEROTERM    = IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(   (1 << OPTBIT_ZEROTERM   )) + 0,
-        OPT_REPLSTR     = IF_FEATURE_XARGS_SUPPORT_REPL_STR(    (1 << OPTBIT_REPLSTR    )) + 0,
-        OPT_REPLSTR1    = IF_FEATURE_XARGS_SUPPORT_REPL_STR(    (1 << OPTBIT_REPLSTR1   )) + 0,
-};
-#define OPTION_STR "+trn:s:e::E:" \
-        IF_FEATURE_XARGS_SUPPORT_CONFIRMATION("p") \
-        IF_FEATURE_XARGS_SUPPORT_TERMOPT(     "x") \
-        IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(   "0") \
-        IF_FEATURE_XARGS_SUPPORT_REPL_STR(    "I:i::") \
-        IF_FEATURE_XARGS_SUPPORT_PARALLEL(    "P:+") \
-        IF_FEATURE_XARGS_SUPPORT_ARGS_FILE(   "a:")
-
 int xargs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int xargs_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -817,6 +827,13 @@ int xargs_main(int argc UNUSED_PARAM, char **argv)
                         store_param(argv[i]);
         }
 
+        if (opt & OPT_STDIN_TTY) {
+                G.fd_tty = xopen(CURRENT_TTY, O_RDONLY);
+                close_on_exec_on(G.fd_tty);
+                G.fd_stdin = dup(STDIN_FILENO);
+                close_on_exec_on(G.fd_stdin);
+        }
+
         initial_idx = G.idx;
         while (1) {
                 char *rem;
diff --git a/include/libbb.h b/include/libbb.h
index 1b1e5cab1..94f0e40ec 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -2007,9 +2007,15 @@ typedef struct line_input_t {
 #  if ENABLE_SHELL_ASH || ENABLE_SHELL_HUSH
         /* function to fetch additional application-specific names to match */
         get_exe_name_t *get_exe_name;
+#  endif
+# endif
+# if (ENABLE_FEATURE_USERNAME_COMPLETION || ENABLE_FEATURE_EDITING_FANCY_PROMPT) \
+  && (ENABLE_SHELL_ASH || ENABLE_SHELL_HUSH)
         /* function to fetch value of shell variable */
         sh_get_var_t *sh_get_var;
-#  endif
+#  define EDITING_HAS_sh_get_var 1
+# else
+#  define EDITING_HAS_sh_get_var 0
 # endif
 # if MAX_HISTORY
         int cnt_history;
diff --git a/libbb/Config.src b/libbb/Config.src
index 66a3ffa23..b980f19a9 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -369,3 +369,25 @@ config UNICODE_PRESERVE_BROKEN
         For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
         at shell prompt will list file named 0xff (single char name
         with char value 255), not file named '?'.
+
+choice
+        prompt "Use LOOP_CONFIGURE for losetup and loop mounts"
+        default TRY_LOOP_CONFIGURE
+        help
+        LOOP_CONFIGURE is added to Linux 5.8
+        https://lwn.net/Articles/820408/
+        This allows userspace to completely setup a loop device with a single
+        ioctl, removing the in-between state where the device can be partially
+        configured - eg the loop device has a backing file associated with it,
+        but is reading from the wrong offset.
+
+config LOOP_CONFIGURE
+        bool "use LOOP_CONFIGURE, needs kernel >= 5.8"
+
+config NO_LOOP_CONFIGURE
+        bool "use LOOP_SET_FD + LOOP_SET_STATUS"
+
+config TRY_LOOP_CONFIGURE
+        bool "try LOOP_CONFIGURE, fall back to LOOP_SET_FD + LOOP_SET_STATUS"
+
+endchoice
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index b4950688e..bee423553 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -249,14 +249,6 @@ static void get_user_strings(void)
         }
 }
 
-static const char *get_username_str(void)
-{
-        if (!got_user_strings)
-                get_user_strings();
-        return user_buf ? user_buf : "";
-        /* btw, bash uses "I have no name!" string if uid has no entry */
-}
-
 static NOINLINE const char *get_homedir_or_NULL(void)
 {
         const char *home;
@@ -275,6 +267,16 @@ static NOINLINE const char *get_homedir_or_NULL(void)
 }
 #endif
 
+#if ENABLE_FEATURE_EDITING_FANCY_PROMPT
+static const char *get_username_str(void)
+{
+        if (!got_user_strings)
+                get_user_strings();
+        return user_buf ? user_buf : "";
+        /* btw, bash uses "I have no name!" string if uid has no entry */
+}
+#endif
+
 #if ENABLE_UNICODE_SUPPORT
 static size_t load_string(const char *src)
 {
@@ -2151,13 +2153,13 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                 case 'W': /* basename of cur dir */
                                         if (!cwd_buf) {
                                                 const char *home;
-#if ENABLE_SHELL_ASH
+# if EDITING_HAS_sh_get_var
                                                 cwd_buf = state->sh_get_var
                                                         ? xstrdup(state->sh_get_var("PWD"))
                                                         : xrealloc_getcwd_or_warn(NULL);
-#else
+# else
                                                 cwd_buf = xrealloc_getcwd_or_warn(NULL);
-#endif
+# endif
                                                 if (!cwd_buf)
                                                         cwd_buf = (char *)bb_msg_unknown;
                                                 else if ((home = get_homedir_or_NULL()) != NULL && home[0]) {
diff --git a/libbb/loop.c b/libbb/loop.c
index cb8fa2442..a0c5d0259 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -71,7 +71,7 @@ int FAST_FUNC del_loop(const char *device)
 
         fd = open(device, O_RDONLY);
         if (fd < 0)
-                return 1;
+                return fd; /* -1 */
         rc = ioctl(fd, LOOP_CLR_FD, 0);
         close(fd);
 
@@ -96,6 +96,97 @@ int FAST_FUNC get_free_loop(void)
         return loopdevno; /* can be -1 if error */
 }
 
+static int get_next_free_loop(char *dev, int id)
+{
+        int loopdevno;
+
+        loopdevno = get_free_loop();
+        if (loopdevno != -1) {
+                /* loopdevno is -2 (use id) or >= 0 (use id = loopdevno): */
+                if (loopdevno >= 0)
+                        id = loopdevno;
+                sprintf(dev, LOOP_FORMAT, id);
+        }
+        return loopdevno;
+}
+
+#if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_LOOP_CONFIGURE
+# define LOOP_CONFIGURE 0x4C0A
+struct bb_loop_config {
+        uint32_t fd;
+        uint32_t block_size;
+        struct loop_info64 info;
+        uint64_t __reserved[8];
+};
+#endif
+
+static int set_loopdev_params(int lfd,
+                int ffd, const char *file,
+                unsigned long long offset,
+                unsigned long long sizelimit,
+                unsigned flags)
+{
+        int rc;
+#if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_LOOP_CONFIGURE
+        struct bb_loop_config lconfig;
+# define loopinfo lconfig.info
+#else
+        bb_loop_info loopinfo;
+#endif
+
+        rc = ioctl(lfd, BB_LOOP_GET_STATUS, &loopinfo);
+
+        /* If device is free, try to claim it */
+        if (rc && errno == ENXIO) {
+#if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_LOOP_CONFIGURE
+                memset(&lconfig, 0, sizeof(lconfig));
+#else
+                memset(&loopinfo, 0, sizeof(loopinfo));
+#endif
+                safe_strncpy((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
+                loopinfo.lo_offset = offset;
+                loopinfo.lo_sizelimit = sizelimit;
+                /*
+                 * LO_FLAGS_READ_ONLY is not set because RO is controlled
+                 * by open type of the lfd.
+                 */
+                loopinfo.lo_flags = (flags & ~BB_LO_FLAGS_READ_ONLY);
+
+#if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_LOOP_CONFIGURE
+                lconfig.fd = ffd;
+                rc = ioctl(lfd, LOOP_CONFIGURE, &lconfig);
+                if (rc == 0)
+                        return rc; /* SUCCESS! */
+# if ENABLE_TRY_LOOP_CONFIGURE
+                if (errno != EINVAL)
+                        return rc; /* error other than old kernel */
+                /* Old kernel, fall through into old way to do it: */
+# endif
+#endif
+#if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_NO_LOOP_CONFIGURE
+                /* Associate free loop device with file */
+                rc = ioctl(lfd, LOOP_SET_FD, ffd);
+                if (rc != 0) {
+                        /* Ouch... race: the device already has a fd */
+                        return rc;
+                }
+                rc = ioctl(lfd, BB_LOOP_SET_STATUS, &loopinfo);
+                if (rc != 0 && (loopinfo.lo_flags & BB_LO_FLAGS_AUTOCLEAR)) {
+                        /* Old kernel, does not support LO_FLAGS_AUTOCLEAR? */
+                        /* (this code path is not tested) */
+                        loopinfo.lo_flags -= BB_LO_FLAGS_AUTOCLEAR;
+                        rc = ioctl(lfd, BB_LOOP_SET_STATUS, &loopinfo);
+                }
+                if (rc == 0)
+                        return rc; /* SUCCESS! */
+                /* failure, undo LOOP_SET_FD */
+                ioctl(lfd, LOOP_CLR_FD, 0); // actually, 0 param is unnecessary
+#endif
+        }
+        return -1;
+#undef loopinfo
+}
+
 /* Returns opened fd to the loop device, <0 on error.
  * *device is loop device to use, or if *device==NULL finds a loop device to
  * mount it on and sets *device to a strdup of that loop device name.
@@ -105,7 +196,6 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
 {
         char dev[LOOP_NAMESIZE];
         char *try;
-        bb_loop_info loopinfo;
         struct stat statbuf;
         int i, lfd, ffd, mode, rc;
 
@@ -123,30 +213,27 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
 
         try = *device;
         if (!try) {
- get_free_loopN:
-                i = get_free_loop();
-                if (i == -1) {
-                        close(ffd);
-                        return -1; /* no free loop devices */
-                }
-                if (i >= 0) {
-                        try = xasprintf(LOOP_FORMAT, i);
-                        goto open_lfd;
-                }
-                /* i == -2: no /dev/loop-control. Do an old-style search for a free device */
                 try = dev;
         }
 
         /* Find a loop device */
         /* 0xfffff is a max possible minor number in Linux circa 2010 */
         for (i = 0; i <= 0xfffff; i++) {
-                sprintf(dev, LOOP_FORMAT, i);
+                if (!*device) {
+                        rc = get_next_free_loop(dev, i);
+                        if (rc == -1)
+                                break; /* no free loop devices (or other error in LOOP_CTL_GET_FREE) */
+                        if (rc >= 0)
+                                /* /dev/loop-control gave us the next free /dev/loopN */
+                                goto open_lfd;
+                        /* else: sequential /dev/loopN, needs to be tested/maybe_created */
+                }
 
                 IF_FEATURE_MOUNT_LOOP_CREATE(errno = 0;)
                 if (stat(try, &statbuf) != 0 || !S_ISBLK(statbuf.st_mode)) {
                         if (ENABLE_FEATURE_MOUNT_LOOP_CREATE
                          && errno == ENOENT
-                         && try == dev
+                         && (!*device)
                         ) {
                                 /* Node doesn't exist, try to create it */
                                 if (mknod(dev, S_IFBLK|0644, makedev(7, i)) == 0)
@@ -172,55 +259,19 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
                         goto try_next_loopN;
                 }
 
-                rc = ioctl(lfd, BB_LOOP_GET_STATUS, &loopinfo);
-
-                /* If device is free, try to claim it */
-                if (rc && errno == ENXIO) {
-                        /* Associate free loop device with file */
-                        if (ioctl(lfd, LOOP_SET_FD, ffd)) {
-                                /* Ouch. Are we racing with other mount? */
-                                if (!*device   /* yes */
-                                 && try != dev /* tried a _kernel-offered_ loopN? */
-                                ) {
-                                        free(try);
-                                        close(lfd);
-//TODO: add "if (--failcount != 0) ..."?
-                                        goto get_free_loopN;
-                                }
-                                goto close_and_try_next_loopN;
-                        }
-                        memset(&loopinfo, 0, sizeof(loopinfo));
-                        safe_strncpy((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
-                        loopinfo.lo_offset = offset;
-                        loopinfo.lo_sizelimit = sizelimit;
-                        /*
-                         * Used by mount to set LO_FLAGS_AUTOCLEAR.
-                         * LO_FLAGS_READ_ONLY is not set because RO is controlled by open type of the file.
-                         * Note that closing LO_FLAGS_AUTOCLEARed lfd before mount
-                         * is wrong (would free the loop device!)
+                rc = set_loopdev_params(lfd, ffd, file, offset, sizelimit, flags);
+                if (rc == 0) {
+                        /* SUCCESS! */
+                        if (!*device)
+                                *device = xstrdup(dev);
+                        /* Note: mount asks for LO_FLAGS_AUTOCLEAR loopdev.
+                         * Closing LO_FLAGS_AUTOCLEARed lfd before mount
+                         * is wrong (would free the loop device!),
+                         * this is why we return without closing it.
                          */
-                        loopinfo.lo_flags = (flags & ~BB_LO_FLAGS_READ_ONLY);
-                        rc = ioctl(lfd, BB_LOOP_SET_STATUS, &loopinfo);
-                        if (rc != 0 && (loopinfo.lo_flags & BB_LO_FLAGS_AUTOCLEAR)) {
-                                /* Old kernel, does not support LO_FLAGS_AUTOCLEAR? */
-                                /* (this code path is not tested) */
-                                loopinfo.lo_flags -= BB_LO_FLAGS_AUTOCLEAR;
-                                rc = ioctl(lfd, BB_LOOP_SET_STATUS, &loopinfo);
-                        }
-                        if (rc == 0) {
-                                /* SUCCESS! */
-                                if (try != dev) /* tried a kernel-offered free loopN? */
-                                        *device = try; /* malloced */
-                                if (!*device)   /* was looping in search of free "/dev/loopN"? */
-                                        *device = xstrdup(dev);
-                                rc = lfd; /* return this */
-                                break;
-                        }
-                        /* failure, undo LOOP_SET_FD */
-                        ioctl(lfd, LOOP_CLR_FD, 0); // actually, 0 param is unnecessary
+                        rc = lfd; /* return this */
+                        break;
                 }
-                /* else: device is not free (rc == 0) or error other than ENXIO */
- close_and_try_next_loopN:
                 close(lfd);
  try_next_loopN:
                 rc = -1;
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 8c8c11c26..7ba7f48fc 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -92,12 +92,17 @@ config FEATURE_UDHCPC_SANITIZEOPT
 config UDHCPC_DEFAULT_SCRIPT
         string "Absolute path to config script"
         default "/usr/share/udhcpc/default.script"
-        depends on UDHCPC || UDHCPC6
+        depends on UDHCPC
         help
         This script is called after udhcpc receives an answer. See
         examples/udhcp for a working example. Normally it is safe
         to leave this untouched.
 
+config UDHCPC6_DEFAULT_SCRIPT
+        string "Absolute path to config script for IPv6"
+        default "/usr/share/udhcpc/default6.script"
+        depends on UDHCPC6
+
 # udhcpc6 config is inserted here:
 INSERT
 
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 5882238e3..49a0b593d 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -370,7 +370,8 @@ void udhcp_sp_setup(void) FAST_FUNC;
 void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC;
 int udhcp_sp_read(void) FAST_FUNC;
 
-int udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac) FAST_FUNC;
+int udhcp_read_interface(const char *interface,
+                int *ifindex, uint32_t *nip, uint8_t *mac) FAST_FUNC;
 
 int udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf) FAST_FUNC;
 
diff --git a/networking/udhcp/d6_common.h b/networking/udhcp/d6_common.h
index 9dfde7709..3cbfbb89e 100644
--- a/networking/udhcp/d6_common.h
+++ b/networking/udhcp/d6_common.h
@@ -63,28 +63,45 @@ struct d6_option {
 
 #define D6_OPT_CLIENTID       1
 #define D6_OPT_SERVERID       2
+/* "Identity Association for Non-temporary Addresses",
+ * also known as a "network interface" in plain English */
 #define D6_OPT_IA_NA          3
-#define D6_OPT_IA_TA          4
+/* "Identity Association for the Temporary Addresses".
+ * Presumably this is a "network interface with only link-local addresses".
+ * Why would DHCPv6 server assign such addresses, I have no idea. */
+//#define D6_OPT_IA_TA          4
+/* "IA Address", an IPv6 address */
 #define D6_OPT_IAADDR         5
+/* Option "Option Request Option". From the owners of a doggy dog named Dog? */
 #define D6_OPT_ORO            6
-#define D6_OPT_PREFERENCE     7
+//#define D6_OPT_PREFERENCE     7
 #define D6_OPT_ELAPSED_TIME   8
-#define D6_OPT_RELAY_MSG      9
-#define D6_OPT_AUTH          11
-#define D6_OPT_UNICAST       12
+//#define D6_OPT_RELAY_MSG      9
+//#define D6_OPT_AUTH          11
+/* "The server sends this option to a client to indicate to the client
+ * that it is allowed to unicast messages to the server."
+ * Contains IPv6 address to send packets to. */
+//#define D6_OPT_UNICAST       12
+/* "A Status Code option may appear in the options field of a DHCP
+ * message and/or in the options field of another option." */
 #define D6_OPT_STATUS_CODE   13
-#define D6_OPT_RAPID_COMMIT  14
-#define D6_OPT_USER_CLASS    15
-#define D6_OPT_VENDOR_CLASS  16
-#define D6_OPT_VENDOR_OPTS   17
-#define D6_OPT_INTERFACE_ID  18
-#define D6_OPT_RECONF_MSG    19
-#define D6_OPT_RECONF_ACCEPT 20
+/* "A client MAY include this option in a Solicit message if the client
+ * is prepared to perform the Solicit-Reply message exchange..." */
+//#define D6_OPT_RAPID_COMMIT  14       /* zero-length option */
+//#define D6_OPT_USER_CLASS    15
+//#define D6_OPT_VENDOR_CLASS  16
+//#define D6_OPT_VENDOR_OPTS   17
+//#define D6_OPT_INTERFACE_ID  18
+//#define D6_OPT_RECONF_MSG    19
+//#define D6_OPT_RECONF_ACCEPT 20
 
 #define D6_OPT_DNS_SERVERS   23
 #define D6_OPT_DOMAIN_LIST   24
 
+/* RFC 3633 "Identity Association for Prefix Delegation".
+ * This option says that client wants to get an IPv6 prefix */
 #define D6_OPT_IA_PD         25
+/* Response from the server comes in this one */
 #define D6_OPT_IAPREFIX      26
 
 /* RFC 4704 "The DHCPv6 Client FQDN Option"
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index c7f130a70..cdd06188e 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -548,7 +548,7 @@ static uint8_t *add_d6_client_options(uint8_t *ptr)
 static int d6_mcast_from_client_data_ifindex(struct d6_packet *packet, uint8_t *end)
 {
         /* FF02::1:2 is "All_DHCP_Relay_Agents_and_Servers" address */
-        static const uint8_t FF02__1_2[16] = {
+        static const uint8_t FF02__1_2[16] ALIGNED(sizeof(long)) = {
                 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02,
         };
@@ -890,7 +890,6 @@ int send_d6_release(struct in6_addr *server_ipv6, struct in6_addr *our_cur_ipv6)
         if (client6_data.ia_pd)
                 opt_ptr = mempcpy(opt_ptr, client6_data.ia_pd, client6_data.ia_pd->len + 2+2);
         /* Client-id */
-///vda
         ci = udhcp_find_option(client_data.options, D6_OPT_CLIENTID, /*dhcpv6:*/ 1);
         if (ci)
                 opt_ptr = mempcpy(opt_ptr, ci->data, D6_OPT_DATA + 2+2 + 6);
@@ -1135,7 +1134,7 @@ static void client_background(void)
 //usage:#define udhcpc6_full_usage "\n"
 //usage:     "\n        -i IFACE        Interface to use (default "CONFIG_UDHCPC_DEFAULT_INTERFACE")"
 //usage:     "\n        -p FILE         Create pidfile"
-//usage:     "\n        -s PROG         Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n        -s PROG         Run PROG at DHCP events (default "CONFIG_UDHCPC6_DEFAULT_SCRIPT")"
 //usage:     "\n        -B              Request broadcast replies"
 //usage:     "\n        -t N            Send up to N discover packets"
 //usage:     "\n        -T SEC          Pause between packets (default 3)"
@@ -1201,7 +1200,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         IF_FEATURE_UDHCP_PORT(SERVER_PORT6 = 547;)
         IF_FEATURE_UDHCP_PORT(CLIENT_PORT6 = 546;)
         client_data.interface = CONFIG_UDHCPC_DEFAULT_INTERFACE;
-        client_data.script = CONFIG_UDHCPC_DEFAULT_SCRIPT;
+        client_data.script = CONFIG_UDHCPC6_DEFAULT_SCRIPT;
         client_data.sockfd = -1;
 
         /* Make sure fd 0,1,2 are open */
@@ -1618,6 +1617,16 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                 prefix_timeout = 0;
                                 option = d6_find_option(packet.d6_options, packet_end, D6_OPT_STATUS_CODE);
                                 if (option && (option->data[0] | option->data[1]) != 0) {
+///FIXME:
+//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//    |       OPTION_STATUS_CODE      |         option-len            |
+//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//    |          status-code          |                               |
+//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               |
+//    .                        status-message                         .
+//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+// so why do we think it's NAK if data[0] is zero but data[1] is not? That's wrong...
+// we should also check that option->len is ok (i.e. not 0), right?
                                         /* return to init state */
                                         bb_info_msg("received DHCP NAK (%u)", option->data[4]);
                                         d6_run_script(packet.d6_options,
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c
index c1949f6e3..142de9b43 100644
--- a/networking/udhcp/d6_packet.c
+++ b/networking/udhcp/d6_packet.c
@@ -27,9 +27,8 @@ void FAST_FUNC d6_dump_packet(struct d6_packet *packet)
 }
 #endif
 
-int FAST_FUNC d6_recv_kernel_packet(struct in6_addr *peer_ipv6
-        UNUSED_PARAM
-        , struct d6_packet *packet, int fd)
+int FAST_FUNC d6_recv_kernel_packet(struct in6_addr *peer_ipv6 UNUSED_PARAM,
+                struct d6_packet *packet, int fd)
 {
         int bytes;
 
@@ -81,12 +80,22 @@ int FAST_FUNC d6_send_raw_packet_from_client_data_ifindex(
         dest_sll.sll_halen = 6;
         memcpy(dest_sll.sll_addr, dest_arp, 6);
 
+//TODO: is bind() necessary? we sendto() to this destination, should work anyway
         if (bind(fd, (struct sockaddr *)&dest_sll, sizeof(dest_sll)) < 0) {
                 msg = "bind(%s)";
                 goto ret_close;
         }
 
         packet.ip6.ip6_vfc = (6 << 4); /* 4 bits version, top 4 bits of tclass */
+// In case we have no IPv6 on our interface at all, we can try
+// to fill "all hosts" mcast address as source:
+//      /* FF02::1 is Link-local "All_Nodes" address */
+//      packet.ip6.ip6_dst.s6_addr[0] = 0xff;
+//      packet.ip6.ip6_dst.s6_addr[1] = 0x02;
+//      packet.ip6.ip6_dst.s6_addr[15] = 0x01;
+// Maybe some servers will be able to respond to us this way?
+// Users report that leaving ::0 address there makes servers try to reply to ::0,
+// which doesn't work.
         if (src_ipv6)
                 packet.ip6.ip6_src = *src_ipv6; /* struct copy */
         packet.ip6.ip6_dst = *dst_ipv6; /* struct copy */
diff --git a/networking/udhcp/d6_socket.c b/networking/udhcp/d6_socket.c
index 21cf61c6e..acf108367 100644
--- a/networking/udhcp/d6_socket.c
+++ b/networking/udhcp/d6_socket.c
@@ -95,9 +95,6 @@ int FAST_FUNC d6_read_interface(
                 close(fd);
         }
 
-        if (retval == 0)
-                return retval;
-
         if (retval & (1<<0))
                 bb_error_msg("can't get %s", "MAC");
         if (retval & (1<<1))
@@ -109,6 +106,7 @@ int FAST_FUNC d6_listen_socket(int port, const char *inf)
 {
         int fd;
         struct sockaddr_in6 addr;
+        char *colon;
 
         log2("opening listen socket on *:%d %s", port, inf);
         fd = xsocket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
@@ -117,10 +115,17 @@ int FAST_FUNC d6_listen_socket(int port, const char *inf)
         if (setsockopt_broadcast(fd) == -1)
                 bb_simple_perror_msg_and_die("SO_BROADCAST");
 
-        /* NB: bug 1032 says this doesn't work on ethernet aliases (ethN:M) */
+        /* SO_BINDTODEVICE doesn't work on ethernet aliases (ethN:M) */
+        colon = strrchr(inf, ':');
+        if (colon)
+                *colon = '\0';
+
         if (setsockopt_bindtodevice(fd, inf))
                 xfunc_die(); /* warning is already printed */
 
+        if (colon)
+                *colon = ':';
+
         memset(&addr, 0, sizeof(addr));
         addr.sin6_family = AF_INET6;
         addr.sin6_port = htons(port);
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 78f580ce9..529978189 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -133,6 +133,7 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
         dest_sll.sll_halen = 6;
         memcpy(dest_sll.sll_addr, dest_arp, 6);
 
+//TODO: is bind() necessary? we sendto() to this destination, should work anyway
         if (bind(fd, (struct sockaddr *)&dest_sll, sizeof(dest_sll)) < 0) {
                 msg = "bind(%s)";
                 goto ret_close;
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 6d25c247e..82e00322f 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -44,7 +44,7 @@
 //usage:     "\n        -P      Match parent process ID"
 //usage:
 //usage:#define pkill_trivial_usage
-//usage:       "[-l|-SIGNAL] [-xfvno] [-s SID|-P PPID|PATTERN]"
+//usage:       "[-l|-SIGNAL] [-xfvnoe] [-s SID|-P PPID|PATTERN]"
 //usage:#define pkill_full_usage "\n\n"
 //usage:       "Send signal to processes selected by regex PATTERN\n"
 //usage:     "\n        -l      List all signals"
@@ -55,6 +55,7 @@
 //usage:     "\n        -v      Negate the match"
 //usage:     "\n        -n      Signal the newest process only"
 //usage:     "\n        -o      Signal the oldest process only"
+//usage:     "\n        -e      Display name and PID of the process being killed"
 
 #include "libbb.h"
 #include "xregex.h"
@@ -64,7 +65,7 @@
 #define pkill (ENABLE_PKILL && (!ENABLE_PGREP || applet_name[1] == 'k'))
 
 enum {
-        /* "vlafxons:+P:+" */
+        /* "vlafxones:+P:+" */
         OPTBIT_V = 0, /* must be first, we need OPT_INVERT = 0/1 */
         OPTBIT_L,
         OPTBIT_A,
@@ -72,6 +73,7 @@ enum {
         OPTBIT_X,
         OPTBIT_O,
         OPTBIT_N,
+        OPTBIT_E, /* should be pkill-only, do we care? */
         OPTBIT_S,
         OPTBIT_P,
 };
@@ -83,6 +85,7 @@ enum {
 #define OPT_ANCHOR      (opt & (1 << OPTBIT_X))
 #define OPT_FIRST       (opt & (1 << OPTBIT_O))
 #define OPT_LAST        (opt & (1 << OPTBIT_N))
+#define OPT_ECHO        (opt & (1 << OPTBIT_E))
 #define OPT_SID         (opt & (1 << OPTBIT_S))
 #define OPT_PPID        (opt & (1 << OPTBIT_P))
 
@@ -93,8 +96,12 @@ static void act(unsigned pid, char *cmd, int signo)
                         printf("%u %s\n", pid, cmd);
                 else
                         printf("%u\n", pid);
-        } else
+        } else {
                 kill(pid, signo);
+                if (option_mask32 & (1 << OPTBIT_E)) {
+                        printf("%s killed (pid %u)\n", cmd, pid);
+                }
+        }
 }
 
 int pgrep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -131,7 +138,7 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
         /* Parse remaining options */
         ppid2match = -1;
         sid2match = -1;
-        opt = getopt32(argv, "vlafxons:+P:+", &sid2match, &ppid2match);
+        opt = getopt32(argv, "vlafxones:+P:+", &sid2match, &ppid2match);
         argv += optind;
 
         if (pkill && OPT_LIST) { /* -l: print the whole signal list */
diff --git a/shell/ash.c b/shell/ash.c
index 13200da0c..6a4b8e273 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10606,7 +10606,7 @@ evalpipe(union node *n, int flags)
 }
 
 /* setinteractive needs this forward reference */
-#if ENABLE_FEATURE_EDITING
+#if ENABLE_FEATURE_TAB_COMPLETION
 static const char *get_builtin_name(int i) FAST_FUNC;
 #endif
 
@@ -10643,8 +10643,12 @@ setinteractive(int on)
 #if ENABLE_FEATURE_EDITING
                 if (!line_input_state) {
                         line_input_state = new_line_input_t(FOR_SHELL | WITH_PATH_LOOKUP);
+# if ENABLE_FEATURE_TAB_COMPLETION
                         line_input_state->get_exe_name = get_builtin_name;
+# endif
+# if EDITING_HAS_sh_get_var
                         line_input_state->sh_get_var = lookupvar;
+# endif
                 }
 #endif
         }
@@ -10888,7 +10892,7 @@ mklocal(char *name, int flags)
                                 setvareq(name, flags);
                         else
                                 /* "local VAR" unsets VAR: */
-                                setvar0(name, NULL);
+                                unsetvar(name);
                 }
         }
         lvp->vp = vp;
@@ -11157,7 +11161,7 @@ find_builtin(const char *name)
         return bp;
 }
 
-#if ENABLE_FEATURE_EDITING
+#if ENABLE_FEATURE_TAB_COMPLETION
 static const char * FAST_FUNC
 get_builtin_name(int i)
 {
diff --git a/shell/hush.c b/shell/hush.c
index 051b123e7..d111f0cc5 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2460,10 +2460,15 @@ static int set_local_var(char *str, unsigned flags)
         return retval;
 }
 
+static int set_local_var0(char *str)
+{
+        return set_local_var(str, 0);
+}
+
 static void FAST_FUNC set_local_var_from_halves(const char *name, const char *val)
 {
         char *var = xasprintf("%s=%s", name, val);
-        set_local_var(var, /*flag:*/ 0);
+        set_local_var0(var);
 }
 
 /* Used at startup and after each cd */
@@ -6964,7 +6969,7 @@ static NOINLINE int expand_one_var(o_string *output, int n,
                                                         val = NULL;
                                                 } else {
                                                         char *new_var = xasprintf("%s=%s", var, val);
-                                                        set_local_var(new_var, /*flag:*/ 0);
+                                                        set_local_var0(new_var);
                                                 }
                                         }
                                 }
@@ -8188,7 +8193,7 @@ static const struct built_in_command *find_builtin(const char *name)
         return find_builtin_helper(name, bltins2, &bltins2[ARRAY_SIZE(bltins2)]);
 }
 
-#if ENABLE_HUSH_JOB && ENABLE_FEATURE_EDITING
+#if ENABLE_HUSH_JOB && ENABLE_FEATURE_TAB_COMPLETION
 static const char * FAST_FUNC get_builtin_name(int i)
 {
         if (/*i >= 0 && */ i < ARRAY_SIZE(bltins1)) {
@@ -9373,7 +9378,7 @@ static NOINLINE int run_pipe(struct pipe *pi)
                                 }
 #endif
                                 debug_printf_env("set shell var:'%s'->'%s'\n", *argv, p);
-                                if (set_local_var(p, /*flag:*/ 0)) {
+                                if (set_local_var0(p)) {
                                         /* assignment to readonly var / putenv error? */
                                         rcode = 1;
                                 }
@@ -9856,7 +9861,7 @@ static int run_list(struct pipe *pi)
                         }
                         /* Insert next value from for_lcur */
                         /* note: *for_lcur already has quotes removed, $var expanded, etc */
-                        set_local_var(xasprintf("%s=%s", pi->cmds[0].argv[0], *for_lcur++), /*flag:*/ 0);
+                        set_local_var_from_halves(pi->cmds[0].argv[0], *for_lcur++);
                         continue;
                 }
                 if (rword == RES_IN) {
@@ -10668,8 +10673,12 @@ int hush_main(int argc, char **argv)
 
 # if ENABLE_FEATURE_EDITING
                 G.line_input_state = new_line_input_t(FOR_SHELL);
+#  if ENABLE_FEATURE_TAB_COMPLETION
                 G.line_input_state->get_exe_name = get_builtin_name;
+#  endif
+#  if EDITING_HAS_sh_get_var
                 G.line_input_state->sh_get_var = get_local_var_value;
+#  endif
 # endif
 # if ENABLE_HUSH_SAVEHISTORY && MAX_HISTORY > 0
                 {
diff --git a/testsuite/mount.tests b/testsuite/mount.tests
index b6d5ebe08..7370805cd 100755
--- a/testsuite/mount.tests
+++ b/testsuite/mount.tests
@@ -104,12 +104,24 @@ mount -r -o loop -t ext2 z1/e2img z2       || { echo 'mount -r -o loop error'; e
 mount -o remount,ro z1                     || { echo 'mount -o remount,ro error'; exit 1; }
 )
 umount -d mount.dir/z2
-##losetup -d /dev/loop*
+##sleep 0.1
 umount -d mount.dir/z1
 rm -rf mount.dir
 echo DONE
 " \
 "DONE\n" "" ""
 
+# On 5.18.0, "umount -d mount.dir/z1" above fails.
+# (It would work with "sleep 0.1" - looks like z1/e2img
+# is momentarily keeping z1 mountpoint busy, even though
+# the "umount" which freed z1/e2img from being the base
+# of z2 mountpoint has returned).
+# Fixing the mess if it did fail:
+if test -d mount.dir/z1; then
+        ls -ld mount.dir/z1/* mount.dir/z1
+        sleep 1
+        umount -d mount.dir/z1
+        rmdir mount.dir/z1 mount.dir
+fi
 
 exit $FAILCOUNT
diff --git a/testsuite/sha1sum.tests b/testsuite/sha1sum.tests
index 7ad1334c3..e6ddb2a86 100755
--- a/testsuite/sha1sum.tests
+++ b/testsuite/sha1sum.tests
@@ -4,10 +4,12 @@
 
 # testing "test name" "cmd" "expected result" "file input" "stdin"
 >EMPTY
+optional FEATURE_MD5_SHA1_SUM_CHECK
 testing "sha1sum: one-space separated input for -c" \
         'echo "da39a3ee5e6b4b0d3255bfef95601890afd80709 EMPTY" | sha1sum -c' \
         "EMPTY: OK\n" \
         "" ""
+SKIP=
 rm EMPTY
 
 . ./md5sum.tests sha1sum d41337e834377140ae7f98460d71d908598ef04f
diff --git a/testsuite/tree.tests b/testsuite/tree.tests
index 4f4a9e30b..1fa66da80 100755
--- a/testsuite/tree.tests
+++ b/testsuite/tree.tests
@@ -18,6 +18,8 @@ tree.tempdir [error opening dir]\n\
 mkdir -p tree2.tempdir
 touch tree2.tempdir/testfile
 
+optional UNICODE_SUPPORT
+
 testing "tree single file" \
         "cd tree2.tempdir && tree" \
         "\
@@ -50,17 +52,17 @@ testing "tree nested directories and files" \
 .\n\
 ├── test1\n\
 ├── test2\n\
-│   ├── a\n\
-│   │   ├── testfile1\n\
-│   │   ├── testfile2\n\
-│   │   ├── testfile3\n\
-│   │   └── testfile4 -> ../b/testfile4\n\
-│   └── b\n\
-│       ├── test3 -> ../../test3\n\
-│       └── testfile4\n\
+│   ├── a\n\
+│   │   ├── testfile1\n\
+│   │   ├── testfile2\n\
+│   │   ├── testfile3\n\
+│   │   └── testfile4 -> ../b/testfile4\n\
+│   └── b\n\
+│       ├── test3 -> ../../test3\n\
+│       └── testfile4\n\
 └── test3\n\
     ├── c\n\
-    │   └── testfile5\n\
+    │   └── testfile5\n\
     └── d\n\
         └── testfile6\n\
 \n\
@@ -77,17 +79,17 @@ tree2.tempdir\n\
 tree3.tempdir\n\
 ├── test1\n\
 ├── test2\n\
-│   ├── a\n\
-│   │   ├── testfile1\n\
-│   │   ├── testfile2\n\
-│   │   ├── testfile3\n\
-│   │   └── testfile4 -> ../b/testfile4\n\
-│   └── b\n\
-│       ├── test3 -> ../../test3\n\
-│       └── testfile4\n\
+│   ├── a\n\
+│   │   ├── testfile1\n\
+│   │   ├── testfile2\n\
+│   │   ├── testfile3\n\
+│   │   └── testfile4 -> ../b/testfile4\n\
+│   └── b\n\
+│       ├── test3 -> ../../test3\n\
+│       └── testfile4\n\
 └── test3\n\
     ├── c\n\
-    │   └── testfile5\n\
+    │   └── testfile5\n\
     └── d\n\
         └── testfile6\n\
 \n\
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 41cc29f37..768ab80eb 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -518,7 +518,13 @@ int fbset_main(int argc, char **argv)
                         case CMD_DEPTH:
                                 var_set.bits_per_pixel = xatou32(argv[1]);
                                 break;
+                        case CMD_PIXCLOCK:
+                                var_set.pixclock = xatou32(argv[1]);
+                                break;
 #endif
+                        default:
+                                bb_perror_msg_and_die("option '%s' not handled",
+                                                      g_cmdoptions[i].name);
                         }
                         switch (g_cmdoptions[i].code) {
                         case CMD_FB:
diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c
index 9173f5d43..9738a76ad 100644
--- a/util-linux/hexdump_xxd.c
+++ b/util-linux/hexdump_xxd.c
@@ -41,7 +41,7 @@
 //    -u          use upper case hex letters.
 
 //usage:#define xxd_trivial_usage
-//usage:       "[-pri] [-g N] [-c N] [-n LEN] [-s OFS] [-o OFS] [FILE]"
+//usage:       "[-pri] [-g N] [-c N] [-l LEN] [-s OFS] [-o OFS] [FILE]"
 //usage:#define xxd_full_usage "\n\n"
 //usage:       "Hex dump FILE (or stdin)\n"
 //usage:     "\n        -g N            Bytes per group"
@@ -78,7 +78,7 @@ static void write_zeros(off_t count)
         do {
                 unsigned sz = count < COMMON_BUFSIZE ? (unsigned)count : COMMON_BUFSIZE;
                 if (fwrite(fillbuf, 1, sz, stdout) != sz)
-                        bb_perror_msg_and_die("write error");
+                        bb_simple_perror_msg_and_die("write error");
                 count -= sz;
         } while (count != 0);
 }
@@ -120,7 +120,7 @@ static void reverse(unsigned opt, const char *filename, char *opt_s)
                         if (ofs != cur) {
                                 if (fseeko(stdout, ofs, SEEK_SET) != 0) {
                                         if (ofs < cur)
-                                                bb_perror_msg_and_die("cannot seek");
+                                                bb_simple_perror_msg_and_die("cannot seek");
                                         write_zeros(ofs - cur);
                                 }
                                 cur = ofs;
@@ -229,11 +229,8 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
 {
         char buf[80];
         dumper_t *dumper;
-#if !ENABLE_PLATFORM_MINGW32
-        char *opt_l, *opt_s, *opt_o;
-#else
-        char *opt_l, *opt_s = NULL, *opt_o;
-#endif
+        char *opt_l, *opt_o;
+        char *opt_s = NULL;
         unsigned bytes = 2;
         unsigned cols = 0;
         unsigned opt;
diff --git a/util-linux/more.c b/util-linux/more.c
index a9ea76ab4..07275131e 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -87,11 +87,12 @@ int more_main(int argc UNUSED_PARAM, char **argv)
         /* Parse options */
         /* Accepted but ignored: */
         /* -d   Display help instead of ringing bell */
+        /* -e   Exit immediately after writing the last line */
         /* -f   Count logical lines (IOW: long lines are not folded) */
         /* -l   Do not pause after any line containing a ^L (form feed) */
         /* -s   Squeeze blank lines into one */
         /* -u   Suppress underlining */
-        getopt32(argv, "dflsu");
+        getopt32(argv, "deflsu");
         argv += optind;
 
         /* Another popular pager, most, detects when stdout