fsck: unify exit path for connect_plymouth()

[elogind.git] / src / fsckd / fsckd.c

diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 0f647468dd0d3d57c07a263e9a2e157742e38224..cf823322a1c5622f2dc64ce6e9d6ddc0579fabdd 100644 (file)
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -227,6 +227,7 @@ static int update_global_progress(Manager *m) {
                                       "Checking in progress on %d disks (%3.1f%% complete)", m->numdevices),
                                       m->numdevices, m->percent) < 0)
                         return -ENOMEM;
+
                 if (asprintf(&fsck_message, "fsckd:%d:%3.1f:%s", m->numdevices, m->percent, console_message) < 0)
                         return -ENOMEM;
 
@@ -260,17 +261,21 @@ static int connect_plymouth(Manager *m) {
                 return log_warning_errno(errno, "Connection to plymouth socket failed: %m");
 
         if (connect(m->plymouth_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)) < 0) {
-                on_plymouth_disconnect(m);
-                return log_warning_errno(errno, "Couldn't connect to plymouth: %m");
+                r = log_warning_errno(errno, "Couldn't connect to plymouth: %m");
+                goto fail;
         }
 
         r = sd_event_add_io(m->event, NULL, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
         if (r < 0) {
-                on_plymouth_disconnect(m);
-                return log_warning_errno(r, "Can't listen to plymouth socket: %m");
+                log_warning_errno(r, "Can't listen to plymouth socket: %m");
+                goto fail;
         }
 
         return 0;
+
+fail:
+        on_plymouth_disconnect(m);
+        return r;
 }
 
 static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
@@ -516,41 +521,43 @@ int main(int argc, char *argv[]) {
 
         r = parse_argv(argc, argv);
         if (r <= 0)
-                return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+                goto finish;
 
         n = sd_listen_fds(0);
         if (n > 1) {
                 log_error("Too many file descriptors received.");
-                return EXIT_FAILURE;
+                r = -EINVAL;
+                goto finish;
         } else if (n == 1)
                 fd = SD_LISTEN_FDS_START + 0;
         else {
                 fd = make_socket_fd(LOG_DEBUG, FSCKD_SOCKET_PATH, SOCK_STREAM | SOCK_CLOEXEC);
                 if (fd < 0) {
-                        log_error_errno(fd, "Couldn't create listening socket fd on %s: %m", FSCKD_SOCKET_PATH);
-                        return EXIT_FAILURE;
+                        r = log_error_errno(fd, "Couldn't create listening socket fd on %s: %m", FSCKD_SOCKET_PATH);
+                        goto finish;
                 }
         }
 
         r = manager_new(&m, fd);
         if (r < 0) {
                 log_error_errno(r, "Failed to allocate manager: %m");
-                return EXIT_FAILURE;
+                goto finish;
         }
 
         r = sd_event_add_io(m->event, NULL, fd, EPOLLIN, new_connection_handler, m);
         if (r < 0) {
                 log_error_errno(r, "Can't listen to connection socket: %m");
-                return EXIT_FAILURE;
+                goto finish;
         }
 
         r = run_event_loop_with_timeout(m->event, IDLE_TIME_SECONDS * USEC_PER_SEC);
         if (r < 0) {
                 log_error_errno(r, "Failed to run event loop: %m");
-                return EXIT_FAILURE;
+                goto finish;
         }
 
         sd_event_get_exit_code(m->event, &r);
 
+finish:
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }