X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Futil.c;h=15abd5046d72e160e1cbf6a25254c8ec16a17679;hp=19ca8ad1358f68f5733cdea1d1a9ec4855f122d2;hb=6cf2f1d94dc7749bcdff5385838bdc8eba9c3001;hpb=e7256c5c137e58fb3dc1ebca8e5845733a5f733c

diff --git a/src/shared/util.c b/src/shared/util.c
index 19ca8ad13..15abd5046 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5420,20 +5420,24 @@ bool is_locale_utf8(void) {
                 goto out;
         }
 
-        /* For LC_CTYPE=="C" return true,
-         * because CTYPE is effectly unset and
-         * everything defaults to UTF-8 nowadays. */
-
+        /* For LC_CTYPE=="C" return true, because CTYPE is effectly
+         * unset and everything can do to UTF-8 nowadays. */
         set = setlocale(LC_CTYPE, NULL);
         if (!set) {
                 cached_answer = true;
                 goto out;
         }
 
-        cached_answer = streq(set, "C");
+        /* Check result, but ignore the result if C was set
+         * explicitly. */
+        cached_answer =
+                streq(set, "C") &&
+                !getenv("LC_ALL") &&
+                !getenv("LC_CTYPE") &&
+                !getenv("LANG");
 
 out:
-        return (bool)cached_answer;
+        return (bool) cached_answer;
 }
 
 const char *draw_special_char(DrawSpecialChar ch) {