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 | |
| 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')
| -rw-r--r-- | shell/ash.c | 1 | ||||
| -rw-r--r-- | shell/ash_test/ash-signals/signal7.right | 1 | ||||
| -rwxr-xr-x | shell/ash_test/ash-signals/signal7.tests | 18 | ||||
| -rw-r--r-- | shell/hush.c | 4 | ||||
| -rw-r--r-- | shell/hush_test/hush-trap/signal7.right | 1 | ||||
| -rwxr-xr-x | shell/hush_test/hush-trap/signal7.tests | 18 |
6 files changed, 41 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index fd119fa..988edab 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -4633,6 +4633,7 @@ clear_traps(void) INT_ON; } } + may_have_traps = 0; } /* Lives far away from here, needed for forkchild */ diff --git a/shell/ash_test/ash-signals/signal7.right b/shell/ash_test/ash-signals/signal7.right new file mode 100644 index 0000000..ba7453e --- /dev/null +++ b/shell/ash_test/ash-signals/signal7.right @@ -0,0 +1 @@ +Bug detected: 0 diff --git a/shell/ash_test/ash-signals/signal7.tests b/shell/ash_test/ash-signals/signal7.tests new file mode 100755 index 0000000..c2b1381 --- /dev/null +++ b/shell/ash_test/ash-signals/signal7.tests @@ -0,0 +1,18 @@ +bug() { + trap : exit + # Bug was causing sh to be run in subshell, + # as if this line is replaced with (sh -c ...; exit $?) & + # here: + sh -c 'echo REAL_CHILD=$$' & + echo PARENTS_IDEA_OF_CHILD=$! + wait # make sure bkgd shell completes +} + +bug | { +while read varval; do + eval $varval +done +test x"$REAL_CHILD" != x"" \ +&& test x"$REAL_CHILD" = x"$PARENTS_IDEA_OF_CHILD" +echo "Bug detected: $?" +} 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 { diff --git a/shell/hush_test/hush-trap/signal7.right b/shell/hush_test/hush-trap/signal7.right new file mode 100644 index 0000000..ba7453e --- /dev/null +++ b/shell/hush_test/hush-trap/signal7.right @@ -0,0 +1 @@ +Bug detected: 0 diff --git a/shell/hush_test/hush-trap/signal7.tests b/shell/hush_test/hush-trap/signal7.tests new file mode 100755 index 0000000..c2b1381 --- /dev/null +++ b/shell/hush_test/hush-trap/signal7.tests @@ -0,0 +1,18 @@ +bug() { + trap : exit + # Bug was causing sh to be run in subshell, + # as if this line is replaced with (sh -c ...; exit $?) & + # here: + sh -c 'echo REAL_CHILD=$$' & + echo PARENTS_IDEA_OF_CHILD=$! + wait # make sure bkgd shell completes +} + +bug | { +while read varval; do + eval $varval +done +test x"$REAL_CHILD" != x"" \ +&& test x"$REAL_CHILD" = x"$PARENTS_IDEA_OF_CHILD" +echo "Bug detected: $?" +} |