Merge branch 'busybox' into merge

16 files changed, 299 insertions, 140 deletions

diff --git a/editors/vi.c b/editors/vi.c
index d5d7dfffc..2a7d9f0a8 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -345,7 +345,8 @@ struct globals {
 
         /* a few references only */
 #if ENABLE_FEATURE_VI_YANKMARK
-        int YDreg, Ureg;        // default delete register and orig line for "U"
+        smalluint YDreg;//,Ureg;// default delete register and orig line for "U"
+#define Ureg 27
         char *reg[28];          // named register a-z, "D", and "U" 0-25,26,27
         char *mark[28];         // user marks points somewhere in text[]-  a-z and previous context ''
         char *context_start, *context_end;
@@ -457,7 +458,7 @@ struct globals {
 #define format_edit_status__tot (G.format_edit_status__tot)
 
 #define YDreg          (G.YDreg         )
-#define Ureg           (G.Ureg          )
+//#define Ureg           (G.Ureg          )
 #define mark           (G.mark          )
 #define context_start  (G.context_start )
 #define context_end    (G.context_end   )
@@ -796,7 +797,7 @@ static void edit_file(char *fn)
 
 #if ENABLE_FEATURE_VI_YANKMARK
         YDreg = 26;                     // default Yank/Delete reg
-        Ureg = 27;                      // hold orig line for "U" cmd
+//      Ureg = 27; - const              // hold orig line for "U" cmd
         mark[26] = mark[27] = text;     // init "previous context"
 #endif
 
@@ -3410,7 +3411,15 @@ static void refresh(int full_screen)
         if (ENABLE_FEATURE_VI_WIN_RESIZE IF_FEATURE_VI_ASK_TERMINAL(&& !G.get_rowcol_error) ) {
                 unsigned c = columns, r = rows;
                 query_screen_dimensions();
+#if ENABLE_FEATURE_VI_USE_SIGNALS
                 full_screen |= (c - columns) | (r - rows);
+#else
+                if (c != columns || r != rows) {
+                        full_screen = TRUE;
+                        /* update screen memory since SIGWINCH won't have done it */
+                        new_screen(rows, columns);
+                }
+#endif
         }
         sync_cursor(dot, &crow, &ccol); // where cursor will be (on "dot")
         tp = screenbegin;       // index into text[] of top line
@@ -4236,8 +4245,8 @@ static void do_cmd(int c)
                                 if (*p == '\n')
                                         cnt++;
                         }
-                        status_line("%s %d lines (%d chars) using [%c]",
-                                buf, cnt, strlen(reg[YDreg]), what_reg());
+                        status_line("%s %u lines (%u chars) using [%c]",
+                                buf, cnt, (unsigned)strlen(reg[YDreg]), what_reg());
 #endif
                         end_cmd_q();    // stop adding to q
                 }
diff --git a/include/libbb.h b/include/libbb.h
index b9852345f..05a0c575c 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1341,9 +1341,13 @@ llist_t *llist_find_str(llist_t *first, const char *str) FAST_FUNC;
 /* True only if we created pidfile which is *file*, not /dev/null etc */
 extern smallint wrote_pidfile;
 void write_pidfile(const char *path) FAST_FUNC;
+void write_pidfile_std_path_and_ext(const char *path) FAST_FUNC;
+void remove_pidfile_std_path_and_ext(const char *path) FAST_FUNC;
 #define remove_pidfile(path) do { if (wrote_pidfile) unlink(path); } while (0)
 #else
 enum { wrote_pidfile = 0 };
+#define write_pidfile_std_path_and_ext(path)  ((void)0)
+#define remove_pidfile_std_path_and_ext(path) ((void)0)
 #define write_pidfile(path)  ((void)0)
 #define remove_pidfile(path) ((void)0)
 #endif
@@ -1386,7 +1390,7 @@ void bb_logenv_override(void) FAST_FUNC;
 
 /* Embedded script support */
 char *get_script_content(unsigned n) FAST_FUNC;
-int scripted_main(int argc, char** argv);
+int scripted_main(int argc, char** argv) MAIN_EXTERNALLY_VISIBLE;
 
 /* Applets which are useful from another applets */
 int bb_cat(char** argv) FAST_FUNC;
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 58e391fd9..1f1a18aab 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -814,6 +814,7 @@ static int find_script_by_name(const char *name)
         return -1;
 }
 
