do not change console to non-unicode for LANG=C

If systemd-vconsole-setup was started with LANG=C (no locale.conf), then
it would set the console to non-unicode, which is not what we want.
This commit is contained in:
Harald Hoyer 2013-04-15 18:34:53 +02:00
parent ab06eef810
commit fee79e010f
1 changed files with 17 additions and 1 deletions

View File

@ -5402,7 +5402,23 @@ bool is_locale_utf8(void) {
goto out;
}
cached_answer = streq(set, "UTF-8");
if(streq(set, "UTF-8")) {
cached_answer = true;
goto out;
}
/* For LC_CTYPE=="C" return true,
* because CTYPE is effectly unset and
* everything defaults to UTF-8 nowadays. */
set = setlocale(LC_CTYPE, NULL);
if (!set) {
cached_answer = true;
goto out;
}
cached_answer = streq(set, "C");
out:
return (bool)cached_answer;
}