mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwayland: use pipe2()

Browse Source 
We are already using pipe2() in many places, even in libweston, so let's
simplify the code here as well - not to mention avoid a theoretical
race.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen
2022-07-07 14:30:17 +03:00
committed by Pekka Paalanen
parent 4c0bdbfde9
commit a3d7199bea
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/xwayland.c
+2 -12
View File
@@ -30,6 +30,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <fcntl.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "compositor/weston.h" #include "compositor/weston.h"
@@ -154,21 +155,10 @@ spawn_xserver(void *user_data, const char *display, int abstract_fd, int unix_fd
} }
fdstr_update_str1(&x11_wm_socket); fdstr_update_str1(&x11_wm_socket);
if (pipe(display_pipe.fds) < 0) { if (pipe2(display_pipe.fds, O_CLOEXEC) < 0) {
weston_log("pipe creation for displayfd failed\n"); weston_log("pipe creation for displayfd failed\n");
return 1; return 1;
} }
if (os_fd_set_cloexec(display_pipe.fds[0]) != 0) {
weston_log("failed setting compositor end of displayfd as cloexec\n");
return 1;
}
if (os_fd_set_cloexec(display_pipe.fds[1]) != 0) {
weston_log("failed setting Xwayland end of displayfd as cloexec\n");
return 1;
}
fdstr_update_str1(&display_pipe); fdstr_update_str1(&display_pipe);
fdstr_set_fd1(&x11_abstract_socket, abstract_fd); fdstr_set_fd1(&x11_abstract_socket, abstract_fd);