Changeset 3237 in kBuild

Timestamp:

Dec 25, 2018 4:11:26 AM (6 years ago)

Author:

bird

Message:

kmk: linux build fixing...

Location:

trunk/src/kmk

Files:

• kmkbuiltin.h (modified) (1 diff)
• kmkbuiltin/err.c (modified) (1 diff)
• kmkbuiltin/redirect.c (modified) (4 diffs)

trunk/src/kmk/kmkbuiltin.h

@@ -35 +35 @@
 #endif
 #include <fcntl.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 /* For the GNU/hurd weirdo. */

trunk/src/kmk/kmkbuiltin/err.c

@@ -29 +29 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+# ifdef HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #else
 # include <stdlib.h>

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -33 +33 @@
 #include <assert.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
@@ -422 +423 @@
 }
 
+#if !defined(USE_POSIX_SPAWN) && !defined(KBUILD_OS_WINDOWS)
 
 /**
@@ -454 +456 @@
 }
 
-#if !defined(USE_POSIX_SPAWN) && !defined(KBUILD_OS_WINDOWS)
 
 /**
@@ -1291 +1292 @@
                     for (;;)
                     {
-                        pid_t pid = waitpid(pidChild, &rcExit, 0 /*block*/);
+                        int rcExitRaw = 1;
+                        pid_t pid = waitpid(pidChild, &rcExitRaw, 0 /*block*/);
                         if (pid == pidChild)
                         {
+                            rcExit = WIFEXITED(rcExitRaw) ? WEXITSTATUS(rcExitRaw) : 63;
                             if (cVerbosity > 0)
-                                warnx(pCtx, "debug: %d exit code: %d", pidChild, rcExit);
+                                warnx(pCtx, "debug: %d exit code: %d (%d)", pidChild, rcExit, rcExitRaw);
                             break;
                         }