Changeset 3071 in kBuild

Timestamp:

Oct 2, 2017 8:14:40 AM (7 years ago)

Author:

bird

Message:

redirect.c: solaris 10 build fix (no O_CLOEXEC flag)

File:

• trunk/src/kmk/kmkbuiltin/redirect.c (modified) (4 diffs)

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -47 +47 @@
 # include <unistd.h>
 # include <spawn.h>
+# include <sys/wait.h>
 #endif
 
@@ -384 +385 @@
     int const   fNoInherit = O_CLOEXEC;
 #else
-# error "port me"
+    int const   fNoInherit = 0;
+# define USE_FD_CLOEXEC
 #endif
     int         aFdTries[32];
@@ -406 +408 @@
             return fdOpened;
 #ifndef _MSC_VER /* Stupid, stupid MSVCRT!  No friggin way of making a handle inheritable (or not). */
-        if (fcntl(fdOpened, F_SETFD, FD_CLOEXEC) != -1)
+# ifndef USE_FD_CLOEXEC
+        if (fcntl(fdOpened, F_SETFD, 0) != -1)
+# endif
             return fdOpened;
 #endif
@@ -428 +432 @@
             {
 #ifndef _MSC_VER
+# ifdef USE_FD_CLOEXEC
+                if (   fdOpened == fdTarget
+                    || fcntl(fdOpened, F_SETFD, FD_CLOEXEC) != -1)
+# else
                 if (   fdOpened != fdTarget
-                    || fcntl(fdOpened, F_SETFD, FD_CLOEXEC) != -1)
+                    || fcntl(fdOpened, F_SETFD, 0) != -1)
+# endif
 #endif
                 {