From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: [PATCH v2 1/3] Cygwin: syscalls.cc: Make _get_osfhandle() return appropriate handle.
Date: Mon, 22 Mar 2021 08:26:45 +0900 [thread overview]
Message-ID: <20210321232647.56-2-takashi.yano@nifty.ne.jp> (raw)
In-Reply-To: <20210321232647.56-1-takashi.yano@nifty.ne.jp>
- Currently, _get_osfhandle() returns input handle for pty even for
stdout and stdout. This patch fixes the issue. Also, setup_locale()
is called to make sure the charset conversion works for output.
---
winsup/cygwin/syscalls.cc | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 6ba4f10f7..205d15951 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -3223,7 +3223,18 @@ _get_osfhandle (int fd)
cygheap_fdget cfd (fd);
if (cfd >= 0)
- res = (long) cfd->get_handle ();
+ {
+ if (cfd->get_major () == DEV_PTYS_MAJOR)
+ {
+ fhandler_pty_slave *ptys =
+ (fhandler_pty_slave *) (fhandler_base *) cfd;
+ ptys->setup_locale ();
+ }
+ if (fd == 1 || fd == 2)
+ res = (long) cfd->get_output_handle ();
+ else
+ res = (long) cfd->get_handle_cyg ();
+ }
else
res = -1;
--
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 ` Takashi Yano [this message]
2021-03-21 23:26 ` [PATCH v2 2/3] Cygwin: pty: Add hook for GetStdHandle() to return appropriate handle Takashi Yano
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-2-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).