mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

seatd: Ensure socket gets unlinked on error

Browse source
This commit is contained in:
Kenny Levinsen 2022-02-21 11:37:26 +01:00
parent 157ce68565
commit 0864f6a3ac
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
seatd/seatd.c
View file

@ -145,22 +145,21 @@ int main(int argc, char *argv[]) {
struct server server = {0};
if (server_init(&server) == -1) {
log_errorf("server_create failed: %s", strerror(errno));
log_errorf("server_init failed: %s", strerror(errno));
return 1;
}
int ret = 1;
int socket_fd = open_socket(socket_path, uid, gid);
if (socket_fd == -1) {
log_error("Could not create server socket");
server_finish(&server);
return 1;
goto error_server;
}
if (poller_add_fd(&server.poller, socket_fd, EVENT_READABLE, server_handle_connection,
&server) == NULL) {
log_errorf("Could not add socket to poller: %s", strerror(errno));
close(socket_fd);
server_finish(&server);
return 1;
goto error_socket;
}
log_info("seatd started");
@ -175,12 +174,16 @@ int main(int argc, char *argv[]) {
while (server.running) {
if (poller_poll(&server.poller) == -1) {
log_errorf("Poller failed: %s", strerror(errno));
return 1;
goto error_socket;
}
}
server_finish(&server);
ret = 0;
error_socket:
unlink(socket_path);
error_server:
server_finish(&server);
log_info("seatd stopped");
return 0;
return ret;
}