From 490bbbb6e3a93045bb40442f5fc76d17a86b596b Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Wed, 5 Apr 2023 09:31:14 +0100 Subject: 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. --- shell/ash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) # if ENABLE_FEATURE_EDITING bb_got_signal = SIGINT; /* for read_line_input: "we got a signal" */ # endif - if (!suppress_int) + if (!suppress_int && !(rootshell && iflag)) raise_interrupt(); pending_int = 1; return TRUE; -- cgit v1.2.3-55-g6feb