mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-18 05:34:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into async-ptmx

Browse source
This commit is contained in:
Daniel Eklöf 2019-11-03 01:14:48 +01:00
commit b4c810cf50
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server.c
View file

@ -290,7 +290,7 @@ server_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl)
unlink(sock_path); unlink(sock_path);
if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | FD_CLOEXEC) < 0) { if (fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC) < 0) {
LOG_ERRNO("failed to set FD_CLOEXEC on socket"); LOG_ERRNO("failed to set FD_CLOEXEC on socket");
goto err; goto err;
} }

9
slave.c
View file

@ -127,6 +127,15 @@ slave_spawn(int ptmx, int argc, char *const *argv,
return -1; return -1;
} else } else
LOG_DBG("%s: successfully started", conf_shell); LOG_DBG("%s: successfully started", conf_shell);
int fd_flags;
if ((fd_flags = fcntl(ptmx, F_GETFD)) < 0 ||
fcntl(ptmx, F_SETFD, fd_flags | FD_CLOEXEC) < 0)
{
LOG_ERRNO("failed to set FD_CLOEXEC on ptmx");
return -1;
}
break; break;
} }
} }