Merge branch 'busybox' into merge

2 files changed, 79 insertions, 9 deletions

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 {