X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fvconsole%2Fvconsole-setup.c;h=fe8573f9297aa8bffb6421f144786dcc40a6f86a;hb=3ac97fd29630f8f34a36f9b70277e53b676cc43a;hp=25d15afd5c9e5d6bbcc8a5134424e3ac8feaec0a;hpb=abee28c56d523e55751b0c007d0bf812cc285c00;p=elogind.git diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 25d15afd5..fe8573f92 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -23,21 +23,16 @@ #include #include #include -#include #include -#include #include -#include #include #include -#include #include #include #include #include "util.h" #include "log.h" -#include "macro.h" #include "virt.h" #include "fileio.h" @@ -54,15 +49,16 @@ static int disable_utf8(int fd) { if (ioctl(fd, KDSKBMODE, K_XLATE) < 0) r = -errno; - if (loop_write(fd, "\033%@", 3, false) < 0) - r = -errno; + k = loop_write(fd, "\033%@", 3, false); + if (k < 0) + r = k; k = write_string_file("/sys/module/vt/parameters/default_utf8", "0"); if (k < 0) r = k; if (r < 0) - log_warning("Failed to disable UTF-8: %s", strerror(-r)); + log_warning_errno(r, "Failed to disable UTF-8: %m"); return r; } @@ -86,29 +82,28 @@ static int enable_utf8(int fd) { r = -errno; } - if (loop_write(fd, "\033%G", 3, false) < 0) - r = -errno; + k = loop_write(fd, "\033%G", 3, false); + if (k < 0) + r = k; k = write_string_file("/sys/module/vt/parameters/default_utf8", "1"); if (k < 0) r = k; if (r < 0) - log_warning("Failed to enable UTF-8: %s", strerror(-r)); + log_warning_errno(r, "Failed to enable UTF-8: %m"); return r; } -static int keymap_load(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) { +static bool keyboard_load_and_wait(const char *vc, const char *map, const char *map_toggle, bool utf8) { const char *args[8]; int i = 0; pid_t pid; - if (isempty(map)) { - /* An empty map means kernel map */ - *_pid = 0; - return 0; - } + /* An empty map means kernel map */ + if (isempty(map)) + return true; args[i++] = KBD_LOADKEYS; args[i++] = "-q"; @@ -123,27 +118,24 @@ static int keymap_load(const char *vc, const char *map, const char *map_toggle, pid = fork(); if (pid < 0) { - log_error("Failed to fork: %m"); - return -errno; + log_error_errno(errno, "Failed to fork: %m"); + return false; } else if (pid == 0) { execv(args[0], (char **) args); _exit(EXIT_FAILURE); } - *_pid = pid; - return 0; + return wait_for_terminate_and_warn(KBD_LOADKEYS, pid, true) == 0; } -static int font_load(const char *vc, const char *font, const char *map, const char *unimap, pid_t *_pid) { +static bool font_load_and_wait(const char *vc, const char *font, const char *map, const char *unimap) { const char *args[9]; int i = 0; pid_t pid; - if (isempty(font)) { - /* An empty font means kernel font */ - *_pid = 0; - return 0; - } + /* An empty font means kernel font */ + if (isempty(font)) + return true; args[i++] = KBD_SETFONT; args[i++] = "-C"; @@ -161,15 +153,14 @@ static int font_load(const char *vc, const char *font, const char *map, const ch pid = fork(); if (pid < 0) { - log_error("Failed to fork: %m"); - return -errno; + log_error_errno(errno, "Failed to fork: %m"); + return false; } else if (pid == 0) { execv(args[0], (char **) args); _exit(EXIT_FAILURE); } - *_pid = pid; - return 0; + return wait_for_terminate_and_warn(KBD_SETFONT, pid, true) == 0; } /* @@ -212,15 +203,15 @@ static void font_copy_to_all_vcs(int fd) { /* copy font from active VT, where the font was uploaded to */ cfo.op = KD_FONT_OP_COPY; cfo.height = vcs.v_active-1; /* tty1 == index 0 */ - ioctl(vcfd, KDFONTOP, &cfo); + (void) ioctl(vcfd, KDFONTOP, &cfo); /* copy map of 8bit chars */ if (ioctl(fd, GIO_SCRNMAP, map8) >= 0) - ioctl(vcfd, PIO_SCRNMAP, map8); + (void) ioctl(vcfd, PIO_SCRNMAP, map8); /* copy map of 8bit chars -> 16bit Unicode values */ if (ioctl(fd, GIO_UNISCRNMAP, map16) >= 0) - ioctl(vcfd, PIO_UNISCRNMAP, map16); + (void) ioctl(vcfd, PIO_UNISCRNMAP, map16); /* copy unicode translation table */ /* unimapd is a ushort count and a pointer to an @@ -230,8 +221,8 @@ static void font_copy_to_all_vcs(int fd) { if (ioctl(fd, GIO_UNIMAP, &unimapd) >= 0) { struct unimapinit adv = { 0, 0, 0 }; - ioctl(vcfd, PIO_UNIMAPCLR, &adv); - ioctl(vcfd, PIO_UNIMAP, &unimapd); + (void) ioctl(vcfd, PIO_UNIMAPCLR, &adv); + (void) ioctl(vcfd, PIO_UNIMAP, &unimapd); } } } @@ -243,8 +234,7 @@ int main(int argc, char **argv) { *vc_font = NULL, *vc_font_map = NULL, *vc_font_unimap = NULL; _cleanup_close_ int fd = -1; bool utf8; - pid_t font_pid = 0, keymap_pid = 0; - bool font_copy = false; + bool font_copy = false, font_ok, keyboard_ok; int r = EXIT_FAILURE; log_set_target(LOG_TARGET_AUTO); @@ -262,7 +252,7 @@ int main(int argc, char **argv) { fd = open_terminal(vc, O_RDWR|O_CLOEXEC); if (fd < 0) { - log_error("Failed to open %s: %m", vc); + log_error_errno(errno, "Failed to open %s: %m", vc); return EXIT_FAILURE; } @@ -282,7 +272,7 @@ int main(int argc, char **argv) { NULL); if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r)); + log_warning_errno(r, "Failed to read /etc/vconsole.conf: %m"); /* Let the kernel command line override /etc/vconsole.conf */ if (detect_container(NULL) <= 0) { @@ -295,7 +285,7 @@ int main(int argc, char **argv) { NULL); if (r < 0 && r != -ENOENT) - log_warning("Failed to read /proc/cmdline: %s", strerror(-r)); + log_warning_errno(r, "Failed to read /proc/cmdline: %m"); } if (utf8) @@ -303,27 +293,12 @@ int main(int argc, char **argv) { else disable_utf8(fd); - r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid); - if (r < 0) { - log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r)); - return EXIT_FAILURE; - } - - if (font_pid > 0) - wait_for_terminate_and_warn(KBD_SETFONT, font_pid); - - r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid); - if (r < 0) { - log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r)); - return EXIT_FAILURE; - } - - if (keymap_pid > 0) - wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid); + font_ok = font_load_and_wait(vc, vc_font, vc_font_map, vc_font_unimap); + keyboard_ok = keyboard_load_and_wait(vc, vc_keymap, vc_keymap_toggle, utf8); - /* Only copy the font when we started setfont successfully */ - if (font_copy && font_pid > 0) + /* Only copy the font when we executed setfont successfully */ + if (font_copy && font_ok) font_copy_to_all_vcs(fd); - return EXIT_SUCCESS; + return font_ok && keyboard_ok ? EXIT_SUCCESS : EXIT_FAILURE; }