mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Xwayland: rename notify pipe 'p' to notify_fd

Browse source
This commit is contained in:
Dominique Martinet 2022-02-15 19:33:41 +09:00 • committed by Simon Ser
parent c84744321e
commit 1666e377e2
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xwayland/server.c
View file

@ -323,33 +323,33 @@ static bool server_start(struct wlr_xwayland_server *server) {
server->client_destroy.notify = handle_client_destroy; server->client_destroy.notify = handle_client_destroy;
wl_client_add_destroy_listener(server->client, &server->client_destroy); wl_client_add_destroy_listener(server->client, &server->client_destroy);
int p[2]; int notify_fd[2];
if (pipe(p) == -1) { if (pipe(notify_fd) == -1) {
wlr_log_errno(WLR_ERROR, "pipe failed"); wlr_log_errno(WLR_ERROR, "pipe failed");
server_finish_process(server); server_finish_process(server);
return false; return false;
} }
if (!set_cloexec(p[1], true) || !set_cloexec(p[0], true)) { if (!set_cloexec(notify_fd[1], true) || !set_cloexec(notify_fd[0], true)) {
wlr_log(WLR_ERROR, "Failed to set CLOEXEC on FD"); wlr_log(WLR_ERROR, "Failed to set CLOEXEC on FD");
server_finish_process(server); server_finish_process(server);
return false; return false;
} }
struct wl_event_loop *loop = wl_display_get_event_loop(server->wl_display); struct wl_event_loop *loop = wl_display_get_event_loop(server->wl_display);
server->pipe_source = wl_event_loop_add_fd(loop, p[0], server->pipe_source = wl_event_loop_add_fd(loop, notify_fd[0],
WL_EVENT_READABLE, xserver_handle_ready, server); WL_EVENT_READABLE, xserver_handle_ready, server);
server->pid = fork(); server->pid = fork();
if (server->pid < 0) { if (server->pid < 0) {
wlr_log_errno(WLR_ERROR, "fork failed"); wlr_log_errno(WLR_ERROR, "fork failed");
close(p[0]); close(notify_fd[0]);
close(p[1]); close(notify_fd[1]);
server_finish_process(server); server_finish_process(server);
return false; return false;
} else if (server->pid == 0) { } else if (server->pid == 0) {
/* Double-fork, but we need to forward SIGUSR1 once Xserver(1) /* Double-fork, but we need to forward SIGUSR1 once Xserver(1)
* is ready, or error if there was one. */ * is ready, or error if there was one. */
close(p[0]); close(notify_fd[0]);
sigset_t sigset; sigset_t sigset;
sigemptyset(&sigset); sigemptyset(&sigset);
sigaddset(&sigset, SIGUSR1); sigaddset(&sigset, SIGUSR1);
@ -359,7 +359,7 @@ static bool server_start(struct wlr_xwayland_server *server) {
pid_t pid = fork(); pid_t pid = fork();
if (pid < 0) { if (pid < 0) {
wlr_log_errno(WLR_ERROR, "second fork failed"); wlr_log_errno(WLR_ERROR, "second fork failed");
(void)!write(p[1], "\n", 1); (void)!write(notify_fd[1], "\n", 1);
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} else if (pid == 0) { } else if (pid == 0) {
exec_xwayland(server); exec_xwayland(server);
@ -367,7 +367,7 @@ static bool server_start(struct wlr_xwayland_server *server) {
int sig; int sig;
sigwait(&sigset, &sig); sigwait(&sigset, &sig);
if (write(p[1], "\n", 1) < 1) { if (write(notify_fd[1], "\n", 1) < 1) {
// Note: if this write failed and we've leaked the write // Note: if this write failed and we've leaked the write
// end of the pipe (due to a race between another thread // end of the pipe (due to a race between another thread
// exec'ing and our call to fcntl), then our handler will // exec'ing and our call to fcntl), then our handler will
@ -387,7 +387,7 @@ static bool server_start(struct wlr_xwayland_server *server) {
/* close child fds */ /* close child fds */
/* remain managing x sockets for lazy start */ /* remain managing x sockets for lazy start */
close(p[1]); close(notify_fd[1]);
close(server->wl_fd[1]); close(server->wl_fd[1]);
safe_close(server->wm_fd[1]); safe_close(server->wm_fd[1]);
server->wl_fd[1] = server->wm_fd[1] = -1; server->wl_fd[1] = server->wm_fd[1] = -1;