mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-29 06:59:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

connection: Handle fd passing in an CLOEXEC safe way

Browse source
This commit is contained in:
Kristian Høgsberg 2011-05-04 12:35:16 -04:00
parent 92d61f13b9
commit 8600408ced
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
wayland/connection.c
View file

@ -300,7 +300,7 @@ wl_connection_data(struct wl_connection *connection, uint32_t mask)
msg.msg_flags = 0; msg.msg_flags = 0;
do { do {
len = recvmsg(connection->fd, &msg, 0); len = recvmsg(connection->fd, &msg, MSG_CMSG_CLOEXEC);
} while (len < 0 && errno == EINTR); } while (len < 0 && errno == EINTR);
if (len < 0) { if (len < 0) {
@ -459,7 +459,7 @@ wl_connection_vmarshal(struct wl_connection *connection,
extra += sizeof *fd_ptr; extra += sizeof *fd_ptr;
fd = va_arg(ap, int); fd = va_arg(ap, int);
dup_fd = dup(fd); dup_fd = fcntl(fd, F_DUPFD_CLOEXEC, 0);
if (dup_fd < 0) { if (dup_fd < 0) {
fprintf(stderr, "dup failed: %m"); fprintf(stderr, "dup failed: %m");
abort(); abort();