Changeset 3192 for trunk/src/kmk/kmkbuiltin.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/kmkbuiltin.c (modified) (3 diffs)

trunk/src/kmk/kmkbuiltin.c

@@ -392 +392 @@
                     big_int nsStart = print_stats_flag ? nano_timestamp() : 0;
 #endif
+                    KMKBUILTINCTX Ctx;
                     int const iUmask = umask(0);        /* save umask */
                     umask(iUmask);
 
+                    Ctx.pszProgName = pEntry->uName.s.sz;
+                    Ctx.pOut = pChild ? &pChild->output : NULL;
+
                     if (pEntry->uFnSignature == FN_SIG_MAIN)
-                        rc = pEntry->u.pfnMain(argc, argv, papszEnvVars);
+                        rc = pEntry->u.pfnMain(argc, argv, papszEnvVars, &Ctx);
                     else if (pEntry->uFnSignature == FN_SIG_MAIN_SPAWNS)
-                        rc = pEntry->u.pfnMainSpawns(argc, argv, papszEnvVars, pChild, pPidSpawned);
+                        rc = pEntry->u.pfnMainSpawns(argc, argv, papszEnvVars, &Ctx, pChild, pPidSpawned);
                     else if (pEntry->uFnSignature == FN_SIG_MAIN_TO_SPAWN)
                     {
@@ -406 +410 @@
                          * problem then (the call stack shows what's been going on).
                          */
-                        rc = pEntry->u.pfnMainToSpawn(argc, argv, papszEnvVars, ppapszArgvToSpawn);
+                        rc = pEntry->u.pfnMainToSpawn(argc, argv, papszEnvVars, &Ctx, ppapszArgvToSpawn);
                         if (   !rc
                             && *ppapszArgvToSpawn
@@ -429 +433 @@
                         rc = 99;
 
-                    g_progname = "kmk";                 /* paranoia, make sure it's not pointing at a freed argv[0]. */
                     umask(iUmask);                      /* restore it */