+int scripted_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int scripted_main(int argc UNUSED_PARAM, char **argv)
 {
         int script = find_script_by_name(applet_name);
diff --git a/libbb/pidfile.c b/libbb/pidfile.c
index a48dfc38b..a6a282562 100644
--- a/libbb/pidfile.c
+++ b/libbb/pidfile.c
@@ -38,3 +38,21 @@ void FAST_FUNC write_pidfile(const char *path)
         }
         close(pid_fd);
 }
+
+void FAST_FUNC write_pidfile_std_path_and_ext(const char *name)
+{
+        char buf[sizeof(CONFIG_PID_FILE_PATH) + 64];
+
+        snprintf(buf, sizeof(buf), CONFIG_PID_FILE_PATH"/%s.pid", name);
+        write_pidfile(buf);
+}
+
+void FAST_FUNC remove_pidfile_std_path_and_ext(const char *name)
+{
+        char buf[sizeof(CONFIG_PID_FILE_PATH) + 64];
+
+        if (!wrote_pidfile)
+                return;
+        snprintf(buf, sizeof(buf), CONFIG_PID_FILE_PATH"/%s.pid", name);
+        unlink(buf);
+}
diff --git a/miscutils/crond.c b/miscutils/crond.c
index 2e36c406b..25e5503c7 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -1056,7 +1056,7 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
 
         log8("crond (busybox "BB_VER") started, log level %d", G.log_level);
         rescan_crontab_dir();
-        write_pidfile(CONFIG_PID_FILE_PATH "/crond.pid");
+        write_pidfile_std_path_and_ext("crond");
 #if ENABLE_FEATURE_CROND_SPECIAL_TIMES
         if (touch_reboot_file())
                 start_jobs(START_ME_REBOOT); /* start @reboot entries, if any */
diff --git a/miscutils/man.c b/miscutils/man.c
index 0bc11e623..6724b4b5d 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -13,9 +13,9 @@
 //kbuild:lib-$(CONFIG_MAN) += man.o
 
 //usage:#define man_trivial_usage
-//usage:       "[-aw] [MANPAGE]..."
+//usage:       "[-aw] MANPAGE..."
 //usage:#define man_full_usage "\n\n"
-//usage:       "Format and display manual page\n"
+//usage:       "Display manual page\n"
 //usage:     "\n        -a      Display all pages"
 //usage:     "\n        -w      Show page locations"
 //usage:     "\n"
