Changeset 3200 for trunk/src/kmk/kmkbuiltin/kSubmit.c

Timestamp:

Mar 28, 2018, 10:32:11 PM (7 years ago)

Author:

bird

Message:

kmk,kWorker: Some fixes wrt output capture and ctrl-c.

File:

• trunk/src/kmk/kmkbuiltin/kSubmit.c (modified) (3 diffs)

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -71 +71 @@
 
 #define TUPLE(a_sz)     a_sz, sizeof(a_sz) - 1
+
 
 /*********************************************************************************************************************************
@@ -1151 +1152 @@
 # else
         if (MkWinChildCreateSubmit((intptr_t)pWorker->OverlappedRead.hEvent, pWorker,
-                                   pWorker->pStdOut, pWorker->pStdErr, pPidSpawned) == 0)
+                                   pWorker->pStdOut, pWorker->pStdErr, pChild, pPidSpawned) == 0)
         { /* likely */ }
         else
@@ -1691 +1692 @@
                the kWorker process currently does not coordinate its output with
                the output.c mechanics. */
+#ifdef CONFIG_NEW_WIN_CHILDREN
+            if (pCtx->pOut && !pWorker->pStdOut)
+#else
             if (pCtx->pOut)
+#endif
                 output_dump(pCtx->pOut);
-
             rcExit = kSubmitSendJobMessage(pCtx, pWorker, pvMsg, cbMsg, 0 /*fNoRespawning*/, cVerbosity);
             if (rcExit == 0)