diff options
author | Ron Yorston <rmy@pobox.com> | 2019-01-10 08:38:15 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2019-01-10 08:38:15 +0000 |
commit | f99a280743e877c14ee90a3f9e93a34ca3476a27 (patch) | |
tree | 60ca3d17596e190c8c7cbca587168946598bee8a /shell/ash.c | |
parent | 40d5dd07ea1f290eaed30a03fd598e33a8eaf495 (diff) | |
parent | 6ca8e347fed8c24655df692f22694baf7c572770 (diff) | |
download | busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.tar.gz busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.tar.bz2 busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/ash.c')
-rw-r--r-- | shell/ash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index 6d5c55d70..50d5ce9d4 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -31,7 +31,7 @@ | |||
31 | */ | 31 | */ |
32 | 32 | ||
33 | //config:config ASH | 33 | //config:config ASH |
34 | //config: bool "ash (77 kb)" | 34 | //config: bool "ash (78 kb)" |
35 | //config: default y | 35 | //config: default y |
36 | //config: depends on !NOMMU | 36 | //config: depends on !NOMMU |
37 | //config: help | 37 | //config: help |
@@ -4600,7 +4600,7 @@ wait_block_or_sig(int *status) | |||
4600 | /* Children exist, but none are ready. Sleep until interesting signal */ | 4600 | /* Children exist, but none are ready. Sleep until interesting signal */ |
4601 | #if 1 | 4601 | #if 1 |
4602 | sigfillset(&mask); | 4602 | sigfillset(&mask); |
4603 | sigprocmask(SIG_SETMASK, &mask, &mask); | 4603 | sigprocmask2(SIG_SETMASK, &mask); /* mask is updated */ |
4604 | while (!got_sigchld && !pending_sig) | 4604 | while (!got_sigchld && !pending_sig) |
4605 | sigsuspend(&mask); | 4605 | sigsuspend(&mask); |
4606 | sigprocmask(SIG_SETMASK, &mask, NULL); | 4606 | sigprocmask(SIG_SETMASK, &mask, NULL); |