X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fvconsole%2Fvconsole-setup.c;h=28371711b6badd2404dd1d6221d0bdfda4027538;hb=679bc6cb9016715339aac4ae6b2d5371c6262935;hp=0db97f88bc159919544d5927317699593edb4060;hpb=791a4fd837c713fe742d32cde1ce16f754dd30df;p=elogind.git

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 0db97f88b..28371711b 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -54,15 +54,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,15 +87,16 @@ 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;
 }
@@ -122,10 +124,9 @@ static int keymap_load(const char *vc, const char *map, const char *map_toggle,
         args[i++] = NULL;
 
         pid = fork();
-        if (pid < 0) {
-                log_error("Failed to fork: %m");
-                return -errno;
-        } else if (pid == 0) {
+        if (pid < 0)
+                return log_error_errno(errno, "Failed to fork: %m");
+        else if (pid == 0) {
                 execv(args[0], (char **) args);
                 _exit(EXIT_FAILURE);
         }
@@ -160,10 +161,9 @@ static int font_load(const char *vc, const char *font, const char *map, const ch
         args[i++] = NULL;
 
         pid = fork();
-        if (pid < 0) {
-                log_error("Failed to fork: %m");
-                return -errno;
-        } else if (pid == 0) {
+        if (pid < 0)
+                return log_error_errno(errno, "Failed to fork: %m");
+        else if (pid == 0) {
                 execv(args[0], (char **) args);
                 _exit(EXIT_FAILURE);
         }
@@ -262,7 +262,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 +282,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 +295,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)
@@ -305,21 +305,21 @@ int main(int argc, char **argv) {
 
         r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid);
         if (r < 0) {
-                log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r));
+                log_error_errno(r, "Failed to start " KBD_SETFONT ": %m");
                 return EXIT_FAILURE;
         }
 
         if (font_pid > 0)
-                wait_for_terminate_and_warn(KBD_SETFONT, font_pid);
+                wait_for_terminate_and_warn(KBD_SETFONT, font_pid, true);
 
         r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid);
         if (r < 0) {
-                log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r));
+                log_error_errno(r, "Failed to start " KBD_LOADKEYS ": %m");
                 return EXIT_FAILURE;
         }
 
         if (keymap_pid > 0)
-                wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
+                wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid, true);
 
         /* Only copy the font when we started setfont successfully */
         if (font_copy && font_pid > 0)