X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffsckd%2Ffsckd.c;h=cf823322a1c5622f2dc64ce6e9d6ddc0579fabdd;hp=dc00fc6b309593ca2efa4a73c9c67f3322b6351f;hb=705778ad6a0d1fd62bdb81fad0074199a3e25666;hpb=07f9a21b6d2a8a7cfd8928a329b1ce9c479e3972 diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c index dc00fc6b3..cf823322a 100644 --- a/src/fsckd/fsckd.c +++ b/src/fsckd/fsckd.c @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -121,8 +122,7 @@ static void remove_client(Client **first, Client *item) { } static void on_plymouth_disconnect(Manager *m) { - safe_close(m->plymouth_fd); - m->plymouth_fd = -1; + m->plymouth_fd = safe_close(m->plymouth_fd); m->plymouth_cancel_sent = false; } @@ -182,7 +182,7 @@ static int send_message_plymouth(Manager *m, const char *message) { if (r < 0) return log_warning_errno(errno, "Can't send to plymouth cancel key: %m"); m->plymouth_cancel_sent = true; - plymouth_cancel_message = strjoina("fsckd-cancel-msg:", "Press Ctrl+C to cancel all filesystem checks in progress"); + plymouth_cancel_message = strjoina("fsckd-cancel-msg:", _("Press Ctrl+C to cancel all filesystem checks in progress")); r = send_message_plymouth_socket(m->plymouth_fd, plymouth_cancel_message, false); if (r < 0) log_warning_errno(r, "Can't send filesystem cancel message to plymouth: %m"); @@ -222,9 +222,12 @@ static int update_global_progress(Manager *m) { m->numdevices = current_numdevices; m->percent = current_percent; - if (asprintf(&console_message, "Checking in progress on %d disks (%3.1f%% complete)", - m->numdevices, m->percent) < 0) + if (asprintf(&console_message, + ngettext("Checking in progress on %d disk (%3.1f%% complete)", + "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; @@ -250,23 +253,29 @@ static int connect_plymouth(Manager *m) { int r; /* try to connect or reconnect if sending a message */ - if (m->plymouth_fd <= 0) { - m->plymouth_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0); - if (m->plymouth_fd < 0) { - 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 = 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"); - } + if (m->plymouth_fd >= 0) + return 0; + + m->plymouth_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0); + if (m->plymouth_fd < 0) + 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) { + 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) { + 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) { @@ -336,25 +345,26 @@ static int new_connection_handler(sd_event_source *s, int fd, uint32_t revents, /* Initialize and list new clients */ new_client_fd = accept4(m->connection_fd, NULL, NULL, SOCK_CLOEXEC); - if (new_client_fd > 0) { - log_debug("New fsck client connected to fd: %d", new_client_fd); - client = new0(Client, 1); - if (!client) - return log_oom(); - client->fd = new_client_fd; - client->manager = m; - LIST_PREPEND(clients, m->clients, client); - r = sd_event_add_io(m->event, NULL, client->fd, EPOLLIN, progress_handler, client); - if (r < 0) { - remove_client(&(m->clients), client); - return r; - } - /* only request the client to cancel now in case the request is dropped by the client (chance to recancel) */ - if (m->cancel_requested) - request_cancel_client(client); - } else + if (new_client_fd < 0) return log_error_errno(errno, "Couldn't accept a new connection: %m"); + log_debug("New fsck client connected to fd: %d", new_client_fd); + + client = new0(Client, 1); + if (!client) + return log_oom(); + client->fd = new_client_fd; + client->manager = m; + LIST_PREPEND(clients, m->clients, client); + r = sd_event_add_io(m->event, NULL, client->fd, EPOLLIN, progress_handler, client); + if (r < 0) { + remove_client(&(m->clients), client); + return r; + } + /* only request the client to cancel now in case the request is dropped by the client (chance to recancel) */ + if (m->cancel_requested) + request_cancel_client(client); + return 0; } @@ -507,44 +517,47 @@ int main(int argc, char *argv[]) { log_set_target(LOG_TARGET_AUTO); log_parse_environment(); log_open(); + init_gettext(); 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; - } else if (n == 1) { + r = -EINVAL; + goto finish; + } else if (n == 1) fd = SD_LISTEN_FDS_START + 0; - } else { + else { fd = make_socket_fd(LOG_DEBUG, FSCKD_SOCKET_PATH, SOCK_STREAM | SOCK_CLOEXEC); if (fd < 0) { - log_error_errno(r, "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; }