X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fvconsole%2Fvconsole-setup.c;h=b9d8681a8562072b91903784a9ebca7f91a83de1;hb=f274ece0f76b5709408821e317e87aef76123db6;hp=9ce6fae1da11bf5db8b2f7be284d9e789c2cb221;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 9ce6fae1d..b9d8681a8 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,33 +46,40 @@ static bool is_vconsole(int fd) { return ioctl(fd, TIOCLINUX, data) >= 0; } -static bool is_locale_utf8(void) { - const char *set; +static int disable_utf8(int fd) { + int r = 0, k; + + if (ioctl(fd, KDSKBMODE, K_XLATE) < 0) + r = -errno; + + if (loop_write(fd, "\033%@", 3, false) < 0) + r = -errno; - if (!setlocale(LC_ALL, "")) - return true; + k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "0"); + if (k < 0) + r = k; - set = nl_langinfo(CODESET); - if (!set) - return true; + if (r < 0) + log_warning("Failed to disable UTF-8: %s", strerror(-r)); - return streq(set, "UTF-8"); + return r; } -static int disable_utf8(int fd) { +static int enable_utf8(int fd) { int r = 0, k; - if (ioctl(fd, KDSKBMODE, K_XLATE) < 0) + if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0) r = -errno; - if (loop_write(fd, "\033%@", 3, false) < 0) + if (loop_write(fd, "\033%G", 3, false) < 0) r = -errno; - if ((k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "0")) < 0) + k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "1"); + if (k < 0) r = k; if (r < 0) - log_warning("Failed to disable UTF-8: %s", strerror(errno)); + log_warning("Failed to enable UTF-8: %s", strerror(-r)); return r; } @@ -101,7 +106,8 @@ static int load_keymap(const char *vc, const char *map, const char *map_toggle, args[i++] = map_toggle; args[i++] = NULL; - if ((pid = fork()) < 0) { + pid = fork(); + if (pid < 0) { log_error("Failed to fork: %m"); return -errno; } else if (pid == 0) { @@ -138,7 +144,8 @@ static int load_font(const char *vc, const char *font, const char *map, const ch } args[i++] = NULL; - if ((pid = fork()) < 0) { + pid = fork(); + if (pid < 0) { log_error("Failed to fork: %m"); return -errno; } else if (pid == 0) { @@ -157,12 +164,6 @@ int main(int argc, char **argv) { char *vc_font = NULL; char *vc_font_map = NULL; char *vc_font_unimap = NULL; -#ifdef TARGET_GENTOO - char *vc_unicode = NULL; -#endif -#if defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) - char *vc_keytable = NULL; -#endif int fd = -1; bool utf8; int r = EXIT_FAILURE; @@ -179,7 +180,8 @@ int main(int argc, char **argv) { else vc = "/dev/tty0"; - if ((fd = open_terminal(vc, O_RDWR|O_CLOEXEC)) < 0) { + fd = open_terminal(vc, O_RDWR|O_CLOEXEC); + if (fd < 0) { log_error("Failed to open %s: %m", vc); goto finish; } @@ -191,251 +193,47 @@ int main(int argc, char **argv) { utf8 = is_locale_utf8(); - vc_keymap = strdup("us"); - vc_font = strdup(DEFAULT_FONT); - - if (!vc_keymap || !vc_font) { - log_error("Failed to allocate strings."); - goto finish; - } - r = 0; - if (detect_container(NULL) <= 0) - if ((r = parse_env_file("/proc/cmdline", WHITESPACE, - "vconsole.keymap", &vc_keymap, - "vconsole.keymap.toggle", &vc_keymap_toggle, - "vconsole.font", &vc_font, - "vconsole.font.map", &vc_font_map, - "vconsole.font.unimap", &vc_font_unimap, - NULL)) < 0) { - - if (r != -ENOENT) - log_warning("Failed to read /proc/cmdline: %s", strerror(-r)); - } + if (detect_container(NULL) <= 0) { + r = parse_env_file("/proc/cmdline", WHITESPACE, + "vconsole.keymap", &vc_keymap, + "vconsole.keymap.toggle", &vc_keymap_toggle, + "vconsole.font", &vc_font, + "vconsole.font.map", &vc_font_map, + "vconsole.font.unimap", &vc_font_unimap, + NULL); + + if (r < 0 && r != -ENOENT) + log_warning("Failed to read /proc/cmdline: %s", strerror(-r)); + } /* Hmm, nothing set on the kernel cmd line? Then let's * try /etc/vconsole.conf */ - if (r <= 0 && - (r = parse_env_file("/etc/vconsole.conf", NEWLINE, - "KEYMAP", &vc_keymap, - "KEYMAP_TOGGLE", &vc_keymap_toggle, - "FONT", &vc_font, - "FONT_MAP", &vc_font_map, - "FONT_UNIMAP", &vc_font_unimap, - NULL)) < 0) { - - if (r != -ENOENT) + if (r <= 0) { + r = parse_env_file("/etc/vconsole.conf", NEWLINE, + "KEYMAP", &vc_keymap, + "KEYMAP_TOGGLE", &vc_keymap_toggle, + "FONT", &vc_font, + "FONT_MAP", &vc_font_map, + "FONT_UNIMAP", &vc_font_unimap, + NULL); + + if (r < 0 && r != -ENOENT) log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r)); } if (r <= 0) { -#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO) - if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, - "SYSFONT", &vc_font, - "SYSFONTACM", &vc_font_map, - "UNIMAP", &vc_font_unimap, - NULL)) < 0) { - - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); - } - - if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, - "KEYTABLE", &vc_keymap, - "KEYMAP", &vc_keymap, - NULL)) < 0) { - - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); - } - - if (access("/etc/sysconfig/console/default.kmap", F_OK) >= 0) { - char *t; - - if (!(t = strdup("/etc/sysconfig/console/default.kmap"))) { - log_error("Out of memory."); - goto finish; - } - - free(vc_keymap); - vc_keymap = t; - } - -#elif defined(TARGET_SUSE) - if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, - "KEYTABLE", &vc_keymap, - NULL)) < 0) { - - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/keyboard: %s", strerror(-r)); - } - - if ((r = parse_env_file("/etc/sysconfig/console", NEWLINE, - "CONSOLE_FONT", &vc_font, - "CONSOLE_SCREENMAP", &vc_font_map, - "CONSOLE_UNICODEMAP", &vc_font_unimap, - NULL)) < 0) { - - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r)); - } - -#elif defined(TARGET_ARCH) - if ((r = parse_env_file("/etc/rc.conf", NEWLINE, - "KEYMAP", &vc_keymap, - "CONSOLEFONT", &vc_font, - "CONSOLEMAP", &vc_font_map, - NULL)) < 0) { - - if (r != -ENOENT) - log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); - } - -#elif defined(TARGET_FRUGALWARE) - if ((r = parse_env_file("/etc/sysconfig/keymap", NEWLINE, - "keymap", &vc_keymap, - NULL)) < 0) { - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/keymap: %s", strerror(-r)); - } - if ((r = parse_env_file("/etc/sysconfig/font", NEWLINE, - "font", &vc_font, - NULL)) < 0) { - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/font: %s", strerror(-r)); - } - -#elif defined(TARGET_ALTLINUX) - if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, - "KEYTABLE", &vc_keymap, - NULL)) < 0) { - - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/keyboard: %s", strerror(-r)); - } - - if ((r = parse_env_file("/etc/sysconfig/consolefont", NEWLINE, - "SYSFONT", &vc_font, - NULL)) < 0) { - - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r)); - } - -#elif defined(TARGET_GENTOO) - if ((r = parse_env_file("/etc/rc.conf", NEWLINE, - "unicode", &vc_unicode, - NULL)) < 0) { - if (r != -ENOENT) - log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); - } - - if (vc_unicode) { - int rc_unicode; - - if ((rc_unicode = parse_boolean(vc_unicode)) < 0) - log_error("Unknown value for /etc/rc.conf unicode=%s", vc_unicode); - else { - if (rc_unicode && !utf8) - log_warning("/etc/rc.conf wants unicode, but current locale is not UTF-8 capable!"); - else if (!rc_unicode && utf8) { - log_debug("/etc/rc.conf does not want unicode, leave it on in kernel but does not apply to vconsole."); - utf8 = false; - } - } - } - - /* /etc/conf.d/consolefont comments and gentoo - * documentation mention uppercase, but the actual - * contents are lowercase. the existing - * /etc/init.d/consolefont tries both - */ - if ((r = parse_env_file("/etc/conf.d/consolefont", NEWLINE, - "CONSOLEFONT", &vc_font, - "consolefont", &vc_font, - "consoletranslation", &vc_font_map, - "CONSOLETRANSLATION", &vc_font_map, - "unicodemap", &vc_font_unimap, - "UNICODEMAP", &vc_font_unimap, - NULL)) < 0) { - if (r != -ENOENT) - log_warning("Failed to read /etc/conf.d/consolefont: %s", strerror(-r)); - } - - if ((r = parse_env_file("/etc/conf.d/keymaps", NEWLINE, - "keymap", &vc_keymap, - "KEYMAP", &vc_keymap, - NULL)) < 0) { - if (r != -ENOENT) - log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r)); - } - -#elif defined(TARGET_MANDRIVA) || defined (TARGET_MAGEIA) - - if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, - "SYSFONT", &vc_font, - "SYSFONTACM", &vc_font_map, - "UNIMAP", &vc_font_unimap, - NULL)) < 0) { - - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); - } - - if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, - "KEYTABLE", &vc_keytable, - "KEYMAP", &vc_keymap, - "UNIKEYTABLE", &vc_keymap, - "GRP_TOGGLE", &vc_keymap_toggle, - NULL)) < 0) { - - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); - } - - if (vc_keytable) { - if (vc_keymap) - free(vc_keymap); - if (utf8) { - if (endswith(vc_keytable, ".uni") || strstr(vc_keytable, ".uni.")) - vc_keymap = strdup(vc_keytable); - else { - char *s; - if ((s = strstr(vc_keytable, ".map"))) - vc_keytable[s-vc_keytable+1] = '\0'; - vc_keymap = strappend(vc_keytable, ".uni"); - } - } else - vc_keymap = strdup(vc_keytable); - - free(vc_keytable); - - if (!vc_keymap) { - log_error("Out of memory."); - goto finish; - } - } - - if (access("/etc/sysconfig/console/default.kmap", F_OK) >= 0) { - char *t; - - if (!(t = strdup("/etc/sysconfig/console/default.kmap"))) { - log_error("Out of memory."); - goto finish; - } - - free(vc_keymap); - vc_keymap = t; - } -#endif } r = EXIT_FAILURE; - if (!utf8) + if (utf8) + enable_utf8(fd); + else disable_utf8(fd); + if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 && load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0) r = EXIT_SUCCESS;