Merge branch 'busybox' into merge

20 files changed, 271 insertions, 122 deletions

diff --git a/archival/cpio.c b/archival/cpio.c
index a642bbc35..388ba7c4f 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -508,7 +508,6 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
                         goto dump;
                 }
                 /* parent */
-                USE_FOR_NOMMU(argv[-optind][0] &= 0x7f); /* undo fork_or_rexec() damage */
                 xchdir(*argv++);
                 close(pp.wr);
                 xmove_fd(pp.rd, STDIN_FILENO);
diff --git a/archival/unzip.c b/archival/unzip.c
index ff4f6325c..7b945c250 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -56,7 +56,7 @@
 //kbuild:lib-$(CONFIG_UNZIP) += unzip.o
 
 //usage:#define unzip_trivial_usage
-//usage:       "[-lnojpq] FILE[.zip] [FILE]... [-x FILE]... [-d DIR]"
+//usage:       "[-lnojpqK] FILE[.zip] [FILE]... [-x FILE]... [-d DIR]"
 //usage:#define unzip_full_usage "\n\n"
 //usage:       "Extract FILEs from ZIP archive\n"
 //usage:     "\n        -l      List contents (with -q for short form)"
@@ -66,6 +66,7 @@
 //usage:     "\n        -p      Write to stdout"
 //usage:     "\n        -t      Test"
 //usage:     "\n        -q      Quiet"
+//usage:     "\n        -K      Do not clear SUID bit"
 //usage:     "\n        -x FILE Exclude FILEs"
 //usage:     "\n        -d DIR  Extract into DIR"
 
@@ -497,6 +498,7 @@ int unzip_main(int argc, char **argv)
                 OPT_l = (1 << 0),
                 OPT_x = (1 << 1),
                 OPT_j = (1 << 2),
+                OPT_K = (1 << 3),
         };
         unsigned opts;
         smallint quiet = 0;
@@ -560,9 +562,14 @@ int unzip_main(int argc, char **argv)
  *    204372                   1 file
  */
 
+//TODO: accept and ignore these?
+// -a   convert to text files with 't' label, -aa: all files
+// -b   do not convert to text - bbox: we don't convert anything
+// -D   skip restoration of timestamps for extracted items - bbox: we don't restore these (yet?)
+// -X   restore user:group ownership
         opts = 0;
         /* '-' makes getopt return 1 for non-options */
