diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | io.c | 2 | ||||
| -rw-r--r-- | win32/win32.c | 3 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Fri Nov 18 13:03:38 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * io.c (rb_cloexec_open): set O_NOINHERIT instead of O_CLOEXEC if it is + available (for Windows). + + * win32/win32.c (fcntl): on F_DUPFD, determine the inheritance of the + new handle by O_NOINHERIT flag of original fd. + Fri Nov 18 08:00:41 2011 Ryan Davis <ryan@lust.zenspider.com> * lib/minitest/*: Imported minitest 2.8.1 (r6750) @@ -195,6 +195,8 @@ rb_cloexec_open(const char *pathname, int flags, mode_t mode) #ifdef O_CLOEXEC /* O_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */ flags |= O_CLOEXEC; +#elif defined O_NOINHERIT + flags |= O_NOINHERIT; #endif ret = open(pathname, flags, mode); if (ret == -1) return -1; diff --git a/win32/win32.c b/win32/win32.c index b570a4295d..c7f853ce81 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3849,7 +3849,8 @@ fcntl(int fd, int cmd, ...) int ret; HANDLE hDup; if (!(DuplicateHandle(GetCurrentProcess(), (HANDLE)_get_osfhandle(fd), - GetCurrentProcess(), &hDup, 0L, TRUE, + GetCurrentProcess(), &hDup, 0L, + !(_osfile(fd) & FNOINHERIT), DUPLICATE_SAME_ACCESS))) { errno = map_errno(GetLastError()); return -1; |