libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: pty: Revise the code for setting code page of pseudo console. 

- Fix the problem which overrides the code page setting, reported
  in https://www.cygwin.com/ml/cygwin/2019-12/msg00292.html.
This commit is contained in:
Takashi Yano 2020-01-01 15:50:36 +09:00 committed by Corinna Vinschen
parent fd03749b9c
commit b3e78186d1
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
winsup/cygwin/fhandler_tty.cc
View File

@ -2629,39 +2629,36 @@ fhandler_pty_slave::setup_locale (void)
if (lcid == 0 || lcid == (LCID) -1) if (lcid == 0 || lcid == (LCID) -1)
code_page = 20127; /* ASCII */ code_page = 20127; /* ASCII */
else if (!GetLocaleInfo (lcid, else if (!GetLocaleInfo (lcid,
LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER,
(char *) &code_page, sizeof (code_page))) (char *) &code_page, sizeof (code_page)))
code_page = 20127; /* ASCII */ code_page = 20127; /* ASCII */
SetConsoleCP (code_page); SetConsoleCP (code_page);
SetConsoleOutputCP (code_page); SetConsoleOutputCP (code_page);
if (get_ttyp ()->term_code_page == 0) /* Set terminal code page from locale */
/* This code is borrowed from mintty: charset.c */
get_ttyp ()->term_code_page = 20127; /* Default ASCII */
char charset_u[ENCODING_LEN + 1] = {0, };
for (int i=0; charset[i] && i<ENCODING_LEN; i++)
charset_u[i] = toupper (charset[i]);
unsigned int iso;
UINT cp = 20127; /* Default for fallback */
if (sscanf (charset_u, "ISO-8859-%u", &iso) == 1 ||
sscanf (charset_u, "ISO8859-%u", &iso) == 1 ||
sscanf (charset_u, "ISO8859%u", &iso) == 1)
{ {
/* Set terminal code page from locale */ if (iso && iso <= 16 && iso !=12)
/* This code is borrowed from mintty: charset.c */ get_ttyp ()->term_code_page = 28590 + iso;
get_ttyp ()->term_code_page = 20127; /* Default ASCII */
char charset_u[ENCODING_LEN + 1] = {0, };
for (int i=0; charset[i] && i<ENCODING_LEN; i++)
charset_u[i] = toupper (charset[i]);
unsigned int iso;
UINT cp = 20127; /* Default for fallback */
if (sscanf (charset_u, "ISO-8859-%u", &iso) == 1 ||
sscanf (charset_u, "ISO8859-%u", &iso) == 1 ||
sscanf (charset_u, "ISO8859%u", &iso) == 1)
{
if (iso && iso <= 16 && iso !=12)
get_ttyp ()->term_code_page = 28590 + iso;
}
else if (sscanf (charset_u, "CP%u", &cp) == 1)
get_ttyp ()->term_code_page = cp;
else
for (int i=0; cs_names[i].cp; i++)
if (strcasecmp (charset_u, cs_names[i].name) == 0)
{
get_ttyp ()->term_code_page = cs_names[i].cp;
break;
}
} }
else if (sscanf (charset_u, "CP%u", &cp) == 1)
get_ttyp ()->term_code_page = cp;
else
for (int i=0; cs_names[i].cp; i++)
if (strcasecmp (charset_u, cs_names[i].name) == 0)
{
get_ttyp ()->term_code_page = cs_names[i].cp;
break;
}
} }
void void
@ -2792,7 +2789,8 @@ fhandler_pty_slave::fixup_after_exec ()
} }
/* Set locale */ /* Set locale */
setup_locale (); if (get_ttyp ()->term_code_page == 0)
setup_locale ();
#if USE_API_HOOK #if USE_API_HOOK
/* Hook Console API */ /* Hook Console API */

3
winsup/cygwin/release/3.1.3
View File

@ -3,3 +3,6 @@ Bug Fixes
- Define CPU_SETSIZE, as on Linux. - Define CPU_SETSIZE, as on Linux.
Addresses: https://cygwin.com/ml/cygwin/2019-12/msg00248.html Addresses: https://cygwin.com/ml/cygwin/2019-12/msg00248.html
- Fix the problem which overrides the code page setting.
Addresses: https://www.cygwin.com/ml/cygwin/2019-12/msg00292.html