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

Timestamp:

Aug 28, 2016, 5:31:02 PM (9 years ago)

Author:

bird

Message:

kmk: kSubmit is mostly done.

File:

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

trunk/src/kmk/kmkbuiltin.c

@@ -43 +43 @@
 #endif
 
-int kmk_builtin_command(const char *pszCmd, char ***ppapszArgvToSpawn, pid_t *pPidSpawned)
+int kmk_builtin_command(const char *pszCmd, struct child *pChild, char ***ppapszArgvToSpawn, pid_t *pPidSpawned)
 {
     int         argc;
@@ -155 +155 @@
      */
     if (!*pszCmd)
-        rc = kmk_builtin_command_parsed(argc, argv, ppapszArgvToSpawn, pPidSpawned);
+        rc = kmk_builtin_command_parsed(argc, argv, pChild, ppapszArgvToSpawn, pPidSpawned);
     else
         rc = 1;
@@ -167 +167 @@
 
 
-int kmk_builtin_command_parsed(int argc, char **argv, char ***ppapszArgvToSpawn, pid_t *pPidSpawned)
+int kmk_builtin_command_parsed(int argc, char **argv, struct child *pChild, char ***ppapszArgvToSpawn, pid_t *pPidSpawned)
 {
     const char *pszCmd = argv[0];
-    int         iumask;
+    int         iUmask;
     int         rc;
 
@@ -184 +184 @@
 
     /*
-     * String switch on the command.
-     */
-    iumask = umask(0);
-    umask(iumask);
+     * String switch on the command (frequent stuff at the top).
+     */
+    iUmask = umask(0);
+    umask(iUmask);
     if (!strcmp(pszCmd, "append"))
         rc = kmk_builtin_append(argc, argv, environ);
@@ -198 +198 @@
     else if (!strcmp(pszCmd, "kDepIDB"))
         rc = kmk_builtin_kDepIDB(argc, argv, environ);
+#ifdef KBUILD_OS_WINDOWS
+    else if (!strcmp(pszCmd, "kSubmit"))
+        rc = kmk_builtin_kSubmit(argc, argv, environ, pChild, pPidSpawned);
+#endif
     else if (!strcmp(pszCmd, "mkdir"))
         rc = kmk_builtin_mkdir(argc, argv, environ);
@@ -239 +243 @@
      */
     g_progname = "kmk";                 /* paranoia, make sure it's not pointing at a freed argv[0]. */
-    umask(iumask);
+    umask(iUmask);
 
 
@@ -261 +265 @@
 
         *ppapszArgvToSpawn = NULL;
-        rc = kmk_builtin_command_parsed(argc_new, argv_new, ppapszArgvToSpawn, pPidSpawned);
+        rc = kmk_builtin_command_parsed(argc_new, argv_new, pChild, ppapszArgvToSpawn, pPidSpawned);
 
         free(argv_new[0]);