diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-11-03 00:14:48 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-11-03 00:14:48 +0000 |
| commit | b4c810cf509e2ee90a476f48612e12f195f3a5b1 (patch) | |
| tree | 5c51a1744751e43bed95c72b8d4c842229643be5 | |
| parent | term: asynchronous writes to slave (diff) | |
| parent | slave: turn on FD_CLOEXEC after slave has been spawned (diff) | |
Merge branch 'master' into async-ptmx
| -rw-r--r-- | server.c | 2 | ||||
| -rw-r--r-- | slave.c | 9 |
2 files changed, 10 insertions, 1 deletions
@@ -290,7 +290,7 @@ server_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl) 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"); goto err; } @@ -127,6 +127,15 @@ slave_spawn(int ptmx, int argc, char *const *argv, return -1; } else 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; } } |
