ash: fix $! value when traps are set

Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/shell/hush.c b/shell/hush.c
index 9208ec497..45c98bb36 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -4108,8 +4108,6 @@ static void insert_bg_job(struct pipe *pi)
 
         if (G_interactive_fd)
                 printf("[%d] %d %s\n", job->jobid, job->cmds[0].pid, job->cmdtext);
-        /* Last command's pid goes to $! */
-        G.last_bg_pid = job->cmds[job->num_cmds - 1].pid;
         G.last_jobid = job->jobid;
 }
 
@@ -5076,6 +5074,8 @@ static int run_list(struct pipe *pi)
                                 if (G.run_list_level == 1)
                                         insert_bg_job(pi);
 #endif
+                                /* Last command's pid goes to $! */
+                                G.last_bg_pid = pi->cmds[pi->num_cmds - 1].pid;
                                 G.last_exitcode = rcode = EXIT_SUCCESS;
                                 debug_printf_exec(": cmd&: exitcode EXIT_SUCCESS\n");
                         } else {