From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 65553 invoked by alias); 13 Jan 2020 16:00:39 -0000 Mailing-List: contact cygwin-cvs-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-cvs-owner@cygwin.com Received: (qmail 65336 invoked by uid 9078); 13 Jan 2020 16:00:39 -0000 Date: Mon, 13 Jan 2020 16:00:00 -0000 Message-ID: <20200113160039.65332.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Revise the code for setting code page of pseudo console. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: fd03749b9c255d6f78d71c65fb4f49d8f766a629 X-Git-Newrev: b3e78186d107c3cf6cabad4fc18ee829f2b279f4 X-SW-Source: 2020-q1/txt/msg00005.txt https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b3e78186d107c3cf6cabad4fc18ee829f2b279f4 commit b3e78186d107c3cf6cabad4fc18ee829f2b279f4 Author: Takashi Yano Date: Wed Jan 1 15:50:36 2020 +0900 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. Diff: --- winsup/cygwin/fhandler_tty.cc | 52 +++++++++++++++++++++---------------------- winsup/cygwin/release/3.1.3 | 3 +++ 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index a235ea7..0837b63 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -2629,39 +2629,36 @@ fhandler_pty_slave::setup_locale (void) if (lcid == 0 || lcid == (LCID) -1) code_page = 20127; /* ASCII */ else if (!GetLocaleInfo (lcid, - LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, (char *) &code_page, sizeof (code_page))) code_page = 20127; /* ASCII */ SetConsoleCP (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] && iterm_code_page = 20127; /* Default ASCII */ + char charset_u[ENCODING_LEN + 1] = {0, }; + for (int i=0; charset[i] && iterm_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) { - if (iso && iso <= 16 && iso !=12) - get_ttyp ()->term_code_page = 28590 + iso; + 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 @@ -2792,7 +2789,8 @@ fhandler_pty_slave::fixup_after_exec () } /* Set locale */ - setup_locale (); + if (get_ttyp ()->term_code_page == 0) + setup_locale (); #if USE_API_HOOK /* Hook Console API */ diff --git a/winsup/cygwin/release/3.1.3 b/winsup/cygwin/release/3.1.3 index d698b44..0fcdcca 100644 --- a/winsup/cygwin/release/3.1.3 +++ b/winsup/cygwin/release/3.1.3 @@ -3,3 +3,6 @@ Bug Fixes - Define CPU_SETSIZE, as on Linux. 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