Changeset 1290 for trunk/src/kmk/kmkbuiltin.c

Timestamp:

Dec 1, 2007, 1:22:28 AM (18 years ago)

Author:

bird

Message:

Allow builtins to spawn and schedule spawning.

File:

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

trunk/src/kmk/kmkbuiltin.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <ctype.h>
+#include <assert.h>
 #ifdef _MSC_VER
 # include <io.h>
@@ -39 +40 @@
 #endif
 
-int kmk_builtin_command(const char *pszCmd)
+int kmk_builtin_command(const char *pszCmd, char ***ppapszArgvToSpawn, pid_t *pPidSpawned)
 {
     int         argc;
@@ -151 +152 @@
      */
     if (!*pszCmd)
-        rc = kmk_builtin_command_parsed(argc, argv);
+        rc = kmk_builtin_command_parsed(argc, argv, ppapszArgvToSpawn, pPidSpawned);
     else
         rc = 1;
@@ -163 +164 @@
 
 
-int kmk_builtin_command_parsed(int argc, char **argv)
+int kmk_builtin_command_parsed(int argc, char **argv, char ***ppapszArgvToSpawn, pid_t *pPidSpawned)
 {
     const char *pszCmd = argv[0];
@@ -194 +195 @@
     else if (!strcmp(pszCmd, "kDepIDB"))
         rc = kmk_builtin_kDepIDB(argc, argv, environ);
-    else if (!strcmp(pszCmd, "ln"))
-        rc = kmk_builtin_ln(argc, argv, environ);
     else if (!strcmp(pszCmd, "mkdir"))
         rc = kmk_builtin_mkdir(argc, argv, environ);
     else if (!strcmp(pszCmd, "mv"))
         rc = kmk_builtin_mv(argc, argv, environ);
+    /*else if (!strcmp(pszCmd, "redirect"))
+        rc = kmk_builtin_redirect(argc, argv, environ, pPidSpawned);*/
     else if (!strcmp(pszCmd, "rm"))
         rc = kmk_builtin_rm(argc, argv, environ);
     else if (!strcmp(pszCmd, "rmdir"))
         rc = kmk_builtin_rmdir(argc, argv, environ);
+    /*else if (!strcmp(pszCmd, "test"))
+        rc = kmk_builtin_test(argc, argv, environ, ppapszArgvToSpawn);*/
     /* rarely used commands: */
     else if (!strcmp(pszCmd, "cp"))
         rc = kmk_builtin_cp(argc, argv, environ);
+    else if (!strcmp(pszCmd, "ln"))
+        rc = kmk_builtin_ln(argc, argv, environ);
     else if (!strcmp(pszCmd, "md5sum"))
         rc = kmk_builtin_md5sum(argc, argv, environ);
@@ -218 +223 @@
         return 1;
     }
+
+    /*
+     * Cleanup.
+     */
     g_progname = "kmk";                 /* paranoia, make sure it's not pointing at a freed argv[0]. */
     umask(iumask);
+
+
+    /*
+     * If we've executed a conditional test or something that wishes to execute
+     * some child process, check if the child is a kmk_builtin thing. We recurse
+     * here, both because I'm lazy and because it's easier to debug a problem then
+     * (the call stack shows what's been going on).
+     */
+    if (    !rc
+        &&  *ppapszArgvToSpawn
+        &&  !strncmp(**ppapszArgvToSpawn, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
+    {
+        char **argv_new = *ppapszArgvToSpawn;
+        int argc_new = 1;
+        while (argv_new[argc_new])
+          argc_new++;
+
+        assert(argv_new[0] != argv[0]);
+        assert(!*pPidSpawned);
+
+        *ppapszArgvToSpawn = NULL;
+        rc = kmk_builtin_command_parsed (argc_new, argv_new, ppapszArgvToSpawn, pPidSpawned);
+
+        free (argv_new[0]);
+        free (argv_new);
+    }
+
     return rc;
 }