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

trunk/src/kmk/job.c

@@ -1211 +1211 @@
     {
       int    rc;
+      char **argv_spawn = NULL;
       char **p2 = argv;
-      while (*p2 && strncmp(*p2, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
-          p2++;
-      assert(*p2);
+      while (*p2 && strncmp (*p2, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
+        p2++;
+      assert (*p2);
       set_command_state (child->file, cs_running);
+      child->pid = 0;
       if (p2 != argv)
-          rc = kmk_builtin_command(*p2);
+        rc = kmk_builtin_command (*p2, &argv_spawn, &child->pid);
       else
-      {
+        {
           int argc = 1;
           while (argv[argc])
-              argc++;
-          rc = kmk_builtin_command_parsed(argc, argv);
-      }
+            argc++;
+          rc = kmk_builtin_command_parsed (argc, argv, &argv_spawn, &child->pid);
+        }
+
 #ifndef VMS
       free (argv[0]);
       free ((char *) argv);
 #endif
-      if (!rc)
-          goto next_command;
-      child->pid = (pid_t)42424242;
-      child->status = rc << 8;
-      child->has_status = 1;
-      return;
+
+      /* synchronous command execution? */
+      if (!rc && !argv_spawn)
+        goto next_command;
+
+      /* spawned a child? */
+      if (!rc && child->pid)
+        {
+          ++job_counter;
+          return;
+        }
+
+      /* failure? */
+      if (rc)
+        {
+          child->pid = (pid_t)42424242;
+          child->status = rc << 8;
+          child->has_status = 1;
+          unblock_sigs();
+          return;
+        }
+
+      /* conditional check == true; kicking off a child (not kmk_builtin_*). */
+      argv = argv_spawn;
     }
 #endif /* CONFIG_WITH_KMK_BUILTIN */
@@ -1509 +1530 @@
 
   /* Free the storage used by the child's argument list.  */
+#ifdef KMK /* leak */
+ cleanup_argv:
+#endif
 #ifndef VMS
   free (argv[0]);
@@ -1519 +1543 @@
   child->file->update_status = 2;
   notice_finished_file (child->file);
+#ifdef KMK /* fix leak */
+  goto cleanup_argv;
+#else
   return;
+#endif
 }