[Python-checkins] cpython: Issue 14359: Only use O_CLOEXEC in _posixmodule.c if it is defined.

[ross.lagerwall]

http://hg.python.org/cpython/rev/fe1dfc066a38
changeset:   75812:fe1dfc066a38
parent:      75803:b26056192653
user:        Ross Lagerwall <rosslagerwall at gmail.com>
date:        Sun Mar 18 15:55:10 2012 +0200
summary:
  Issue 14359: Only use O_CLOEXEC in _posixmodule.c if it is defined.

Based on patch from Hervé Coatanhay.

files:
  Modules/_posixsubprocess.c |  13 ++++++++++++-
  1 files changed, 12 insertions(+), 1 deletions(-)


diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -204,7 +204,18 @@
     int fd_dir_fd;
     if (start_fd >= end_fd)
         return;
-        fd_dir_fd = open(FD_DIR, O_RDONLY | O_CLOEXEC, 0);
+#ifdef O_CLOEXEC
+    fd_dir_fd = open(FD_DIR, O_RDONLY | O_CLOEXEC, 0);
+#else
+    fd_dir_fd = open(FD_DIR, O_RDONLY, 0);
+#ifdef FD_CLOEXEC
+    {
+        int old = fcntl(fd_dir_fd, F_GETFD);
+        if (old != -1)
+            fcntl(fd_dir_fd, F_SETFD, old | FD_CLOEXEC);
+    }
+#endif
+#endif
     if (fd_dir_fd == -1) {
         /* No way to get a list of open fds. */
         _close_fds_by_brute_force(start_fd, end_fd, py_fds_to_keep);

-- 
Repository URL: http://hg.python.org/cpython