CC-tea/screen
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/screen.git synced 2026-02-12 02:12:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Farm out locale checks.

Browse Source
This commit is contained in:
Emanuele Giaquinta
2008-08-09 11:46:45 -07:00
committed by Micah Cowan
parent 1c5054501f
commit e16843a896
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/screen.c
View File

@@ -335,6 +335,18 @@ pw_try_again:
return ppp;
}
static char *
locale_name(void)
{
char *s;
s = getenv("LC_ALL");
if (s == NULL)
s = getenv("LC_CTYPE");
if (s == NULL)
s = getenv("LANG");
return s;
}
int
main(ac, av)
@@ -765,8 +777,7 @@ char **av;
# else
# ifdef UTF8
char *s;
if (((s = getenv("LC_ALL")) || (s = getenv("LC_CTYPE")) ||
(s = getenv("LANG"))) && InStr(s, "UTF-8"))
if ((s = locale_name()) && InStr(s, "UTF-8"))
nwin_options.encoding = UTF8;
# endif
debug1("environment says encoding=%d\n", nwin_options.encoding);
@@ -775,8 +786,7 @@ char **av;
# ifdef DW_CHARS
{
char *s;
if((s = getenv("LC_ALL")) || (s = getenv("LC_CTYPE")) ||
(s = getenv("LANG")))
if ((s = locale_name()))
{
if(!strncmp(s, "zh_", 3) || !strncmp(s, "ja_", 3) || !strncmp(s, "ko_", 3))
{