X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/aabb62170f4cd84da42212f7e5c6c013746bb348..ac8c8bbadf24f6d4cc495d6511e62b33c5101024:/usr/src/usr.bin/make/job.c

diff --git a/usr/src/usr.bin/make/job.c b/usr/src/usr.bin/make/job.c
index 751602236a..184e42de83 100644
--- a/usr/src/usr.bin/make/job.c
+++ b/usr/src/usr.bin/make/job.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)job.c	5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)job.c	5.11 (Berkeley) %G%";
 #endif /* not lint */
 
 /*-
@@ -801,9 +801,9 @@ Job_Touch (gn, silent)
     struct timeval times[2];	/* Times for utimes() call */
     struct stat attr;        /* Attributes of the file */
 
-    if (gn->type & (OP_JOIN|OP_USE|OP_EXEC|OP_DONTCARE)) {
+    if (gn->type & (OP_JOIN|OP_USE|OP_EXEC|OP_OPTIONAL)) {
 	/*
-	 * .JOIN, .USE, .ZEROTIME and .DONTCARE targets are "virtual" targets
+	 * .JOIN, .USE, .ZEROTIME and .OPTIONAL targets are "virtual" targets
 	 * and, as such, shouldn't really be created.
 	 */
 	return;
@@ -896,7 +896,7 @@ Job_CheckCommands (gn, abortProc)
 	     * given, we stop in our tracks, otherwise we just don't update
 	     * this node's parents so they never get examined. 
 	     */
-	    if (gn->type & OP_DONTCARE) {
+	    if (gn->type & OP_OPTIONAL) {
 		printf ("Can't figure out how to make %s (ignored)\n",
 			gn->name);
 	    } else if (keepgoing) {
@@ -1340,7 +1340,7 @@ JobStart (gn, flags, previous)
 	previous->flags &= ~ (JOB_FIRST|JOB_IGNERR|JOB_SILENT|JOB_REMOTE);
 	job = previous;
     } else {
-	job = (Job *) malloc (sizeof (Job));
+	job = (Job *) emalloc (sizeof (Job));
 	if (job == (Job *)NULL) {
 	    Punt("JobStart out of memory");
 	}
@@ -2095,7 +2095,7 @@ Job_Init (maxproc, maxlocal)
 	 * All default shells are located in _PATH_DEFSHELLDIR.
 	 */
 	shellName = commandShell->name;
-	shellPath = Str_Concat (_PATH_DEFSHELLDIR, shellName, STR_ADDSLASH);
+	shellPath = str_concat (_PATH_DEFSHELLDIR, shellName, STR_ADDSLASH);
     }
 
     if (commandShell->exit == (char *)NULL) {
@@ -2315,7 +2315,7 @@ Job_ParseShell (line)
     while (isspace (*line)) {
 	line++;
     }
-    words = Str_BreakString (line, " \t", "\n", &wordCount);
+    words = brk_string (line, &wordCount);
 
     bzero ((Address)&newShell, sizeof(newShell));
     
@@ -2352,7 +2352,6 @@ Job_ParseShell (line)
 		 } else {
 		     Parse_Error (PARSE_FATAL, "Unknown keyword \"%s\"",
 				  *argv);
-		     Str_FreeVec (wordCount, words);
 		     return (FAILURE);
 		 }
 		 fullSpec = TRUE;
@@ -2368,7 +2367,6 @@ Job_ParseShell (line)
 	 */
 	if (newShell.name == (char *)NULL) {
 	    Parse_Error (PARSE_FATAL, "Neither path nor name specified");
-	    Str_FreeVec (wordCount, words);
 	    return (FAILURE);
 	} else {
 	    commandShell = JobMatchShell (newShell.name);
@@ -2397,7 +2395,7 @@ Job_ParseShell (line)
 	if (!fullSpec) {
 	    commandShell = JobMatchShell (shellName);
 	} else {
-	    commandShell = (Shell *) malloc(sizeof(Shell));
+	    commandShell = (Shell *) emalloc(sizeof(Shell));
 	    *commandShell = newShell;
 	}
     }