From f6946c68aee90c6ae8337b3e42c72943e37a507e Mon Sep 17 00:00:00 2001 From: Matthew Malcomson Date: Sat, 21 Jan 2017 14:11:30 +0000 Subject: job-control: set CLOEXEC on pty processes. #5986 Before this change, new processes started with libuv prevented SIGHUP from reaching pty processes (by keeping the ptmx file descriptor open). --- src/nvim/fileio.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/nvim/fileio.c') diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 040df707de..9c64be6d0c 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -1742,16 +1742,11 @@ failed: } # endif - if (!read_buffer && !read_stdin) - close(fd); /* errors are ignored */ -#ifdef HAVE_FD_CLOEXEC - else { - int fdflags = fcntl(fd, F_GETFD); - if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) { - (void)fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC); - } + if (!read_buffer && !read_stdin) { + close(fd); // errors are ignored + } else { + (void)os_set_cloexec(fd); } -#endif xfree(buffer); if (read_stdin) { -- cgit