drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: pty: Fix input charset for non-cygwin apps with disable_pcon. 

- If the non-cygwin apps is executed under pseudo console disabled,
  multibyte input for the apps are garbled. This patch fixes the
  issue.
This commit is contained in:
Takashi Yano via Cygwin-patches 2020-09-10 00:28:00 +09:00 committed by Corinna Vinschen
parent 91908fe000
commit fd3ad92f9e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
winsup/cygwin/fhandler_tty.cc
View File

@ -295,8 +295,22 @@ fhandler_pty_master::accept_input ()
bytes_left = eat_readahead (-1); bytes_left = eat_readahead (-1);
HANDLE write_to = get_output_handle (); HANDLE write_to = get_output_handle ();
tmp_pathbuf tp;
if (to_be_read_from_pcon ()) if (to_be_read_from_pcon ())
write_to = to_slave; {
write_to = to_slave;
UINT cp_to = GetConsoleCP ();
if (get_ttyp ()->term_code_page != cp_to)
{
static mbstate_t mbp;
char *mbbuf = tp.c_get ();
size_t nlen = NT_MAX_PATH;
convert_mb_str (cp_to, mbbuf, &nlen,
get_ttyp ()->term_code_page, p, bytes_left, &mbp);
p = mbbuf;
bytes_left = nlen;
}
}
if (!bytes_left) if (!bytes_left)
{ {