Changeset 3562

Timestamp:

Mar 8, 2022, 12:10:40 PM (3 years ago)

Author:

bird

Message:

kmk_redirect: Must redirect stdout/err according to the pCtx when not on windows.

File:

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

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -1418 +1418 @@
 #ifdef USE_POSIX_SPAWN
     /*
-     * Init posix attributes.
+     * Init posix attributes with stdout/err redirections according to pCtx.
      */
     rcExit = posix_spawn_file_actions_init(&FileActions);
     if (rcExit != 0)
         rcExit = errx(pCtx, 9, "posix_spawn_file_actions_init failed: %s", strerror(rcExit));
+# ifndef CONFIG_WITH_OUTPUT_IN_MEMORY
+    if (pCtx->pOut && rcExit == 0)
+    {
+        if (pCtx->pOut->out >= 0)
+        {
+            rcExit = posix_spawn_file_actions_adddup2(&FileActions, pCtx->pOut->out, 1);
+            if (rcExit != 0)
+                rcExit = errx(pCtx, 2, "posix_spawn_file_actions_addclose(%d, 1) failed: %s", pCtx->pOut->out, strerror(rcExit));
+        }
+        if (pCtx->pOut->err >= 0 && rcExit == 0)
+        {
+            rcExit = posix_spawn_file_actions_adddup2(&FileActions, pCtx->pOut->err, 2);
+            if (rcExit != 0)
+                rcExit = errx(pCtx, 2, "posix_spawn_file_actions_addclose(%d, 1) failed: %s", pCtx->pOut->err, strerror(rcExit));
+        }
+    }
+# endif
 #endif
 
@@ -1761 +1778 @@
                         rcExit = posix_spawn_file_actions_adddup2(&FileActions, fdSource, fd);
                         if (rcExit != 0)
-                            rcExit = errx(pCtx, 2, "posix_spawn_file_actions_addclose(%d) failed: %s", fd, strerror(rcExit));
+                            rcExit = errx(pCtx, 2, "posix_spawn_file_actions_adddup2(%d) failed: %s",
+                                          fdSource, fd, strerror(rcExit));
 #endif
                     }