public inbox for cygwin-patches@cygwin.com
 help / color / mirror / Atom feed
From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: [PATCH 5/8] Cygwin: pty: Discard input in from_master_nat pipe on signal as well.
Date: Sun, 13 Feb 2022 23:39:07 +0900	[thread overview]
Message-ID: <20220213143910.1947-6-takashi.yano@nifty.ne.jp> (raw)
In-Reply-To: <20220213143910.1947-1-takashi.yano@nifty.ne.jp>

- Currently, pty discards input only in from_master pipe on signal.
  Due to this, if pty is started without pseudo console support and
  start a non-cygwin process from cmd.exe, type adhead input is not
  discarded on signals such as Ctrl-C. This patch fixes the issue.
---
 winsup/cygwin/fhandler_tty.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 7e733e49a..8c9a10c23 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -438,6 +438,9 @@ fhandler_pty_master::discard_input ()
   while (::bytes_available (bytes_in_pipe, from_master) && bytes_in_pipe)
     ReadFile (from_master, buf, sizeof(buf), &n, NULL);
   ResetEvent (input_available_event);
+  if (!get_ttyp ()->pcon_activated)
+    while (::bytes_available (bytes_in_pipe, from_master_nat) && bytes_in_pipe)
+      ReadFile (from_master_nat, buf, sizeof(buf), &n, NULL);
   get_ttyp ()->discard_input = true;
   ReleaseMutex (input_mutex);
 }
-- 
2.35.1


  parent reply	other threads:[~2022-02-13 14:40 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-13 14:39 [PATCH 0/8] Several modifications for pty and console code Takashi Yano
2022-02-13 14:39 ` [PATCH 1/8] Cygwin: pty, console: Fix Ctrl-C handling for non-cygwin apps Takashi Yano
2022-02-13 14:39 ` [PATCH 2/8] Cygwin: pty: Pass Ctrl-Z (EOF) to non-cygwin apps with disable_pcon Takashi Yano
2022-02-13 14:39 ` [PATCH 3/8] Cygwin: pty: Prevent deadlock on echo output Takashi Yano
2022-02-13 14:39 ` [PATCH 4/8] Cygwin: pty: Revise the code to wait for completion of forwarding Takashi Yano
2022-02-13 14:39 ` Takashi Yano [this message]
2022-02-13 14:39 ` [PATCH 6/8] Cygwin: pty: Fix a bug in tty_min::segpgid() Takashi Yano
2022-02-13 14:39 ` [PATCH 7/8] Cygwin: console: Fix console mode for non-cygwin inferior of GDB Takashi Yano
2022-02-13 14:39 ` [PATCH 8/8] Cygwin: console: Set console mode even if stdin/stdout is redirected Takashi Yano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220213143910.1947-6-takashi.yano@nifty.ne.jp \
    --to=takashi.yano@nifty.ne.jp \
    --cc=cygwin-patches@cygwin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).