@@ -209,9 +209,6 @@ static char **add_MANPATH(char **man_path_list, int *count_mp, char *path)
                 path_element = man_path_list;
                 if (path_element) while (*path_element) {
                         if (strcmp(*path_element, path) == 0) {
-                                /* Have path but haven't counted it, must be default */
-                                if (*count_mp == 0)
-                                        break;
                                 goto skip;
                         }
                         path_element++;
@@ -247,14 +244,14 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 {
         parser_t *parser;
         char *sec_list;
-        char *cur_path, *cur_sect;
         char **man_path_list;
         int count_mp;
-        int cur_mp;
         int opt, not_found;
         char *token[2];
 #if ENABLE_PLATFORM_MINGW32
         char **ptr;
+        char *exepath, *relpath;
+        const char *mpl[] = { "/usr/man", "/usr/share/man", NULL, NULL };
 #endif
 
         INIT_G();
@@ -276,16 +273,6 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         man_path_list = add_MANPATH(NULL, &count_mp,
                         getenv("MANDATORY_MANPATH"+10) /* "MANPATH" */
         );
-        if (!man_path_list) {
-                /* default, may be overridden by /etc/man.conf */
-                man_path_list = xzalloc(2 * sizeof(man_path_list[0]));
-                man_path_list[0] = (char*)"/usr/man";
-                /* count_mp stays 0.
-                 * Thus, man.conf will overwrite man_path_list[0]
-                 * if a path is defined there.
-                 */
-        }
-
         /* Parse man.conf[ig] or man_db.conf */
         /* man version 1.6f uses man.config */
         /* man-db implementation of man uses man_db.conf */
@@ -299,7 +286,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                 if (!token[1])
                         continue;
                 if (strcmp("DEFINE", token[0]) == 0) {
-                        G.col   = if_redefined(G.tbl  , "col",   token[1]);
+                        G.col   = if_redefined(G.col  , "col",   token[1]);
                         G.tbl   = if_redefined(G.tbl  , "tbl",   token[1]);
                         G.nroff = if_redefined(G.nroff, "nroff", token[1]);
                         G.pager = if_redefined(G.pager, "pager", token[1]);
@@ -317,17 +304,22 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         config_close(parser);
 
 #if ENABLE_PLATFORM_MINGW32
-        {
-                char *exepath = xstrdup(bb_busybox_exec_path);
-                char *relpath = concat_path_file(dirname(exepath), "man");
-                if (count_mp == 0) {
-                        /* default must match path set above */
-                        man_path_list = add_MANPATH(man_path_list, &count_mp,
-                                                                                (char *)"/usr/man");
-                }
+        /* allow man pages to be stored relative to the executable */
+        exepath = xstrdup(bb_busybox_exec_path);
+        relpath = concat_path_file(dirname(exepath), "man");
+
+        if (!man_path_list) {
+                mpl[2] = relpath;
+                man_path_list = (char**)mpl;
+        }
+        else {
                 man_path_list = add_MANPATH(man_path_list, &count_mp, relpath);
-                free(relpath);
-                free(exepath);
+        }
+#else
+        if (!man_path_list) {
+                static const char *const mpl[] = { "/usr/man", "/usr/share/man", NULL };
+                man_path_list = (char**)mpl;
+                /*count_mp = 2; - not used below anyway */
         }
 #endif
 
@@ -347,16 +339,18 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 
         not_found = 0;
         do { /* for each argv[] */
+                const char *cur_path;
+                int cur_mp;
                 int found = 0;
-                cur_mp = 0;
 
                 if (strchr(*argv, '/')) {
                         found = show_manpage(*argv, /*man:*/ 1, 0);
                         goto check_found;
                 }
+                cur_mp = 0;
                 while ((cur_path = man_path_list[cur_mp++]) != NULL) {
                         /* for each MANPATH */
-                        cur_sect = sec_list;
+                        const char *cur_sect = sec_list;
                         do { /* for each section */
                                 char *next_sect = strchrnul(cur_sect, ':');
                                 int sect_len = next_sect - cur_sect;
diff --git a/miscutils/ts.c b/miscutils/ts.c
new file mode 100644
index 000000000..f2d367654
--- /dev/null
+++ b/miscutils/ts.c
@@ -0,0 +1,84 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2019 Denys Vlasenko <vda.linux@googlemail.com>
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config TS
+//config:       bool "ts (450 bytes)"
+//config:       default y
+
+//applet:IF_TS(APPLET(ts, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_TS) += ts.o
+
+//usage:#define ts_trivial_usage
+//usage:       "[-is] [STRFTIME]"
+//usage:#define ts_full_usage ""
+
+#include "libbb.h"
+#include "common_bufsiz.h"
+
+int ts_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ts_main(int argc UNUSED_PARAM, char **argv)
+{
+        struct timeval base;
+        unsigned opt;
+        char *frac;
+        char *fmt_dt2str;
+        char *line;
+
+        opt = getopt32(argv, "^" "is" "\0" "?1" /*max one arg*/);
+        if (opt) {
+                putenv((char*)"TZ=UTC0");
+                tzset();
+        }
+        /*argc -= optind;*/
+        argv += optind;
+        fmt_dt2str = argv[0] ? argv[0]
+                : (char*)(opt ? "%b %d %H:%M:%S"+6 : "%b %d %H:%M:%S");
+        frac = is_suffixed_with(fmt_dt2str, "%.S");
+        if (!frac)
+                frac = is_suffixed_with(fmt_dt2str, "%.s");
+        if (frac) {
+                frac++;
+                frac[0] = frac[1];
+                frac[1] = '\0';
+        }
+
+#define date_buf bb_common_bufsiz1
+        setup_common_bufsiz();
+        gettimeofday(&base, NULL);
+
+        while ((line = xmalloc_fgets(stdin)) != NULL) {
+                struct timeval ts;
+                struct tm tm_time;
+
+                gettimeofday(&ts, NULL);
+                if (opt) {
+                        /* -i and/or -s */
+                        struct timeval ts1 = ts1;
+                        if (opt & 1) /* -i */
+                                ts1 = ts;
+//printf("%d %d\n", ts.tv_sec, base.tv_sec);
+                        ts.tv_sec -= base.tv_sec;
+//printf("%d %d\n", ts.tv_sec, base.tv_sec);
+                        ts.tv_usec -= base.tv_usec;
+                        if ((int32_t)(ts.tv_usec) < 0) {
+                                ts.tv_sec--;
+                                ts.tv_usec += 1000*1000;
+                        }
+                        if (opt & 1) /* -i */
+                                base = ts1;
+                }
+                localtime_r(&ts.tv_sec, &tm_time);
+                strftime(date_buf, COMMON_BUFSIZE, fmt_dt2str, &tm_time);
+                if (!frac) {
+                        printf("%s %s", date_buf, line);
+                } else {
+                        printf("%s.%06u %s", date_buf, (unsigned)ts.tv_usec, line);
+                }
+                free(line);
+        }
+
+        return EXIT_SUCCESS;
+}
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 1e9ecc5e8..86600b72f 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -64,7 +64,7 @@ static void shutdown_watchdog(void)
 
 static void shutdown_on_signal(int sig UNUSED_PARAM)
 {
-        remove_pidfile(CONFIG_PID_FILE_PATH "/watchdog.pid");
+        remove_pidfile_std_path_and_ext("watchdog");
         shutdown_watchdog();
         _exit(EXIT_SUCCESS);
 }
@@ -136,7 +136,7 @@ int watchdog_main(int argc UNUSED_PARAM, char **argv)
                 stimer_duration, htimer_duration * 1000);
 #endif
 
-        write_pidfile(CONFIG_PID_FILE_PATH "/watchdog.pid");
+        write_pidfile_std_path_and_ext("watchdog");
 
         while (1) {
                 /*
diff --git a/networking/inetd.c b/networking/inetd.c
index 8f871ee12..da6551174 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1207,7 +1207,7 @@ static void clean_up_and_exit(int sig UNUSED_PARAM)
                 if (ENABLE_FEATURE_CLEAN_UP)
                         close(sep->se_fd);
         }
-        remove_pidfile(CONFIG_PID_FILE_PATH "/inetd.pid");
+        remove_pidfile_std_path_and_ext("inetd");
         exit(EXIT_SUCCESS);
 }
 
@@ -1256,7 +1256,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
                 setgroups(1, &gid);
         }
 
-        write_pidfile(CONFIG_PID_FILE_PATH "/inetd.pid");
+        write_pidfile_std_path_and_ext("inetd");
 
         /* never fails under Linux (except if you pass it bad arguments) */
         getrlimit(RLIMIT_NOFILE, &rlim_ofile);
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index d088caf4c..0a1b5d798 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -574,8 +574,8 @@ int FAST_FUNC ipaddr_list_or_flush(char **argv, int flush)
         }
 
         for (l = linfo; l; l = l->next) {
-                if (no_link
-                 || (oneline || print_linkinfo(&l->h) == 0)
+                if ((oneline && G_filter.family != AF_PACKET)
+                 || (print_linkinfo(&l->h) == 0)
                 /* ^^^^^^^^^ "ip -oneline a" does not print link info */
                 ) {
                         struct ifinfomsg *ifi = NLMSG_DATA(&l->h);
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 0f474bc09..027cfe783 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -2585,6 +2585,10 @@ static NOINLINE void ntp_init(char **argv)
                 /* -l but no peers: "stratum 1 server" mode */
                 G.stratum = 1;
         }
+
+        if (!(opts & OPT_n)) /* only if backgrounded: */
+                write_pidfile_std_path_and_ext("ntpd");
+
         /* If network is up, syncronization occurs in ~10 seconds.
          * We give "ntpd -q" 10 seconds to get first reply,
          * then another 50 seconds to finish syncing.
@@ -2641,8 +2645,6 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
          */
         cnt = G.peer_cnt * (INITIAL_SAMPLES + 1);
 
-        write_pidfile(CONFIG_PID_FILE_PATH "/ntpd.pid");
-
         while (!bb_got_signal) {
                 llist_t *item;
                 unsigned i, j;
@@ -2814,7 +2816,7 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
                 }
         } /* while (!bb_got_signal) */
 
-        remove_pidfile(CONFIG_PID_FILE_PATH "/ntpd.pid");
+        remove_pidfile_std_path_and_ext("ntpd");
         kill_myself_with_sig(bb_got_signal);
 }
 
diff --git a/shell/ash.c b/shell/ash.c
index 5f64bebe3..8a3c3ae35 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3866,7 +3866,7 @@ struct procstat {
 
 struct job {
         struct procstat ps0;    /* status of process */
-        struct procstat *ps;    /* status or processes when more than one */
+        struct procstat *ps;    /* status of processes when more than one */
 #if JOBS
         int stopstatus;         /* status of a stopped job */
 #endif
@@ -4703,6 +4703,9 @@ wait_block_or_sig(int *status)
 #define DOWAIT_NONBLOCK 0
 #define DOWAIT_BLOCK    1
 #define DOWAIT_BLOCK_OR_SIG 2
+#if ENABLE_ASH_BASH_COMPAT
+# define DOWAIT_JOBSTATUS 0x10   /* OR this to get job's exitstatus instead of pid */
+#endif
 
 static int
 dowait(int block, struct job *job)
@@ -4710,7 +4713,11 @@ dowait(int block, struct job *job)
         int pid;
         int status;
         struct job *jp;
-        struct job *thisjob = NULL;
+        struct job *thisjob;
+#if ENABLE_ASH_BASH_COMPAT
+        bool want_jobexitstatus = (block & DOWAIT_JOBSTATUS);
+        block = (block & ~DOWAIT_JOBSTATUS);
+#endif
 
         TRACE(("dowait(0x%x) called\n", block));
 
@@ -4747,10 +4754,10 @@ dowait(int block, struct job *job)
         }
         TRACE(("wait returns pid=%d, status=0x%x, errno=%d(%s)\n",
                                 pid, status, errno, strerror(errno)));
+        thisjob = NULL;
         if (pid <= 0)
                 goto out;
 
-        thisjob = NULL;
         for (jp = curjob; jp; jp = jp->prev_job) {
                 int jobstate;
                 struct procstat *ps;
@@ -4814,6 +4821,13 @@ dowait(int block, struct job *job)
  out:
         INT_ON;
 
+#if ENABLE_ASH_BASH_COMPAT
+        if (want_jobexitstatus) {
+                pid = -1;
+                if (thisjob && thisjob->state == JOBDONE)
+                        pid = thisjob->ps[thisjob->nprocs - 1].ps_status;
+        }
+#endif
         if (thisjob && thisjob == job) {
                 char s[48 + 1];
                 int len;
@@ -4996,15 +5010,24 @@ waitcmd(int argc UNUSED_PARAM, char **argv)
         struct job *job;
         int retval;
         struct job *jp;
-
+#if ENABLE_ASH_BASH_COMPAT
+        int status;
+        char one = nextopt("n");
+#else
         nextopt(nullstr);
+#endif
         retval = 0;
 
         argv = argptr;
-        if (!*argv) {
-                /* wait for all jobs */
+        if (!argv[0]) {
+                /* wait for all jobs / one job if -n */
                 for (;;) {
                         jp = curjob;
+#if ENABLE_ASH_BASH_COMPAT
+                        if (one && !jp)
+                                /* exitcode of "wait -n" with nothing to wait for is 127, not 0 */
+                                retval = 127;
+#endif
                         while (1) {
                                 if (!jp) /* no running procs */
                                         goto ret;
@@ -5020,13 +5043,31 @@ waitcmd(int argc UNUSED_PARAM, char **argv)
          * with an exit status greater than 128, immediately after which
          * the trap is executed."
          */
+#if ENABLE_ASH_BASH_COMPAT
+                        status = dowait(DOWAIT_BLOCK_OR_SIG | DOWAIT_JOBSTATUS, NULL);
+#else
                         dowait(DOWAIT_BLOCK_OR_SIG, NULL);
+#endif
         /* if child sends us a signal *and immediately exits*,
          * dowait() returns pid > 0. Check this case,
          * not "if (dowait() < 0)"!
          */
                         if (pending_sig)
                                 goto sigout;
+#if ENABLE_ASH_BASH_COMPAT
+                        if (one) {
+                                /* wait -n waits for one _job_, not one _process_.
+                                 *  date; sleep 3 & sleep 2 | sleep 1 & wait -n; date
+                                 * should wait for 2 seconds. Not 1 or 3.
+                                 */
+                                if (status != -1 && !WIFSTOPPED(status)) {
+                                        retval = WEXITSTATUS(status);
+                                        if (WIFSIGNALED(status))
+                                                retval = WTERMSIG(status) + 128;
+                                        goto ret;
+                                }
+                        }
+#endif
                 }
         }
 
diff --git a/shell/hush.c b/shell/hush.c
index 920a85299..fa9afa38e 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -923,7 +923,7 @@ struct globals {
 # define G_flag_return_in_progress 0
 #endif
         smallint exiting; /* used to prevent EXIT trap recursion */
-        /* These support $?, $#, and $1 */
+        /* These support $? */
         smalluint last_exitcode;
         smalluint expand_exitcode;
         smalluint last_bg_pid_exitcode;
@@ -934,6 +934,9 @@ struct globals {
 #else
 # define G_global_args_malloced 0
 #endif
+#if ENABLE_HUSH_BASH_COMPAT
+        int dead_job_exitcode; /* for "wait -n" */
+#endif
         /* how many non-NULL argv's we have. NB: $# + 1 */
         int global_argc;
         char **global_argv;
@@ -8657,6 +8660,9 @@ static int process_wait_result(struct pipe *fg_pipe, pid_t childpid, int status)
                 pi->cmds[i].pid = 0;
                 pi->alive_cmds--;
                 if (!pi->alive_cmds) {
+#if ENABLE_HUSH_BASH_COMPAT
+                        G.dead_job_exitcode = job_exited_or_stopped(pi);
+#endif
                         if (G_interactive_fd) {
                                 printf(JOB_STATUS_FORMAT, pi->jobid,
                                                 "Done", pi->cmdtext);
@@ -8763,7 +8769,7 @@ static int checkjobs(struct pipe *fg_pipe, pid_t waitfor_pid)
                         /* fg_pipe exited or stopped */
                         break;
                 }
-                if (childpid == waitfor_pid) {
+                if (childpid == waitfor_pid) { /* "wait PID" */
                         debug_printf_exec("childpid==waitfor_pid:%d status:0x%08x\n", childpid, status);
                         rcode = WEXITSTATUS(status);
                         if (WIFSIGNALED(status))
@@ -8774,6 +8780,15 @@ static int checkjobs(struct pipe *fg_pipe, pid_t waitfor_pid)
                         rcode++;
                         break; /* "wait PID" called us, give it exitcode+1 */
                 }
+#if ENABLE_HUSH_BASH_COMPAT
+                if (-1 == waitfor_pid /* "wait -n" (wait for any one job) */
+                 && G.dead_job_exitcode >= 0 /* some job did finish */
+                ) {
+                        debug_printf_exec("waitfor_pid:-1\n");
+                        rcode = G.dead_job_exitcode + 1;
+                        break;
+                }
+#endif
                 /* This wasn't one of our processes, or */
                 /* fg_pipe still has running processes, do waitpid again */
         } /* while (waitpid succeeds)... */
@@ -11471,6 +11486,12 @@ static int wait_for_child_or_signal(struct pipe *waitfor_pipe, pid_t waitfor_pid
                         ret--;
                         if (ret < 0) /* if ECHILD, may need to fix "ret" */
                                 ret = 0;
+#if ENABLE_HUSH_BASH_COMPAT
+                        if (waitfor_pid == -1 && errno == ECHILD) {
+                                /* exitcode of "wait -n" with no children is 127, not 0 */
+                                ret = 127;
+                        }
+#endif
                         sigprocmask(SIG_SETMASK, &oldset, NULL);
                         break;
                 }
@@ -11499,6 +11520,14 @@ static int FAST_FUNC builtin_wait(char **argv)
         int status;
 
         argv = skip_dash_dash(argv);
+#if ENABLE_HUSH_BASH_COMPAT
+        if (argv[0] && strcmp(argv[0], "-n") == 0) {
+                /* wait -n */
+                /* (bash accepts "wait -n PID" too and ignores PID) */
+                G.dead_job_exitcode = -1;
+                return wait_for_child_or_signal(NULL, -1 /*no job, wait for one job*/);
+        }
+#endif
         if (argv[0] == NULL) {
                 /* Don't care about wait results */
                 /* Note 1: must wait until there are no more children */
@@ -11516,7 +11545,7 @@ static int FAST_FUNC builtin_wait(char **argv)
                  * ^C <-- after ~4 sec from keyboard
                  * $
                  */
-                return wait_for_child_or_signal(NULL, 0 /*(no job and no pid to wait for)*/);
+                return wait_for_child_or_signal(NULL, 0 /*no job and no pid to wait for*/);
         }
 
         do {
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 76eccf1da..17b6ca235 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -231,7 +231,7 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
 
         syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
 
-        write_pidfile(CONFIG_PID_FILE_PATH "/klogd.pid");
+        write_pidfile_std_path_and_ext("klogd");
 
         used = 0;
         while (!bb_got_signal) {
@@ -295,7 +295,7 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
 
         klogd_close();
         syslog(LOG_NOTICE, "klogd: exiting");
-        remove_pidfile(CONFIG_PID_FILE_PATH "/klogd.pid");
+        remove_pidfile_std_path_and_ext("klogd");
         if (bb_got_signal)
                 kill_myself_with_sig(bb_got_signal);
         return EXIT_FAILURE;
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index f12359476..d0dd1bd20 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -1098,7 +1098,7 @@ static void do_syslogd(void)
         } /* while (!bb_got_signal) */
 
         timestamp_and_log_internal("syslogd exiting");
-        remove_pidfile(CONFIG_PID_FILE_PATH "/syslogd.pid");
+        remove_pidfile_std_path_and_ext("syslogd");
         ipcsyslog_cleanup();
         if (option_mask32 & OPT_kmsg)
                 kmsg_cleanup();
@@ -1164,7 +1164,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
         }
 
         //umask(0); - why??
-        write_pidfile(CONFIG_PID_FILE_PATH "/syslogd.pid");
+        write_pidfile_std_path_and_ext("syslogd");
 
         do_syslogd();
         /* return EXIT_SUCCESS; */
diff --git a/util-linux/blockdev.c b/util-linux/blockdev.c
index 5d8e465b4..e9b5b8bf9 100644
--- a/util-linux/blockdev.c
+++ b/util-linux/blockdev.c
@@ -34,6 +34,35 @@
 #include "libbb.h"
 #include <linux/fs.h>
 
+/* Takes less space is separate arrays than one array of struct */
+static const char bdcmd_names[] ALIGN1 =
+        "setro"     "\0"
+#define CMD_SETRO 0
+        "setrw"     "\0"
+        "getro"     "\0"
+        "getss"     "\0"
+        "getbsz"    "\0"
+        "setbsz"    "\0"
+#define CMD_SETBSZ 5
+        "getsz"     "\0"
+        "getsize"   "\0"
+        "getsize64" "\0"
+        "flushbufs" "\0"
+        "rereadpt"  "\0"
+;
+static const uint32_t bdcmd_ioctl[] = {
+        BLKROSET,       //setro
+        BLKROSET,       //setrw
+        BLKROGET,       //getro
+        BLKSSZGET,      //getss
+        BLKBSZGET,      //getbsz
+        BLKBSZSET,      //setbsz
+        BLKGETSIZE64,   //getsz
+        BLKGETSIZE,     //getsize
+        BLKGETSIZE64,   //getsize64
+        BLKFLSBUF,      //flushbufs
+        BLKRRPART,      //rereadpt
+};
 enum {
         ARG_NONE   = 0,
         ARG_INT    = 1,
@@ -46,83 +75,26 @@ enum {
         FL_NORESULT = 8,
         FL_SCALE512 = 16,
 };
-
-struct bdc {
-        uint32_t   ioc;                       /* ioctl code */
-        const char name[sizeof("flushbufs")]; /* "--setfoo" wothout "--" */
-        uint8_t    flags;
-        int8_t     argval;                    /* default argument value */
+static const uint8_t bdcmd_flags[] ALIGN1 = {
+        ARG_INT + FL_NORESULT,             //setro
+        ARG_INT + FL_NORESULT,             //setrw
+        ARG_INT,                           //getro
+        ARG_INT,                           //getss
+        ARG_INT,                           //getbsz
+        ARG_INT + FL_NORESULT + FL_USRARG, //setbsz
+        ARG_U64 + FL_SCALE512,             //getsz
+        ARG_ULONG,                         //getsize
+        ARG_U64,                           //getsize64
+        ARG_NONE + FL_NORESULT,            //flushbufs
+        ARG_NONE + FL_NORESULT,            //rereadpt
 };
 
-static const struct bdc bdcommands[] = {
-        {
-                .ioc = BLKROSET,
-                .name = "setro",
-                .flags = ARG_INT + FL_NORESULT,
-                .argval = 1,
-        },{
-                .ioc = BLKROSET,
-                .name = "setrw",
-                .flags = ARG_INT + FL_NORESULT,
-                .argval = 0,
-        },{
-                .ioc = BLKROGET,
-                .name = "getro",
-                .flags = ARG_INT,
-                .argval = -1,
-        },{
-                .ioc = BLKSSZGET,
-                .name = "getss",
-                .flags = ARG_INT,
-                .argval = -1,
-        },{
-                .ioc = BLKBSZGET,
-                .name = "getbsz",
-                .flags = ARG_INT,
-                .argval = -1,
-        },{
-                .ioc = BLKBSZSET,
-                .name = "setbsz",
-                .flags = ARG_INT + FL_NORESULT + FL_USRARG,
-                .argval = 0,
-        },{
-                .ioc = BLKGETSIZE64,
-                .name = "getsz",
-                .flags = ARG_U64 + FL_SCALE512,
-                .argval = -1,
-        },{
-                .ioc = BLKGETSIZE,
-                .name = "getsize",
-                .flags = ARG_ULONG,
-                .argval = -1,
-        },{
-                .ioc = BLKGETSIZE64,
-                .name = "getsize64",
-                .flags = ARG_U64,
-                .argval = -1,
-        },{
-                .ioc = BLKFLSBUF,
-                .name = "flushbufs",
-                .flags = ARG_NONE + FL_NORESULT,
-                .argval = 0,
-        },{
-                .ioc = BLKRRPART,
-                .name = "rereadpt",
-                .flags = ARG_NONE + FL_NORESULT,
-                .argval = 0,
-        }
-};
-
-static const struct bdc *find_cmd(const char *s)
+static unsigned find_cmd(const char *s)
 {
-        const struct bdc *bdcmd = bdcommands;
         if (s[0] == '-' && s[1] == '-') {
-                s += 2;
-                do {
-                        if (strcmp(s, bdcmd->name) == 0)
-                                return bdcmd;
-                        bdcmd++;
-                } while (bdcmd != bdcommands + ARRAY_SIZE(bdcommands));
+                int n = index_in_strings(bdcmd_names, s + 2);
+                if (n >= 0)
+                        return n;
         }
         bb_show_usage();
 }
@@ -130,7 +102,8 @@ static const struct bdc *find_cmd(const char *s)
 int blockdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int blockdev_main(int argc UNUSED_PARAM, char **argv)
 {
-        const struct bdc *bdcmd;
+        unsigned bdcmd;
+        unsigned flags;
         int fd;
         uint64_t u64;
         union {
@@ -144,10 +117,13 @@ int blockdev_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
 
         bdcmd = find_cmd(*argv);
-
-        u64 = (int)bdcmd->argval;
-        if (bdcmd->flags & FL_USRARG)
+        /* setrw translates to BLKROSET(0), most other ioctls don't care... */
+        /* ...setro will do BLKROSET(1) */
+        u64 = (bdcmd == CMD_SETRO);
+        if (bdcmd == CMD_SETBSZ) {
+                /* ...setbsz is BLKBSZSET(bytes) */
                 u64 = xatoi_positive(*++argv);
+        }
 
         argv++;
         if (!argv[0] || argv[1])
@@ -155,6 +131,7 @@ int blockdev_main(int argc UNUSED_PARAM, char **argv)
         fd = xopen(argv[0], O_RDONLY);
 
         ioctl_val_on_stack.u64 = u64;
+        flags = bdcmd_flags[bdcmd];
 #if BB_BIG_ENDIAN
         /* Store data properly wrt data size.
          * (1) It's no-op for little-endian.
@@ -162,7 +139,7 @@ int blockdev_main(int argc UNUSED_PARAM, char **argv)
          * and it is ARG_INT. --setbsz USER_VAL is also ARG_INT.
          * Thus, we don't need to handle ARG_ULONG.
          */
-        switch (bdcmd->flags & ARG_MASK) {
+        switch (flags & ARG_MASK) {
         case ARG_INT:
                 ioctl_val_on_stack.i = (int)u64;
                 break;
@@ -174,17 +151,17 @@ int blockdev_main(int argc UNUSED_PARAM, char **argv)
         }
 #endif
 
-        if (ioctl(fd, bdcmd->ioc, &ioctl_val_on_stack.u64) == -1)
+        if (ioctl(fd, bdcmd_ioctl[bdcmd], &ioctl_val_on_stack.u64) == -1)
                 bb_simple_perror_msg_and_die(*argv);
 
         /* Fetch it into register(s) */
         u64 = ioctl_val_on_stack.u64;
 
-        if (bdcmd->flags & FL_SCALE512)
+        if (flags & FL_SCALE512)
                 u64 >>= 9;
 
         /* Zero- or one-extend the value if needed, then print */
-        switch (bdcmd->flags & (ARG_MASK+FL_NORESULT)) {
+        switch (flags & (ARG_MASK+FL_NORESULT)) {
         case ARG_INT:
                 /* Smaller code when we use long long
                  * (gcc tail-merges printf call)