extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-11-24 00:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check the first of LC_CTYPE, LC_ALL and LANG, rather than just the last, when

Browse Source 
trying to decide about UTF-8, and use strcasestr. Reported by Geert Hendrickx.
This commit is contained in:
Nicholas Marriott 2009-06-25 15:59:27 +00:00
parent fbcee9f114
commit 6f4600c533
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tmux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: tmux.c,v 1.7 2009/06/04 21:56:14 nicm Exp $ */ /* $OpenBSD: tmux.c,v 1.8 2009/06/05 07:22:23 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -342,12 +342,17 @@ main(int argc, char **argv)
if (!(flags & IDENTIFY_UTF8)) { if (!(flags & IDENTIFY_UTF8)) {
/* /*
* If the user has set LANG to contain UTF-8, it is a safe * If the user has set whichever of LC_ALL, LC_CTYPE or LANG
* exist (in that order) to contain UTF-8, it is a safe
* assumption that either they are using a UTF-8 terminal, or * assumption that either they are using a UTF-8 terminal, or
* if not they know that output from UTF-8-capable programs may * if not they know that output from UTF-8-capable programs may
* be wrong. * be wrong.
*/ */
if ((s = getenv("LANG")) != NULL && strstr(s, "UTF-8") != NULL) if ((s = getenv("LC_CTYPE")) == NULL) {
if ((s = getenv("LC_ALL")) == NULL)
s = getenv("LANG");
}
if (s != NULL && strcasestr(s, "UTF-8") != NULL)
flags |= IDENTIFY_UTF8; flags |= IDENTIFY_UTF8;
} }