Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fixes incorrect use of GetLastError where errno should be used.

This commit is contained in:
Steve Dower 2015-03-14 11:38:27 -07:00
parent 0d70ab6b8c
commit 41e7244c06
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Python/fileutils.c
View File

@ -593,7 +593,7 @@ get_inheritable(int fd, int raise)
handle = (HANDLE)_get_osfhandle(fd); handle = (HANDLE)_get_osfhandle(fd);
if (handle == INVALID_HANDLE_VALUE) { if (handle == INVALID_HANDLE_VALUE) {
if (raise) if (raise)
PyErr_SetFromWindowsErr(0); PyErr_SetFromErrno(PyExc_OSError);
return -1; return -1;
} }
@ -648,10 +648,10 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works)
if (atomic_flag_works != NULL && !inheritable) { if (atomic_flag_works != NULL && !inheritable) {
if (*atomic_flag_works == -1) { if (*atomic_flag_works == -1) {
int inheritable = get_inheritable(fd, raise); int isInheritable = get_inheritable(fd, raise);
if (inheritable == -1) if (isInheritable == -1)
return -1; return -1;
*atomic_flag_works = !inheritable; *atomic_flag_works = !isInheritable;
} }
if (*atomic_flag_works) if (*atomic_flag_works)
@ -668,7 +668,7 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works)
handle = (HANDLE)_get_osfhandle(fd); handle = (HANDLE)_get_osfhandle(fd);
if (handle == INVALID_HANDLE_VALUE) { if (handle == INVALID_HANDLE_VALUE) {
if (raise) if (raise)
PyErr_SetFromWindowsErr(0); PyErr_SetFromErrno(PyExc_OSError);
return -1; return -1;
} }
@ -1027,7 +1027,7 @@ _Py_dup(int fd)
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
handle = (HANDLE)_get_osfhandle(fd); handle = (HANDLE)_get_osfhandle(fd);
if (handle == INVALID_HANDLE_VALUE) { if (handle == INVALID_HANDLE_VALUE) {
PyErr_SetFromWindowsErr(0); PyErr_SetFromErrno(PyExc_OSError);
return -1; return -1;
} }