diff options
| author | Alexander Shishkin | 2010-07-25 13:07:39 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-07-25 13:07:39 +0200 |
| commit | ccb977186100ccf6b443c5f08c8b179c9b7e720b (patch) | |
| tree | d41df96ab2f9905fe8397c1dd1e6f30aaea69350 /shell/hush.c | |
| parent | 7a2ba329b9235af4c647e0a88c1db023b51cf8a4 (diff) | |
| download | busybox-ccb977186100ccf6b443c5f08c8b179c9b7e720b.zip busybox-ccb977186100ccf6b443c5f08c8b179c9b7e720b.tar.gz | |
ash: fix $! value when traps are set
Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush.c')
| -rw-r--r-- | shell/hush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c index 9208ec4..45c98bb 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 { |