[newlib-cygwin] Cygwin: console: Fix a bug on input when signalled.
Corinna Vinschen
corinna@sourceware.org
Tue Nov 2 14:47:15 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=561767fc5942746bf52c4b9f630e6a79659896a0
commit 561767fc5942746bf52c4b9f630e6a79659896a0
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Tue Nov 2 12:40:10 2021 +0900
Cygwin: console: Fix a bug on input when signalled.
- This patch fixes the bug that Ctrl-C sometimes does not work as
expected in Windows Terminal.
Addresses:
https://cygwin.com/pipermail/cygwin/2021-November/249749.html
Diff:
---
winsup/cygwin/fhandler_console.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 940c66a6e..0501b36fa 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -1178,6 +1178,10 @@ out:
/* Discard processed recored. */
DWORD dummy;
DWORD discard_len = min (total_read, i + 1);
+ /* If input is signalled, do not discard input here because
+ tcflush() is already called from line_edit(). */
+ if (stat == input_signalled && !(ti->c_lflag & NOFLSH))
+ discard_len = 0;
if (discard_len)
ReadConsoleInputW (get_handle (), input_rec, discard_len, &dummy);
return stat;
More information about the Cygwin-cvs
mailing list