Changeset 3192 for trunk/src/kmk/w32/winchildren.c

Timestamp:

Mar 26, 2018, 10:25:56 PM (7 years ago)

Author:

bird

Message:

kmkbuiltin: funnel output thru output.c (usually via err.c).

File:

• trunk/src/kmk/w32/winchildren.c (modified) (1 diff)

trunk/src/kmk/w32/winchildren.c

@@ -1958 +1958 @@
 {
     PCKMKBUILTINENTRY pBuiltIn = pChild->u.BuiltIn.pBuiltIn;
+    KMKBUILTINCTX Ctx = { pBuiltIn->uName.s.sz, pChild->pMkChild ? &pChild->pMkChild->output : NULL };
     if (pBuiltIn->uFnSignature == FN_SIG_MAIN)
-        pChild->iExitCode = pBuiltIn->u.pfnMain(pChild->u.BuiltIn.cArgs, pChild->u.BuiltIn.papszArgs, pChild->u.BuiltIn.papszEnv);
+        pChild->iExitCode = pBuiltIn->u.pfnMain(pChild->u.BuiltIn.cArgs, pChild->u.BuiltIn.papszArgs,
+                                                pChild->u.BuiltIn.papszEnv, &Ctx);
     else if (pBuiltIn->uFnSignature == FN_SIG_MAIN_SPAWNS)
         pChild->iExitCode = pBuiltIn->u.pfnMainSpawns(pChild->u.BuiltIn.cArgs, pChild->u.BuiltIn.papszArgs,
-                                                      pChild->u.BuiltIn.papszEnv, pChild->pMkChild, NULL);
+                                                      pChild->u.BuiltIn.papszEnv, &Ctx, pChild->pMkChild, NULL);
     else
     {