Commit adebcb16 by Russell Belfer

Merge pull request #2360 from phkelley/noinherit

Win32: Supply _O_NOINHERIT when calling _wopen
parents 228272ef f0b820dd
...@@ -19,6 +19,15 @@ ...@@ -19,6 +19,15 @@
# define FILE_NAME_NORMALIZED 0 # define FILE_NAME_NORMALIZED 0
#endif #endif
/* Options which we always provide to _wopen.
*
* _O_BINARY - Raw access; no translation of CR or LF characters
* _O_NOINHERIT - Do not mark the created handle as inheritable by child processes.
* The Windows default is 'not inheritable', but the CRT's default (following
* POSIX convention) is 'inheritable'. We have no desire for our handles to be
* inheritable on Windows, so specify the flag to get default behavior back. */
#define STANDARD_OPEN_FLAGS (_O_BINARY | _O_NOINHERIT)
/* GetFinalPathNameByHandleW signature */ /* GetFinalPathNameByHandleW signature */
typedef DWORD(WINAPI *PFGetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, DWORD); typedef DWORD(WINAPI *PFGetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, DWORD);
...@@ -317,7 +326,7 @@ int p_open(const char *path, int flags, ...) ...@@ -317,7 +326,7 @@ int p_open(const char *path, int flags, ...)
va_end(arg_list); va_end(arg_list);
} }
return _wopen(buf, flags | _O_BINARY, mode); return _wopen(buf, flags | STANDARD_OPEN_FLAGS, mode);
} }
int p_creat(const char *path, mode_t mode) int p_creat(const char *path, mode_t mode)
...@@ -327,7 +336,7 @@ int p_creat(const char *path, mode_t mode) ...@@ -327,7 +336,7 @@ int p_creat(const char *path, mode_t mode)
if (utf8_to_16_with_errno(buf, path) < 0) if (utf8_to_16_with_errno(buf, path) < 0)
return -1; return -1;
return _wopen(buf, _O_WRONLY | _O_CREAT | _O_TRUNC | _O_BINARY, mode); return _wopen(buf, _O_WRONLY | _O_CREAT | _O_TRUNC | STANDARD_OPEN_FLAGS, mode);
} }
int p_getcwd(char *buffer_out, size_t size) int p_getcwd(char *buffer_out, size_t size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment