From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: [PATCH] Cygwin: pty: Fix conditions for input transfer.
Date: Tue, 14 Dec 2021 12:29:13 +0900 [thread overview]
Message-ID: <20211214032913.321-1-takashi.yano@nifty.ne.jp> (raw)
- The recent commit "Cygwin: pty: Add missing input transfer when
switch_to_pcon_in state." causes regression that rlwrap cannot
work with cmd.exe. This patch fixes the issue.
---
winsup/cygwin/fhandler.h | 2 +-
winsup/cygwin/fhandler_tty.cc | 30 +++++++++++++++---------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index c838d15a2..4f70c4c0b 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -2279,6 +2279,7 @@ class fhandler_pty_common: public fhandler_termios
static DWORD get_console_process_id (DWORD pid, bool match,
bool cygwin = false,
bool stub_only = false);
+ bool to_be_read_from_pcon (void);
protected:
static BOOL process_opost_output (HANDLE h, const void *ptr, ssize_t& len,
@@ -2445,7 +2446,6 @@ public:
fh->copy_from (this);
return fh;
}
- bool to_be_read_from_pcon (void);
void get_master_thread_param (master_thread_param_t *p);
void get_master_fwd_thread_param (master_fwd_thread_param_t *p);
void set_mask_flusho (bool m) { get_ttyp ()->mask_flusho = m; }
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 5ec5b235d..5e76b51c5 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1176,21 +1176,12 @@ fhandler_pty_slave::reset_switch_to_pcon (void)
return;
if (get_ttyp ()->pcon_start)
return;
- /* This input transfer is needed if non-cygwin app is terminated
- by Ctrl-C or killed. */
- WaitForSingleObject (input_mutex, INFINITE);
- if (!get_ttyp ()->pcon_fg (get_ttyp ()->getpgid ())
- && get_ttyp ()->switch_to_pcon_in && !get_ttyp ()->pcon_activated
- && get_ttyp ()->pcon_input_state_eq (tty::to_nat))
- transfer_input (tty::to_cyg, get_handle_nat (), get_ttyp (),
- input_available_event);
- ReleaseMutex (input_mutex);
WaitForSingleObject (pcon_mutex, INFINITE);
if (!pcon_pid_self (get_ttyp ()->pcon_pid)
&& pcon_pid_alive (get_ttyp ()->pcon_pid))
{
/* There is a process which is grabbing pseudo console. */
- if (get_ttyp ()->pcon_activated
+ if (!to_be_read_from_pcon () && get_ttyp ()->pcon_activated
&& get_ttyp ()->pcon_input_state_eq (tty::to_nat))
{
HANDLE pcon_owner =
@@ -1226,6 +1217,14 @@ fhandler_pty_slave::reset_switch_to_pcon (void)
ReleaseMutex (pcon_mutex);
return;
}
+ /* This input transfer is needed if non-cygwin app is terminated
+ by Ctrl-C or killed. */
+ WaitForSingleObject (input_mutex, INFINITE);
+ if (get_ttyp ()->switch_to_pcon_in && !get_ttyp ()->pcon_activated
+ && get_ttyp ()->pcon_input_state_eq (tty::to_nat))
+ transfer_input (tty::to_cyg, get_handle_nat (), get_ttyp (),
+ input_available_event);
+ ReleaseMutex (input_mutex);
get_ttyp ()->pcon_input_state = tty::to_cyg;
get_ttyp ()->pcon_pid = 0;
get_ttyp ()->switch_to_pcon_in = false;
@@ -1288,14 +1287,15 @@ fhandler_pty_slave::mask_switch_to_pcon_in (bool mask, bool xfer)
/* This is needed when cygwin-app is started from non-cygwin app if
pseudo console is disabled. */
- bool need_xfer = get_ttyp ()->pcon_fg (get_ttyp ()->getpgid ()) && mask
- && get_ttyp ()->switch_to_pcon_in && !get_ttyp ()->pcon_activated;
+ bool need_xfer =
+ get_ttyp ()->switch_to_pcon_in && !get_ttyp ()->pcon_activated;
/* In GDB, transfer input based on setpgid() does not work because
GDB may not set terminal process group properly. Therefore,
transfer input here if isHybrid is set. */
- if ((isHybrid || need_xfer) && !!masked != mask && xfer
- && GetStdHandle (STD_INPUT_HANDLE) == get_handle ())
+ bool need_gdb_xfer =
+ isHybrid && GetStdHandle (STD_INPUT_HANDLE) == get_handle ();
+ if (!!masked != mask && xfer && (need_gdb_xfer || need_xfer))
{
if (mask && get_ttyp ()->pcon_input_state_eq (tty::to_nat))
transfer_input (tty::to_cyg, get_handle_nat (), get_ttyp (),
@@ -1308,7 +1308,7 @@ fhandler_pty_slave::mask_switch_to_pcon_in (bool mask, bool xfer)
}
bool
-fhandler_pty_master::to_be_read_from_pcon (void)
+fhandler_pty_common::to_be_read_from_pcon (void)
{
if (!get_ttyp ()->switch_to_pcon_in)
return false;
--
2.34.1
reply other threads:[~2021-12-14 3:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20211214032913.321-1-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).