#include <sys/un.h>
#include <unistd.h>
+#include "sd-daemon.h"
#include "build.h"
#include "def.h"
#include "event-util.h"
-#include "fsckd.h"
#include "log.h"
#include "list.h"
#include "macro.h"
-#include "sd-daemon.h"
#include "socket-util.h"
#include "util.h"
+#include "fsckd.h"
#define IDLE_TIME_SECONDS 30
#define PLYMOUTH_REQUEST_KEY "K\2\2\3"
}
static int request_cancel_client(Client *current) {
- FsckdMessage cancel_msg;
+ FsckdMessage cancel_msg = {
+ .cancel = 1,
+ };
+
ssize_t n;
- cancel_msg.cancel = 1;
n = send(current->fd, &cancel_msg, sizeof(FsckdMessage), 0);
- if (n < 0 || (size_t) n < sizeof(FsckdMessage))
- return log_warning_errno(n, "Cannot send cancel to fsck on (%u, %u): %m",
- major(current->devnum), minor(current->devnum));
- else
- current->cancelled = true;
+ if (n < 0)
+ return log_warning_errno(errno, "Cannot send cancel to fsck on (%u:%u): %m", major(current->devnum), minor(current->devnum));
+ if ((size_t) n < sizeof(FsckdMessage)) {
+ log_warning("Short send when sending cancel to fsck on (%u:%u).", major(current->devnum), minor(current->devnum));
+ return -EIO;
+ }
+
+ current->cancelled = true;
return 0;
}
}
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;
}
"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;
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) {
/* 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;
}
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;
}
~ianmdlvl / elogind.git / blobdiff