Issue #28746: Fix the set_inheritable() file descriptor method on platforms

Xavier de Gaye · Xavier de Gaye · commit ec5d3cd533be · 2016-11-19T16:19:29.000+01:00
that do not have the ioctl FIOCLEX and FIONCLEX commands
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.6.0 beta 4
 Core and Builtins
 -----------------
 
+- Issue #28746: Fix the set_inheritable() file descriptor method on platforms
+  that do not have the ioctl FIOCLEX and FIONCLEX commands.
+
 - Issue #26920: Fix not getting the locale's charset upon initializing the
   interpreter, on platforms that do not have langinfo.
 
diff --git a/Python/fileutils.c b/Python/fileutils.c
@@ -886,7 +886,7 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works)
         return 0;
     }
 
-    res = fcntl(fd, F_SETFD, flags);
+    res = fcntl(fd, F_SETFD, new_flags);
     if (res < 0) {
         if (raise)
             PyErr_SetFromErrno(PyExc_OSError);

Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,7 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works)`
`886`	`886`	`return 0;`
`887`	`887`	`}`
`888`	`888`
`889`		`- res = fcntl(fd, F_SETFD, flags);`
	`889`	`+ res = fcntl(fd, F_SETFD, new_flags);`
`890`	`890`	`if (res < 0) {`
`891`	`891`	`if (raise)`
`892`	`892`	`PyErr_SetFromErrno(PyExc_OSError);`