diff options
| author | Ron Yorston <rmy@pobox.com> | 2023-02-13 10:01:35 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2023-02-13 10:01:35 +0000 |
| commit | 4e5fb4341fddc2b99e815f27ac577d85a57994c2 (patch) | |
| tree | c9e2eae6d2752d7e7f907ad39e3797b0fd5c3e02 /shell/ash.c | |
| parent | 0f2feac4b7e518e838b80d7b8ceac8f9699ae997 (diff) | |
| parent | 93ae7464e6e460f25b73e4ffefd2d9a6499eae30 (diff) | |
| download | busybox-w32-4e5fb4341fddc2b99e815f27ac577d85a57994c2.tar.gz busybox-w32-4e5fb4341fddc2b99e815f27ac577d85a57994c2.tar.bz2 busybox-w32-4e5fb4341fddc2b99e815f27ac577d85a57994c2.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/ash.c')
| -rw-r--r-- | shell/ash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index 87190c453..94eb49d79 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -11769,7 +11769,8 @@ preadfd(void) | |||
| 11769 | again: | 11769 | again: |
| 11770 | /* For shell, LI_INTERRUPTIBLE is set: | 11770 | /* For shell, LI_INTERRUPTIBLE is set: |
| 11771 | * read_line_input will abort on either | 11771 | * read_line_input will abort on either |
| 11772 | * getting EINTR in poll(), or if it sees bb_got_signal != 0 | 11772 | * getting EINTR in poll() and bb_got_signal became != 0, |
| 11773 | * or if it sees bb_got_signal != 0 | ||
| 11773 | * (IOW: if signal arrives before poll() is reached). | 11774 | * (IOW: if signal arrives before poll() is reached). |
| 11774 | * Interactive testcases: | 11775 | * Interactive testcases: |
| 11775 | * (while kill -INT $$; do sleep 1; done) & | 11776 | * (while kill -INT $$; do sleep 1; done) & |