* [PATCH] Cygwin: console: Fix a bug on input when signalled.
@ 2021-11-02 3:40 Takashi Yano
2021-11-02 14:48 ` Corinna Vinschen
0 siblings, 1 reply; 2+ messages in thread
From: Takashi Yano @ 2021-11-02 3:40 UTC (permalink / raw)
To: cygwin-patches
- 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
---
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;
--
2.33.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Cygwin: console: Fix a bug on input when signalled.
2021-11-02 3:40 [PATCH] Cygwin: console: Fix a bug on input when signalled Takashi Yano
@ 2021-11-02 14:48 ` Corinna Vinschen
0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2021-11-02 14:48 UTC (permalink / raw)
To: cygwin-patches
On Nov 2 12:40, Takashi Yano wrote:
> - 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
> ---
> 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;
> --
> 2.33.0
This and the next patch pushed to master and cygwin-3_3-branch.
Thanks,
Corinna
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-02 14:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-02 3:40 [PATCH] Cygwin: console: Fix a bug on input when signalled Takashi Yano
2021-11-02 14:48 ` Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).