diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2023-04-14 04:52:08 +0300 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2023-04-14 05:23:51 +0300 |
| commit | 595fcb21ffc01b3469dad6484c11ebfd263d7f3c (patch) | |
| tree | 2f4652e865aa4db6e7622fd89c4939e032bd41cb /winsup | |
| parent | 2bc5e1f6f35bbafd5de62d532d6a77b6292bed8a (diff) | |
Cygwin: pty: Fix reading CONIN$ when stdin is not a pty.
Previously, the pty master sends inputs to the pipe for cygwin app
even when pseudo console is activated if stdin is not the pty.
This causes the problem that key input is not sent to non cygwin
app even if the app opens CONIN$. This patch sets switch_to_nat_pipe
to true regardless whether stdin is the pty or not to allow that case.
https://cygwin.com/pipermail/cygwin/2023-April/253424.html
Reported-by: Wladislav Artsimovich <cygwin@frost.kiwi>
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/fhandler/pty.cc | 6 | ||||
| -rw-r--r-- | winsup/cygwin/release/3.4.7 | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc index e9a379b1c..aa7ceb0ba 100644 --- a/winsup/cygwin/fhandler/pty.cc +++ b/winsup/cygwin/fhandler/pty.cc @@ -3274,6 +3274,11 @@ fhandler_pty_slave::setup_pseudoconsole () return false; } + /* Set switch_to_nat_pipe regardless whether stdin is the pty or not + so that the non-cygwin app can work when it opens CONIN$. */ + bool switch_to_nat_pipe_orig = get_ttyp ()->switch_to_nat_pipe; + get_ttyp ()->switch_to_nat_pipe = true; + HANDLE hpConIn, hpConOut; if (get_ttyp ()->pcon_activated) { /* The pseudo console is already activated. */ @@ -3551,6 +3556,7 @@ cleanup_pseudo_console: CloseHandle (tmp); } fallback: + get_ttyp ()->switch_to_nat_pipe = switch_to_nat_pipe_orig; return false; } diff --git a/winsup/cygwin/release/3.4.7 b/winsup/cygwin/release/3.4.7 index 2c305ec5f..941519ebc 100644 --- a/winsup/cygwin/release/3.4.7 +++ b/winsup/cygwin/release/3.4.7 @@ -9,3 +9,6 @@ Bug Fixes - Align behaviour of dirname in terms of leading slashes to POSIX: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html + +- Fix reading CONIN$ in non cygwin apps when stdin is not a pty. + Addresses https://cygwin.com/pipermail/cygwin/2023-April/253424.html |