From d97617963d828eca189feeeaa0a41f4b6eb76257 Mon Sep 17 00:00:00 2001 From: Paul LeoNerd Evans Date: Sun, 5 Jan 2014 18:23:46 +0000 Subject: [PATCH] Look for \.UTF-8 only in the first env. var found from LANG, LC_MESSAGES, LC_ALL --- termkey.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/termkey.c b/termkey.c index 4239c66..cad511f 100644 --- a/termkey.c +++ b/termkey.c @@ -382,19 +382,10 @@ TermKey *termkey_new(int fd, int flags) tk->fd = fd; if(!(flags & (TERMKEY_FLAG_RAW|TERMKEY_FLAG_UTF8))) { - int locale_is_utf8 = 0; char *e; - if((e = getenv("LANG")) && strstr(e, "UTF-8")) - locale_is_utf8 = 1; - - if(!locale_is_utf8 && (e = getenv("LC_MESSAGES")) && strstr(e, "UTF-8")) - locale_is_utf8 = 1; - - if(!locale_is_utf8 && (e = getenv("LC_ALL")) && strstr(e, "UTF-8")) - locale_is_utf8 = 1; - - if(locale_is_utf8) + if(((e = getenv("LANG")) || (e = getenv("LC_MESSAGES")) || (e = getenv("LC_ALL"))) && + strstr(e, "UTF-8")) flags |= TERMKEY_FLAG_UTF8; else flags |= TERMKEY_FLAG_RAW;