Issue #23524: Change back to using Windows errors for _Py_fstat instead of the errno shim.

zooba · zooba · commit 8acde7dccebd · 2015-03-07T18:14:07.000-08:00
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
@@ -182,7 +182,13 @@ check_fd(int fd)
 {
 #if defined(HAVE_FSTAT) || defined(MS_WINDOWS)
     struct _Py_stat_struct buf;
-    if (_Py_fstat(fd, &buf) < 0 && errno == EBADF) {
+    if (_Py_fstat(fd, &buf) < 0 &&
+#ifdef MS_WINDOWS
+        GetLastError() == ERROR_INVALID_HANDLE
+#else
+        errno == EBADF
+#endif
+        ) {
         PyObject *exc;
         char *msg = strerror(EBADF);
         exc = PyObject_CallFunction(PyExc_OSError, "(is)",
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -560,7 +560,7 @@ signal_set_wakeup_fd(PyObject *self, PyObject *args)
             }
 
             if (_Py_fstat(fd, &st) != 0) {
-                PyErr_SetFromErrno(PyExc_OSError);
+                PyErr_SetExcFromWindowsErr(PyExc_OSError, GetLastError());
                 return NULL;
             }
 
diff --git a/Python/fileutils.c b/Python/fileutils.c
@@ -637,10 +637,14 @@ _Py_fstat(int fd, struct _Py_stat_struct *result)
     else
         h = (HANDLE)_get_osfhandle(fd);
 
+    /* Protocol violation: we explicitly clear errno, instead of
+       setting it to a POSIX error. Callers should use GetLastError. */
     errno = 0;
 
     if (h == INVALID_HANDLE_VALUE) {
-        errno = EBADF;
+        /* This is really a C library error (invalid file handle).
+           We set the Win32 error to the closes one matching. */
+        SetLastError(ERROR_INVALID_HANDLE);
         return -1;
     }
     memset(result, 0, sizeof(*result));
@@ -649,7 +653,6 @@ _Py_fstat(int fd, struct _Py_stat_struct *result)
     if (type == FILE_TYPE_UNKNOWN) {
         DWORD error = GetLastError();
         if (error != 0) {
-            errno = EINVAL;
             return -1;
         }
         /* else: valid but unknown file */
@@ -664,7 +667,6 @@ _Py_fstat(int fd, struct _Py_stat_struct *result)
     }
 
     if (!GetFileInformationByHandle(h, &info)) {
-        errno = EINVAL;
         return -1;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ signal_set_wakeup_fd(PyObject self, PyObject args)`
`560`	`560`	`}`
`561`	`561`
`562`	`562`	`if (_Py_fstat(fd, &st) != 0) {`
`563`		`- PyErr_SetFromErrno(PyExc_OSError);`
	`563`	`+ PyErr_SetExcFromWindowsErr(PyExc_OSError, GetLastError());`
`564`	`564`	`return NULL;`
`565`	`565`	`}`
`566`	`566`