-        while ((i = getopt(argc, argv, "-d:lnotpqxjv")) != -1) {
+        while ((i = getopt(argc, argv, "-d:lnotpqxjvK")) != -1) {
                 switch (i) {
                 case 'd':  /* Extract to base directory */
                         base_dir = optarg;
@@ -584,6 +591,7 @@ int unzip_main(int argc, char **argv)
                         xmove_fd(xopen("/dev/null", O_WRONLY), STDOUT_FILENO);
                         /*fallthrough*/
 
+// NB: -c extract files to stdout/screen (unlike -p, also prints .zip and file names to stdout)
                 case 'p': /* Extract files to stdout */
                         dst_fd = STDOUT_FILENO;
                         /*fallthrough*/
@@ -605,6 +613,10 @@ int unzip_main(int argc, char **argv)
                         opts |= OPT_j;
                         break;
 
+                case 'K':
+                        opts |= OPT_K;
+                        break;
+
                 case 1:
                         if (!src_fn) {
                                 /* The zip file */
@@ -822,7 +834,10 @@ int unzip_main(int argc, char **argv)
 # endif
                         if ((cdf.fmt.version_made_by >> 8) == 3) {
                                 /* This archive is created on Unix */
-                                dir_mode = file_mode = (cdf.fmt.external_attributes >> 16);
+                                file_mode = (cdf.fmt.external_attributes >> 16);
+                                if (!(opts & OPT_K))
+                                        file_mode &= ~(mode_t)(S_ISUID | S_ISGID);
+                                dir_mode = file_mode;
                         }
                 }
 #endif
@@ -847,6 +862,7 @@ int unzip_main(int argc, char **argv)
                 unzip_skip(zip.fmt.extra_len);
 
                 /* Guard against "/abspath", "/../" and similar attacks */
+// NB: UnZip 6.00 has option -: to disable this
                 overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn));
 
                 /* Filter zip entries */
diff --git a/coreutils/printf.c b/coreutils/printf.c
index da129f909..411edd5b9 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -493,7 +493,7 @@ int printf_main(int argc UNUSED_PARAM, char **argv)
         if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2])
                 argv++;
         if (!argv[1]) {
-                if (ENABLE_ASH_PRINTF
+                if ((ENABLE_ASH_PRINTF || ENABLE_HUSH_PRINTF)
                  && applet_name[0] != 'p'
                 ) {
                         bb_simple_error_msg("usage: printf FORMAT [ARGUMENT...]");
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 442841210..667db558d 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -65,15 +65,28 @@ int sleep_main(int argc UNUSED_PARAM, char **argv)
 {
         duration_t duration;
 
+        /* Note: sleep_main may be directly called from ash as a builtin.
+         * This brings some complications:
+         * + we can't use xfunc here
+         * + we can't use bb_show_usage
+         * + applet_name can be the name of the shell
+         */
         ++argv;
-        if (!*argv)
+        if (!*argv) {
+                /* Without this, bare "sleep" in ash shows _ash_ --help */
+                if (ENABLE_ASH_SLEEP && applet_name[0] != 's') {
+                        bb_simple_error_msg("sleep: missing operand");
+                        return EXIT_FAILURE;
+                }
                 bb_show_usage();
+        }
 
         /* GNU sleep accepts "inf", "INF", "infinity" and "INFINITY" */
         if (strncasecmp(argv[0], "inf", 3) == 0)
                 for (;;)
                         sleep(INT_MAX);
 
+//FIXME: in ash, "sleep 123qwerty" as a builtin aborts the shell
 #if ENABLE_FEATURE_FANCY_SLEEP
         duration = 0;
         do {
diff --git a/findutils/find.c b/findutils/find.c
index 2a607d180..a78dd9875 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -180,6 +180,13 @@
 //config:       Without this option, -exec + is a synonym for -exec ;
 //config:       (IOW: it works correctly, but without expected speedup)
 //config:
+//config:config FEATURE_FIND_EXEC_OK
+//config:       bool "Enable -ok: execute confirmed commands"
+//config:       default y
+//config:       depends on FEATURE_FIND_EXEC
+//config:       help
+//config:       Support the 'find -ok' option which prompts before executing.
+//config:
 //config:config FEATURE_FIND_USER
 //config:       bool "Enable -user: username/uid matching"
 //config:       default y
@@ -395,6 +402,9 @@
 //usage:        IF_FEATURE_FIND_EXEC_PLUS(
 //usage:     "\n        -exec CMD ARG + Run CMD with {} replaced by list of file names"
 //usage:        )
+//usage:        IF_FEATURE_FIND_EXEC_OK(
+//usage:     "\n        -ok CMD ARG ;   Prompt and run CMD with {} replaced"
+//usage:        )
 //usage:        IF_FEATURE_FIND_DELETE(
 //usage:     "\n        -delete         Delete current file/directory. Turns on -depth option"
 //usage:        )
@@ -467,6 +477,9 @@ IF_FEATURE_FIND_EXEC(   ACTS(exec,
                                 char **exec_argv; /* -exec ARGS */
                                 unsigned *subst_count;
                                 int exec_argc; /* count of ARGS */
+                                IF_FEATURE_FIND_EXEC_OK(
+                                int ok;         /* -ok */
+                                )
                                 IF_FEATURE_FIND_EXEC_PLUS(
                                         /*
                                          * filelist is NULL if "exec ;"
@@ -802,10 +815,24 @@ static int do_exec(action_exec *ap, const char *fileName)
         }
 # endif
 
+# if ENABLE_FEATURE_FIND_EXEC_OK
+        if (ap->ok) {
+                for (i = 0; argv[i]; i++)
+                        fprintf(stderr, "%s ", argv[i]);
+                fprintf(stderr, "?");
+                if (!bb_ask_y_confirmation()) {
+                        rc = 1; /* "false" */
+                        goto not_ok;
+                }
+        }
+# endif
         rc = spawn_and_wait(argv);
         if (rc < 0)
                 bb_simple_perror_msg(argv[0]);
 
+# if ENABLE_FEATURE_FIND_EXEC_OK
+    not_ok:
+# endif
         i = 0;
         while (argv[i])
                 free(argv[i++]);
@@ -1120,6 +1147,7 @@ static action*** parse_params(char **argv)
         IF_FEATURE_FIND_DELETE( PARM_delete    ,)
         IF_FEATURE_FIND_EMPTY(  PARM_empty     ,)
         IF_FEATURE_FIND_EXEC(   PARM_exec      ,)
+        IF_FEATURE_FIND_EXEC_OK(PARM_ok        ,)
         IF_FEATURE_FIND_EXECUTABLE(PARM_executable,)
         IF_FEATURE_FIND_PAREN(  PARM_char_brace,)
         /* All options/actions starting from here require argument */
@@ -1171,6 +1199,7 @@ static action*** parse_params(char **argv)
         IF_FEATURE_FIND_DELETE( "-delete\0" )
         IF_FEATURE_FIND_EMPTY(  "-empty\0"  )
         IF_FEATURE_FIND_EXEC(   "-exec\0"   )
+        IF_FEATURE_FIND_EXEC_OK("-ok\0"     )
         IF_FEATURE_FIND_EXECUTABLE("-executable\0")
         IF_FEATURE_FIND_PAREN(  "(\0"       )
         /* All options/actions starting from here require argument */
@@ -1351,23 +1380,27 @@ static action*** parse_params(char **argv)
                 }
 #endif
 #if ENABLE_FEATURE_FIND_EXEC
-                else if (parm == PARM_exec) {
+                else if (parm == PARM_exec IF_FEATURE_FIND_EXEC_OK(|| parm == PARM_ok)) {
                         int i;
                         action_exec *ap;
                         IF_FEATURE_FIND_EXEC_PLUS(int all_subst = 0;)
                         dbg("%d", __LINE__);
                         G.need_print = 0;
                         ap = ALLOC_ACTION(exec);
+                        IF_FEATURE_FIND_EXEC_OK(ap->ok = (parm == PARM_ok);)
                         ap->exec_argv = ++argv; /* first arg after -exec */
                         /*ap->exec_argc = 0; - ALLOC_ACTION did it */
                         while (1) {
                                 if (!*argv) /* did not see ';' or '+' until end */
-                                        bb_error_msg_and_die(bb_msg_requires_arg, "-exec");
+                                        bb_error_msg_and_die(bb_msg_requires_arg, arg);
                                 // find -exec echo Foo ">{}<" ";"
                                 // executes "echo Foo >FILENAME<",
                                 // find -exec echo Foo ">{}<" "+"
                                 // executes "echo Foo FILENAME1 FILENAME2 FILENAME3...".
-                                if ((argv[0][0] == ';' || argv[0][0] == '+')
+                                if ((argv[0][0] == ';'
+                                     || (argv[0][0] == '+' IF_FEATURE_FIND_EXEC_OK(&& parm != PARM_ok))
+                                                /* -ok CMD + syntax is not accepted, only with ';' */
+                                    )
                                  && argv[0][1] == '\0'
                                 ) {
 # if ENABLE_FEATURE_FIND_EXEC_PLUS
diff --git a/include/libbb.h b/include/libbb.h
index 2841d7fbf..7683b3f63 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1377,7 +1377,7 @@ enum {
 # define bb_daemonize(flags)                bb_daemonize_or_rexec(flags, bogus)
 #else
   extern bool re_execed;
-  /* Note: re_exec() and fork_or_rexec() do argv[0][0] |= 0x80 on NOMMU!
+  /* Note: re_exec() sets argv[0][0] |= 0x80 on NOMMU!
    * _Parent_ needs to undo it if it doesn't want to have argv[0] mangled.
    */
   void re_exec(char **argv) NORETURN FAST_FUNC;
diff --git a/init/bootchartd.c b/init/bootchartd.c
index ae1ee9d9a..0929890a3 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -435,8 +435,6 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv)
 
         /* parent */
 
-        USE_FOR_NOMMU(argv[0][0] &= 0x7f); /* undo fork_or_rexec() damage */
-
         if (DO_SIGNAL_SYNC) {
                 /* Wait for logger child to set handlers, then unpause it.
                  * Otherwise with short-lived PROG (e.g. "bootchartd start true")
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index 880ffab01..88baf51dc 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -23,6 +23,14 @@ static void cpuid(unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
         );
 }
 static smallint shaNI;
+static int get_shaNI(void)
+{
+        unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
+        cpuid(&eax, &ebx, &ecx, &edx);
+        ebx = ((ebx >> 28) & 2) - 1; /* bit 29 -> 1 or -1 */
+        shaNI = (int)ebx;
+        return (int)ebx;
+}
 void FAST_FUNC sha1_process_block64_shaNI(sha1_ctx_t *ctx);
 void FAST_FUNC sha256_process_block64_shaNI(sha256_ctx_t *ctx);
 #  if defined(__i386__)
@@ -1175,12 +1183,10 @@ void FAST_FUNC sha1_begin(sha1_ctx_t *ctx)
 #if ENABLE_SHA1_HWACCEL
 # if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
         {
-                if (!shaNI) {
-                        unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
-                        cpuid(&eax, &ebx, &ecx, &edx);
-                        shaNI = ((ebx >> 29) << 1) - 1;
-                }
-                if (shaNI > 0)
+                int ni = shaNI;
+                if (!ni)
+                        ni = get_shaNI();
+                if (ni > 0)
                         ctx->process_block = sha1_process_block64_shaNI;
         }
 # endif
@@ -1229,12 +1235,10 @@ void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
 #if ENABLE_SHA256_HWACCEL
 # if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
         {
-                if (!shaNI) {
-                        unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
-                        cpuid(&eax, &ebx, &ecx, &edx);
-                        shaNI = ((ebx >> 29) << 1) - 1;
-                }
-                if (shaNI > 0)
+                int ni = shaNI;
+                if (!ni)
+                        ni = get_shaNI();
+                if (ni > 0)
                         ctx->process_block = sha256_process_block64_shaNI;
         }
 # endif
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 62beb6a5d..3845c0892 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -273,10 +273,12 @@ pid_t FAST_FUNC fork_or_rexec(char **argv)
         /* fflush_all(); ? - so far all callers had no buffered output to flush */
 
         pid = xvfork();
-        if (pid) /* parent */
-                return pid;
-        /* child - re-exec ourself */
-        re_exec(argv);
+        if (pid == 0) /* child - re-exec ourself */
+                re_exec(argv); /* NORETURN */
+
+        /* parent */
+        argv[0][0] &= 0x7f; /* undo re_rexec() damage */
+        return pid;
 }
 #endif
 
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index b61651621..77e42e3fb 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -33,6 +33,9 @@
 #define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
 #ifdef __NR_finit_module
 # define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags)
+# ifndef MODULE_INIT_COMPRESSED_FILE
+#  define MODULE_INIT_COMPRESSED_FILE 4
+# endif
 #endif
 /* linux/include/linux/module.h has limit of 64 chars on module names */
 #undef MODULE_NAME_LEN
@@ -272,7 +275,14 @@ static int load_module(const char *fname, const char *options)
         {
                 int fd = open(fname, O_RDONLY | O_CLOEXEC);
                 if (fd >= 0) {
-                        r = finit_module(fd, options, 0) != 0;
+                        int flags = is_suffixed_with(fname, ".ko") ? 0 : MODULE_INIT_COMPRESSED_FILE;
+                        for (;;) {
+                                r = finit_module(fd, options, flags);
+                                if (r == 0 || flags == 0)
+                                        break;
+                                /* Loading non-.ko named uncompressed module? Not likely, but let's try it */
+                                flags = 0;
+                        }
                         close(fd);
                 }
         }
diff --git a/modutils/modutils.c b/modutils/modutils.c
index f7ad5e805..cbff20961 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -12,6 +12,9 @@
 #define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
 #if defined(__NR_finit_module)
 # define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags)
+# ifndef MODULE_INIT_COMPRESSED_FILE
+#  define MODULE_INIT_COMPRESSED_FILE 4
+# endif
 #endif
 #define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
 
@@ -217,7 +220,14 @@ int FAST_FUNC bb_init_module(const char *filename, const char *options)
         {
                 int fd = open(filename, O_RDONLY | O_CLOEXEC);
                 if (fd >= 0) {
-                        rc = finit_module(fd, options, 0) != 0;
+                        int flags = is_suffixed_with(filename, ".ko") ? 0 : MODULE_INIT_COMPRESSED_FILE;
+                        for (;;) {
+                                rc = finit_module(fd, options, flags);
+                                if (rc == 0 || flags == 0)
+                                        break;
+                                /* Loading non-.ko named uncompressed module? Not likely, but let's try it */
+                                flags = 0;
+                        }
                         close(fd);
                         if (rc == 0)
                                 return rc;
diff --git a/networking/httpd.c b/networking/httpd.c
index b32498ddb..302d1611d 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2475,50 +2475,52 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                         send_headers_and_exit(HTTP_FORBIDDEN);
                 }
                 cgi_type = CGI_NORMAL;
-        }
+        } /* why "else": do not check "cgi-bin/SCRIPT/something" for cases below: */
+        else
 #endif
-
-        if (urlp[-1] == '/') {
-                /* When index_page string is appended to <dir>/ URL, it overwrites
-                 * the query string. If we fall back to call /cgi-bin/index.cgi,
-                 * query string would be lost and not available to the CGI.
-                 * Work around it by making a deep copy.
-                 */
-                if (ENABLE_FEATURE_HTTPD_CGI)
-                        g_query = xstrdup(g_query); /* ok for NULL too */
-                strcpy(urlp, index_page);
-        }
-        if (stat(tptr, &sb) == 0) {
-                /* If URL is a directory with no slash, set up
-                 * "HTTP/1.1 302 Found" "Location: /dir/" reply */
-                if (urlp[-1] != '/' && S_ISDIR(sb.st_mode)) {
-                        found_moved_temporarily = urlcopy;
-                } else {
+        {
+                if (urlp[-1] == '/') {
+                        /* When index_page string is appended to <dir>/ URL, it overwrites
+                         * the query string. If we fall back to call /cgi-bin/index.cgi,
+                         * query string would be lost and not available to the CGI.
+                         * Work around it by making a deep copy.
+                         */
+                        if (ENABLE_FEATURE_HTTPD_CGI)
+                                g_query = xstrdup(g_query); /* ok for NULL too */
+                        strcpy(urlp, index_page);
+                }
+                if (stat(tptr, &sb) == 0) {
+                        /* If URL is a directory with no slash, set up
+                         * "HTTP/1.1 302 Found" "Location: /dir/" reply */
+                        if (urlp[-1] != '/' && S_ISDIR(sb.st_mode)) {
+                                found_moved_temporarily = urlcopy;
+                        } else {
 #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-                        char *suffix = strrchr(tptr, '.');
-                        if (suffix) {
-                                Htaccess *cur;
-                                for (cur = script_i; cur; cur = cur->next) {
-                                        if (strcmp(cur->before_colon + 1, suffix) == 0) {
-                                                cgi_type = CGI_INTERPRETER;
-                                                break;
+                                char *suffix = strrchr(tptr, '.');
+                                if (suffix) {
+                                        Htaccess *cur;
+                                        for (cur = script_i; cur; cur = cur->next) {
+                                                if (strcmp(cur->before_colon + 1, suffix) == 0) {
+                                                        cgi_type = CGI_INTERPRETER;
+                                                        break;
+                                                }
                                         }
                                 }
-                        }
 #endif
-                        file_size = sb.st_size;
-                        last_mod = sb.st_mtime;
+                                file_size = sb.st_size;
+                                last_mod = sb.st_mtime;
+                        }
                 }
-        }
 #if ENABLE_FEATURE_HTTPD_CGI
-        else if (urlp[-1] == '/') {
-                /* It's a dir URL and there is no index.html */
-                /* Is there cgi-bin/index.cgi? */
-                if (access("/cgi-bin/index.cgi"+1, X_OK) != 0)
-                        send_headers_and_exit(HTTP_NOT_FOUND); /* no */
-                cgi_type = CGI_INDEX;
-        }
+                else if (urlp[-1] == '/') {
+                        /* It's a dir URL and there is no index.html */
+                        /* Is there cgi-bin/index.cgi? */
+                        if (access("/cgi-bin/index.cgi"+1, X_OK) != 0)
+                                send_headers_and_exit(HTTP_NOT_FOUND); /* no */
+                        cgi_type = CGI_INDEX;
+                }
 #endif
+        }
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH || ENABLE_FEATURE_HTTPD_CGI
         /* check_user_passwd() would be confused by added .../index.html, truncate it */
@@ -2787,8 +2789,8 @@ static void mini_httpd_nommu(int server_socket, int argc, char **argv)
                         /* Run a copy of ourself in inetd mode */
                         re_exec(argv_copy);
                 }
-                argv_copy[0][0] &= 0x7f;
                 /* parent, or vfork failed */
+                argv_copy[0][0] &= 0x7f; /* undo re_rexec() damage */
                 close(n);
         } /* while (1) */
         /* never reached */
diff --git a/procps/kill.c b/procps/kill.c
index 8c2bc2b6f..583d61aaf 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -85,8 +85,8 @@
  * This brings some complications:
  *
  * + we can't use xfunc here
- * + we can't use applet_name
  * + we can't use bb_show_usage
+ * + applet_name can be the name of the shell
  * (doesn't apply for killall[5], still should be careful b/c NOFORK)
  *
  * kill %n gets translated into kill ' -<process group>' by shell (note space!)
diff --git a/procps/top.c b/procps/top.c
index ff775422c..6d25d9633 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -619,17 +619,15 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width)
         unsigned busy_jifs;
 #endif
 
-        /* what info of the processes is shown */
-        printf(OPT_BATCH_MODE ? "%.*s" : ESC"[7m" "%.*s" ESC"[m", scr_width,
-                "  PID  PPID USER     STAT   VSZ %VSZ"
-                IF_FEATURE_TOP_SMP_PROCESS(" CPU")
-                IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE(" %CPU")
-                " COMMAND");
-        lines_rem--;
-
 #if ENABLE_FEATURE_TOP_DECIMALS
 # define UPSCALE 1000
-# define CALC_STAT(name, val) div_t name = div((val), 10)
+typedef struct { unsigned quot, rem; } bb_div_t;
+/* Used to have "div_t name = div((val), 10)" here
+ * (IOW: intended to use libc-compatible way to divide and use
+ * both result and remainder, but musl does not inline div()...)
+ * Oh well. Modern compilers detect "N/d, N%d" idiom by themselves:
+ */
+# define CALC_STAT(name, val) bb_div_t name = { (val) / 10, (val) % 10 }
 # define SHOW_STAT(name) name.quot, '0'+name.rem
 # define FMT "%3u.%c"
 #else
@@ -638,6 +636,15 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width)
 # define SHOW_STAT(name) name
 # define FMT "%4u%%"
 #endif
+
+        /* what info of the processes is shown */
+        printf(OPT_BATCH_MODE ? "%.*s" : ESC"[7m" "%.*s" ESC"[m", scr_width,
+                "  PID  PPID USER     STAT   VSZ %VSZ"
+                IF_FEATURE_TOP_SMP_PROCESS(" CPU")
+                IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE(" %CPU")
+                " COMMAND");
+        lines_rem--;
+
         /*
          * %VSZ = s->vsz/MemTotal
          */
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 64fd92f06..1ae25c919 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -394,7 +394,11 @@ void parse_dep_file(void *map, size_t len)
                         do p--; while (p != m && !isalnum((unsigned char)*p));
                         p++;
                 }
-                if (p == m) break;
+                if (p < m) {
+                        /* we've consumed the last filename of this list
+                           already.  */
+                        break;
+                }
                 memcpy(s, m, p-m); s[p-m] = 0;
                 if (strrcmp(s, "include/autoconf.h") &&
                     strrcmp(s, "arch/um/include/uml-config.h") &&
diff --git a/shell/ash.c b/shell/ash.c
index 51bf95377..0443f1a02 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2049,16 +2049,18 @@ _STPUTC(int c, char *p)
 /*
  * prefix -- see if pfx is a prefix of string.
  */
-static char *
+static ALWAYS_INLINE char *
 prefix(const char *string, const char *pfx)
 {
+        return is_prefixed_with(string, pfx);
+#if 0  /* dash implementation: */
         while (*pfx) {
                 if (*pfx++ != *string++)
                         return NULL;
         }
         return (char *) string;
+#endif
 }
-
 /*
  * Check for a valid number.  This should be elsewhere.
  */
@@ -2296,7 +2298,7 @@ struct localvar {
 #define VNOFUNC         0x40    /* don't call the callback function */
 #define VNOSET          0x80    /* do not set variable - just readonly test */
 #define VNOSAVE         0x100   /* when text is on the heap before setvareq */
-#if ENABLE_ASH_RANDOM_SUPPORT
+#if ENABLE_ASH_RANDOM_SUPPORT || BASH_EPOCH_VARS
 # define VDYNAMIC       0x200   /* dynamic variable */
 #else
 # define VDYNAMIC       0
@@ -2319,10 +2321,7 @@ change_lc_ctype(const char *value)
 }
 #endif
 #if ENABLE_ASH_MAIL
-static void chkmail(void);
 static void changemail(const char *var_value) FAST_FUNC;
-#else
-# define chkmail()  ((void)0)
 #endif
 static void changepath(const char *) FAST_FUNC;
 #if ENABLE_ASH_RANDOM_SUPPORT
@@ -3407,7 +3406,7 @@ cdcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         if (!*dest)
                 dest = ".";
         path = bltinlookup("CDPATH");
-        while (p = path, (len = padvance(&path, dest)) >= 0) {
+        while (p = path, (len = padvance_magic(&path, dest, 0)) >= 0) {
                 c = *p;
                 p = stalloc(len);
 
@@ -4454,9 +4453,6 @@ getjob(const char *name, int getctl)
         unsigned num;
         int c;
         const char *p;
-#if ENABLE_PLATFORM_POSIX || JOBS_WIN32
-        char *(*match)(const char *, const char *);
-#endif
 
         jp = curjob;
         p = name;
@@ -4498,15 +4494,12 @@ getjob(const char *name, int getctl)
         }
 
 #if ENABLE_PLATFORM_POSIX || JOBS_WIN32
-        match = prefix;
-        if (*p == '?') {
-                match = strstr;
-                p++;
-        }
-
         found = NULL;
         while (jp) {
-                if (match(jp->ps[0].ps_cmd, p)) {
+                if (*p == '?'
+                 ? strstr(jp->ps[0].ps_cmd, p + 1)
+                 : prefix(jp->ps[0].ps_cmd, p)
+                ) {
                         if (found)
                                 goto err;
                         found = jp;
@@ -5802,8 +5795,7 @@ forkchild(struct job *jp, union node *n, int mode)
 
         closescript();
 
-        if (mode == FORK_NOJOB          /* is it `xxx` ? */
-         && n && n->type == NCMD        /* is it single cmd? */
+        if (n && n->type == NCMD        /* is it single cmd? */
         /* && n->ncmd.args->type == NARG - always true? */
          && n->ncmd.args && strcmp(n->ncmd.args->narg.text, "trap") == 0
          && n->ncmd.args->narg.next == NULL /* "trap" with no arguments */
@@ -5897,10 +5889,12 @@ forkchild(struct job *jp, union node *n, int mode)
         ) {
                 TRACE(("Job hack\n"));
                 /* "jobs": we do not want to clear job list for it,
-                 * instead we remove only _its_ own_ job from job list.
+                 * instead we remove only _its_ own_ job from job list
+                 * (if it has one).
                  * This makes "jobs .... | cat" more useful.
                  */
-                freejob(curjob);
+                if (jp)
+                        freejob(curjob);
                 return;
         }
 #endif
@@ -7293,7 +7287,7 @@ evalbackcmd(union node *n, struct backcmd *result
 
         if (pipe(pip) < 0)
                 ash_msg_and_raise_perror("can't create pipe");
-        /* process substitution uses NULL job/node, like openhere() */
+        /* process substitution uses NULL job, like openhere() */
         jp = (ctl == CTLBACKQ) ? makejob(/*n,*/ 1) : NULL;
 #if ENABLE_PLATFORM_MINGW32
         memset(&fs, 0, sizeof(fs));
@@ -7302,9 +7296,9 @@ evalbackcmd(union node *n, struct backcmd *result
         fs.fd[0] = pip[0];
         fs.fd[1] = pip[1];
         fs.fd[2] = ctl;
-        spawn_forkshell(&fs, jp, (ctl == CTLBACKQ) ? n : NULL, FORK_NOJOB);
+        spawn_forkshell(&fs, jp, n, FORK_NOJOB);
 #else
-        if (forkshell(jp, (ctl == CTLBACKQ) ? n : NULL, FORK_NOJOB) == 0) {
+        if (forkshell(jp, n, FORK_NOJOB) == 0) {
                 /* child */
                 FORCE_INT_ON;
                 close(pip[ip]);
@@ -9507,8 +9501,6 @@ describe_command(char *command, const char *path, int describe_command_verbose)
         const struct alias *ap;
 #endif
 
-        path = path ? path : pathval();
-
         if (describe_command_verbose) {
                 out1str(command);
         }
@@ -9533,6 +9525,7 @@ describe_command(char *command, const char *path, int describe_command_verbose)
         }
 #endif
         /* Brute force */
+        path = path ? path : pathval();
         find_command(command, &entry, DO_ABS, path);
 
         switch (entry.cmdtype) {
@@ -12311,15 +12304,14 @@ setinputstring(char *string)
 #if ENABLE_ASH_MAIL
 
 /* Hash of mtimes of mailboxes */
+/* Cleared to 0 if MAIL or MAILPATH is changed */
 static unsigned mailtime_hash;
-/* Set if MAIL or MAILPATH is changed. */
-static smallint mail_var_path_changed;
 
 /*
  * Print appropriate message(s) if mail has arrived.
- * If mail_var_path_changed is set,
- * then the value of MAIL has mail_var_path_changed,
- * so we just update the values.
+ * If mailtime_hash is zero,
+ * then the value of MAIL has changed,
+ * so we just update the hash value.
  */
 static void
 chkmail(void)
@@ -12338,10 +12330,9 @@ chkmail(void)
                 int len;
 
                 len = padvance_magic(&mpath, nullstr, 2);
-                if (!len)
+                if (len < 0)
                         break;
                 p = stackblock();
-                        break;
                 if (*p == '\0')
                         continue;
                 for (q = p; *q; q++)
@@ -12357,21 +12348,24 @@ chkmail(void)
                 /* Very simplistic "hash": just a sum of all mtimes */
                 new_hash += (unsigned)statb.st_mtime;
         }
-        if (!mail_var_path_changed && mailtime_hash != new_hash) {
+        if (mailtime_hash != new_hash) {
                 if (mailtime_hash != 0)
                         out2str("you have mail\n");
                 mailtime_hash = new_hash;
         }
-        mail_var_path_changed = 0;
         popstackmark(&smark);
 }
 
 static void FAST_FUNC
 changemail(const char *val UNUSED_PARAM)
 {
-        mail_var_path_changed = 1;
+        mailtime_hash = 0;
 }
 
+#else
+
+# define chkmail()  ((void)0)
+
 #endif /* ASH_MAIL */
 
 
@@ -14707,7 +14701,7 @@ static char *
 find_dot_file(char *basename)
 {
         char *fullname;
-        const char *path = pathval();
+        const char *path;
         struct stat statb;
         int len;
 
@@ -14715,6 +14709,7 @@ find_dot_file(char *basename)
         if (strchr(basename, '/') IF_PLATFORM_MINGW32(|| strchr(basename, '\\')))
                 return basename;
 
+        path = pathval();
         while ((len = padvance(&path, basename)) >= 0) {
                 fullname = stackblock();
                 if ((!pathopt || *pathopt == 'f')
diff --git a/shell/ash_test/ash-signals/usage.right b/shell/ash_test/ash-signals/usage.right
index c0dbd6c3c..df1ed2dd7 100644
--- a/shell/ash_test/ash-signals/usage.right
+++ b/shell/ash_test/ash-signals/usage.right
@@ -6,6 +6,18 @@ trap -- 'a' INT
 trap -- 'a' USR1
 trap -- 'a' USR2
 ___
+trap -- 'a' EXIT trap -- 'a' INT trap -- 'a' USR1 trap -- 'a' USR2
+___
+trap -- 'a' EXIT
+trap -- 'a' INT
+trap -- 'a' USR1
+trap -- 'a' USR2
+___
+trap -- 'a' EXIT
+trap -- 'a' INT
+trap -- 'a' USR1
+trap -- 'a' USR2
+___
 ___
 trap -- 'a' USR1
 trap -- 'a' USR2
diff --git a/shell/ash_test/ash-signals/usage.tests b/shell/ash_test/ash-signals/usage.tests
index d29c6e74a..34e24cceb 100755
--- a/shell/ash_test/ash-signals/usage.tests
+++ b/shell/ash_test/ash-signals/usage.tests
@@ -10,6 +10,18 @@ trap "a" EXIT INT USR1 USR2
 echo ___
 trap
 
+# show them by command substitution
+echo ___
+echo $(trap)
+
+# show them by pipe
+echo ___
+trap | cat
+
+# show them by process substitution
+echo ___
+cat <(trap)
+
 # clear one
 echo ___
 trap 0 INT
diff --git a/shell/hush.c b/shell/hush.c
index e6be70078..a938cc790 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7468,6 +7468,9 @@ static void re_execute_shell(char ***to_free, const char *s,
                 if (!cur->flg_export || cur->flg_read_only)
                         cnt += 2;
         }
+# if ENABLE_HUSH_LINENO_VAR
+        cnt += 2;
+# endif
 # if ENABLE_HUSH_FUNCTIONS
         for (funcp = G.top_func; funcp; funcp = funcp->next)
                 cnt += 3;
@@ -7489,6 +7492,10 @@ static void re_execute_shell(char ***to_free, const char *s,
                         *pp++ = cur->varstr;
                 }
         }
+# if ENABLE_HUSH_LINENO_VAR
+        *pp++ = (char *) "-L";
+        *pp++ = utoa(G.execute_lineno);
+# endif
 # if ENABLE_HUSH_FUNCTIONS
         for (funcp = G.top_func; funcp; funcp = funcp->next) {
                 *pp++ = (char *) "-F";
@@ -10260,6 +10267,20 @@ int hush_main(int argc, char **argv)
         INIT_G();
         if (EXIT_SUCCESS != 0) /* if EXIT_SUCCESS == 0, it is already done */
                 G.last_exitcode = EXIT_SUCCESS;
+#if !BB_MMU
+        /* "Big heredoc" support via "sh -< STRING" invocation.
+         * Check it first (do not bother to run the usual init code,
+         * it is not needed for this case).
+         */
+        if (argv[1]
+         && argv[1][0] == '-' && argv[1][1] == '<' /*&& !argv[1][2]*/
+         /*&& argv[2] && !argv[3] - we don't check some conditions */
+        ) {
+                full_write1_str(argv[2]);
+                _exit(0);
+        }
+        G.argv0_for_re_execing = argv[0];
+#endif
 #if ENABLE_HUSH_TRAP
 # if ENABLE_HUSH_FUNCTIONS
         G.return_exitcode = -1;
@@ -10270,9 +10291,6 @@ int hush_main(int argc, char **argv)
 #if ENABLE_HUSH_FAST
         G.count_SIGCHLD++; /* ensure it is != G.handled_SIGCHLD */
 #endif
-#if !BB_MMU
-        G.argv0_for_re_execing = argv[0];
-#endif
 
         cached_getpid = getpid();   /* for tcsetpgrp() during init */
         G.root_pid = cached_getpid; /* for $PID  (NOMMU can override via -$HEXPID:HEXPPID:...) */
@@ -10388,7 +10406,10 @@ int hush_main(int argc, char **argv)
                 int opt = getopt(argc, argv, "+" /* stop at 1st non-option */
                                 "cexinsl"
 #if !BB_MMU
-                                "<:$:R:V:"
+                                "$:R:V:"
+# if ENABLE_HUSH_LINENO_VAR
+                                "L:"
+# endif
 # if ENABLE_HUSH_FUNCTIONS
                                 "F:"
 # endif
@@ -10438,9 +10459,6 @@ int hush_main(int argc, char **argv)
                         flags |= OPT_login;
                         break;
 #if !BB_MMU
-                case '<': /* "big heredoc" support */
-                        full_write1_str(optarg);
-                        _exit(0);
                 case '$': {
                         unsigned long long empty_trap_mask;
 
@@ -10490,6 +10508,11 @@ int hush_main(int argc, char **argv)
                 case 'V':
                         set_local_var(xstrdup(optarg), opt == 'R' ? SETFLAG_MAKE_RO : 0);
                         break;
+# if ENABLE_HUSH_LINENO_VAR
+                case 'L':
+                        G.parse_lineno = xatou(optarg);
+                        break;
+# endif
 # if ENABLE_HUSH_FUNCTIONS
                 case 'F': {
                         struct function *funcp = new_function(optarg);
@@ -11276,6 +11299,9 @@ static int FAST_FUNC builtin_local(char **argv)
                 bb_error_msg("%s: not in a function", argv[0]);
                 return EXIT_FAILURE; /* bash compat */
         }
+//TODO? ash and bash support "local -" special form,
+//which saves/restores $- around function call (including async returns, such as ^C)
+//(IOW: it makes "set +/-..." effects local)
         argv++;
         /* Since all builtins run in a nested variable level,
          * need to use level - 1 here. Or else the variable will be removed at once
diff --git a/testsuite/find.tests b/testsuite/find.tests
index 138236c81..d763ca6f2 100755
--- a/testsuite/find.tests
+++ b/testsuite/find.tests
@@ -28,6 +28,12 @@ testing "find -exec exitcode 2" \
         "0\n" \
         "" ""
 SKIP=
+optional FEATURE_FIND_EXEC_OK
+testing "find -ok" \
+        "cd find.tempdir && find testfile -ok true {} ';' 2>&1; echo \$?" \
+        "true testfile ?0\n" \
+        "" "y"
+SKIP=
 # Surprisingly, "-exec false ;" results in exitcode 0! "-exec false +" is different!!!
 optional FEATURE_FIND_EXEC
 testing "find -exec exitcode 3" \