From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: [PATCH v2 2/3] Cygwin: pty: Add hook for GetStdHandle() to return appropriate handle.
Date: Mon, 22 Mar 2021 08:26:46 +0900 [thread overview]
Message-ID: <20210321232647.56-3-takashi.yano@nifty.ne.jp> (raw)
In-Reply-To: <20210321232647.56-1-takashi.yano@nifty.ne.jp>
- Currently, GetStdHandle(STD_INPUT_HANDLE) returns input handle for
non-cygwin process. If cygwin process read from non-cygwin pipe,
this causes hang up because master writes input to cygwin pipe.
Also, setup_locale() is called to make charset conversion for output
handle work properly.
---
winsup/cygwin/fhandler_tty.cc | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 02e94efcc..682264130 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -118,7 +118,7 @@ set_switch_to_pcon (HANDLE *in, HANDLE *out, HANDLE *err, bool iscygwin)
fhandler_pty_slave *ptys_pcon = NULL;
while ((fd = cfd.next ()) >= 0)
{
- if (*in == cfd->get_handle () ||
+ if (*in == cfd->get_handle () || *in == cfd->get_handle_cyg () ||
(fd == 0 && *in == GetStdHandle (STD_INPUT_HANDLE)))
replace_in = (fhandler_base *) cfd;
if (*out == cfd->get_output_handle () ||
@@ -140,12 +140,7 @@ set_switch_to_pcon (HANDLE *in, HANDLE *out, HANDLE *err, bool iscygwin)
if (!iscygwin && ptys_pcon)
ptys_pcon->set_switch_to_pcon ();
if (replace_in)
- {
- if (iscygwin && ptys_pcon->pcon_activated ())
- *in = replace_in->get_handle_cyg ();
- else
- *in = replace_in->get_handle ();
- }
+ *in = replace_in->get_handle ();
if (replace_out)
*out = replace_out->get_output_handle ();
if (replace_err)
@@ -157,6 +152,7 @@ set_switch_to_pcon (HANDLE *in, HANDLE *out, HANDLE *err, bool iscygwin)
DEF_HOOK (CreateProcessA);
DEF_HOOK (CreateProcessW);
DEF_HOOK (exit);
+DEF_HOOK (GetStdHandle);
static BOOL WINAPI
CreateProcessA_Hooked
@@ -300,6 +296,23 @@ exit_Hooked (int e)
exit_Orig (e);
}
+static HANDLE WINAPI
+GetStdHandle_Hooked (DWORD h)
+{
+ HANDLE r = GetStdHandle_Orig (h);
+ cygheap_fdenum cfd (false);
+ while (cfd.next () >= 0)
+ if (cfd->get_major () == DEV_PTYS_MAJOR)
+ {
+ fhandler_pty_slave *ptys =
+ (fhandler_pty_slave *) (fhandler_base *) cfd;
+ ptys->setup_locale ();
+ if (r == cfd->get_handle ())
+ return cfd->get_handle_cyg ();
+ }
+ return r;
+}
+
static void
convert_mb_str (UINT cp_to, char *ptr_to, size_t *len_to,
UINT cp_from, const char *ptr_from, size_t len_from,
@@ -2349,6 +2362,7 @@ fhandler_pty_slave::fixup_after_exec ()
DO_HOOK (NULL, CreateProcessW);
if (CreateProcessA_Orig || CreateProcessW_Orig)
DO_HOOK (NULL, exit);
+ DO_HOOK (NULL, GetStdHandle);
}
/* This thread function handles the master control pipe. It waits for a
--
2.30.2
next prev parent reply other threads:[~2021-03-21 23:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-21 23:26 [PATCH v2 0/3] Return appropriate handle by _get_osfhandle() and GetStdHandle() Takashi Yano
2021-03-21 23:26 ` [PATCH v2 1/3] Cygwin: syscalls.cc: Make _get_osfhandle() return appropriate handle Takashi Yano
2021-03-21 23:26 ` Takashi Yano [this message]
2021-03-21 23:26 ` [PATCH v2 3/3] Cygwin: pty: Clear input_available_event if pipe is empty on close 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=20210321232647.56-3-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).