diff options
| author | Ron Yorston <rmy@pobox.com> | 2023-04-05 09:31:14 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2023-04-05 09:31:14 +0100 |
| commit | 490bbbb6e3a93045bb40442f5fc76d17a86b596b (patch) | |
| tree | 9217282d3aaaec86a729eae059bc5d3590a610be | |
| parent | 64c8f5f3d0bbfcaf3b88aa97a23d90c14326b79e (diff) | |
| download | busybox-w32-490bbbb6e3a93045bb40442f5fc76d17a86b596b.tar.gz busybox-w32-490bbbb6e3a93045bb40442f5fc76d17a86b596b.tar.bz2 busybox-w32-490bbbb6e3a93045bb40442f5fc76d17a86b596b.zip | |
ash: reinstate fix for ctrl-c issue
Reinstate the change introduced in commit 96c104a61c (ash: try harder
to avoid ctrl-c issue). It was removed during recent work on traps.
| -rw-r--r-- | shell/ash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index a748b003f..0863689e8 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -4828,7 +4828,7 @@ static BOOL WINAPI ctrl_handler(DWORD dwCtrlType) | |||
| 4828 | # if ENABLE_FEATURE_EDITING | 4828 | # if ENABLE_FEATURE_EDITING |
| 4829 | bb_got_signal = SIGINT; /* for read_line_input: "we got a signal" */ | 4829 | bb_got_signal = SIGINT; /* for read_line_input: "we got a signal" */ |
| 4830 | # endif | 4830 | # endif |
| 4831 | if (!suppress_int) | 4831 | if (!suppress_int && !(rootshell && iflag)) |
| 4832 | raise_interrupt(); | 4832 | raise_interrupt(); |
| 4833 | pending_int = 1; | 4833 | pending_int = 1; |
| 4834 | return TRUE; | 4834 | return TRUE; |