Changeset 45 for trunk/src/kmk/job.c

Timestamp:

Apr 3, 2003, 4:23:37 AM (22 years ago)

Author:

bird

Message:

KMK changes..

File:

• trunk/src/kmk/job.c (modified) (21 diffs)

trunk/src/kmk/job.c

@@ -46 +46 @@
 #endif /* not lint */
 
-#ifdef NMAKE
+#if defined(NMAKE) || defined(KMK)
 #define OLD_JOKE 1
 #endif
@@ -190 +190 @@
 static char     tfile[sizeof(TMPPAT)];
 
-
+#ifndef KMK
 /*
  * Descriptions for various shells.
@@ -237 +237 @@
                                                    * executable image */
                 *shellName;                       /* last component of shell */
+#endif /*!KMK*/
 
 
@@ -326 +327 @@
 static void JobExec __P((Job *, char **));
 #endif
+#ifndef KMK
 static void JobMakeArgv __P((Job *, char **));
+#endif
 static void JobRestart __P((Job *));
 static int JobStart __P((GNode *, int, Job *));
@@ -594 +597 @@
         cmd++;
 
+    #ifndef KMK
     if (shutUp) {
         if (!(job->flags & JOB_SILENT) && !noSpecials &&
@@ -602 +606 @@
         }
     }
+    #endif
 
     if (errOff) {
         if ( !(job->flags & JOB_IGNERR) && !noSpecials) {
+            #ifdef KMK
+            errOff = FALSE;
+            #else
             if (commandShell->hasErrCtl) {
                 /*
@@ -650 +658 @@
                 errOff = FALSE;
             }
+            #endif
         } else {
             errOff = FALSE;
@@ -657 +666 @@
     DBPRINTF(cmdTemplate, cmd);
 
+    #ifndef KMK /*todo*/
     if (errOff) {
         /*
@@ -672 +682 @@
         DBPRINTF("%s\n", commandShell->echoOn);
     }
+    #endif
     return 0;
 }
@@ -1150 +1161 @@
                 if (strcmp(gn->name,"love") == 0)
                     (*abortProc)("Not war.");
-#ifdef NMAKE
+#if defined(NMAKE) || defined(KMK)
         else if (strcmp(gn->name,"fire") == 0)
                     (*abortProc)("No match.");
@@ -1302 +1313 @@
         } else
 #endif /* REMOTE */
+#ifdef KMK
+           (void) execv(argv[0], argv);
+#else
            (void) execv(shellPath, argv);
+#endif
 
         (void) write(2, "Could not execute shell\n",
@@ -1362 +1377 @@
 }
 
+
 /*-
  *-----------------------------------------------------------------------
@@ -1382 +1398 @@
     static char   args[10];     /* For merged arguments */
 
+#ifndef _PATH_DEFSHELLDIR
+    /* @todo! */
+    argv[0] = "c:\\os2\\cmd.exe";
+    argc = 1;
+#else
     argv[0] = shellName;
     argc = 1;
@@ -1415 +1436 @@
     }
     argv[argc] = NULL;
+#endif
 }
+
 
 /*-
@@ -1988 +2011 @@
     register char *ecp;
 
+    #ifndef KMK /* @Todo */
     if (commandShell->noPrint) {
         ecp = Str_FindSubstring(cp, commandShell->noPrint);
@@ -2023 +2047 @@
         }
     }
+    #endif /*!KMK*/
     return cp;
 }
@@ -2462 +2487 @@
     }
 
+#ifndef KMK
     if (shellPath == NULL) {
         /*
@@ -2480 +2506 @@
         commandShell->echo = "";
     }
+#endif
 
     /*
@@ -2588 +2615 @@
 }
 
+#ifndef KMK
 /*-
  *-----------------------------------------------------------------------
@@ -2629 +2657 @@
     return(match == NULL ? sh : match);
 }
-
+#endif /*!KMK*/
+
+#ifndef KMK
 /*-
  *-----------------------------------------------------------------------
@@ -2793 +2823 @@
     return SUCCESS;
 }
+#endif /*!KMK*/
 
 /*-