From 0901758558506273c0b7553dc3cae587f2b94290 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 2 Nov 2012 17:27:15 +0100 Subject: util: add is_locale_utf8() journalctl and vconsole-setup both implement utf8 locale detection. Let's have a common function for it. The next patch will add another use. --- src/vconsole/vconsole-setup.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/vconsole') diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 6e016ad338..cb7ade0d24 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -29,8 +29,6 @@ #include #include #include -#include -#include #include #include #include @@ -48,19 +46,6 @@ static bool is_vconsole(int fd) { return ioctl(fd, TIOCLINUX, data) >= 0; } -static bool is_locale_utf8(void) { - const char *set; - - if (!setlocale(LC_ALL, "")) - return true; - - set = nl_langinfo(CODESET); - if (!set) - return true; - - return streq(set, "UTF-8"); -} - static int disable_utf8(int fd) { int r = 0, k; -- cgit v1.2.3-54-g00ecf