mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 22:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fopen_noinh_readbin: restore WIN32 decision

Browse Source
This commit is contained in:
Justin M. Keyes
2016-05-28 12:53:31 -04:00
parent fe0c3999ca
commit 8c127c77a6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/ex_cmds2.c
View File

@@ -2481,24 +2481,28 @@ int source_level(void *cookie)
return ((struct source_cookie *)cookie)->level; return ((struct source_cookie *)cookie)->level;
} }
/// Special function to open a file without handle inheritance. /// Special function to open a file without handle inheritance.
/// If possible the handle is closed on exec(). /// If possible the handle is closed on exec().
static FILE *fopen_noinh_readbin(char *filename) static FILE *fopen_noinh_readbin(char *filename)
{ {
#ifdef WIN32
int fd_tmp = os_open(filename, O_RDONLY | O_BINARY | O_NOINHERIT, 0);
#else
int fd_tmp = os_open(filename, O_RDONLY, 0); int fd_tmp = os_open(filename, O_RDONLY, 0);
#endif
if (fd_tmp < 0) if (fd_tmp < 0) {
return NULL; return NULL;
}
# ifdef HAVE_FD_CLOEXEC #ifdef HAVE_FD_CLOEXEC
{ {
int fdflags = fcntl(fd_tmp, F_GETFD); int fdflags = fcntl(fd_tmp, F_GETFD);
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) { if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
(void)fcntl(fd_tmp, F_SETFD, fdflags | FD_CLOEXEC); (void)fcntl(fd_tmp, F_SETFD, fdflags | FD_CLOEXEC);
} }
} }
# endif #endif
return fdopen(fd_tmp, READBIN); return fdopen(fd_tmp, READBIN);
} }