Do only one call to GetVersionEx in the common case.

[pspp] / lib / popen-safer.c

diff --git a/lib/popen-safer.c b/lib/popen-safer.c
index 2182a2c03c6a88f8f9d9a9d17e7713bc21bf61d4..3d87c28bb38fc103b797ca1c5a318004836bd686 100644 (file)
--- a/lib/popen-safer.c
+++ b/lib/popen-safer.c
@@ -27,20 +27,28 @@
 
 #include "cloexec.h"
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# define O_CLOEXEC O_NOINHERIT
-#elif !defined O_CLOEXEC
-# define O_CLOEXEC 0
-#endif
-
 /* Like open (name, flags | O_CLOEXEC), although not necessarily
    atomic.  FLAGS must not include O_CREAT.  */
 
 static int
 open_noinherit (char const *name, int flags)
 {
-  int fd = open (name, flags | O_CLOEXEC);
-  if (0 <= fd && !O_CLOEXEC && set_cloexec_flag (fd, true) != 0)
+  int fd;
+#ifdef O_CLOEXEC
+  /* 0 = unknown, 1 = yes, -1 = no.  */
+  static int have_cloexec;
+  if (have_cloexec >= 0)
+    {
+      fd = open (name, flags | O_CLOEXEC);
+      if (have_cloexec == 0 && (0 <= fd || errno == EINVAL))
+       have_cloexec = (0 <= fd ? 1 : -1);
+      if (have_cloexec == 1)
+       return fd;
+    }
+#endif
+
+  fd = open (name, flags);
+  if (0 <= fd && set_cloexec_flag (fd, true) != 0)
     {
       int saved_errno = errno;
       close (fd);