Str_BreakString -> brk_string, no longer need Str_FreeVec
SCCS-vsn: usr.bin/make/job.c 5.10
-static char sccsid[] = "@(#)job.c 5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)job.c 5.10 (Berkeley) %G%";
#endif /* not lint */
/*-
#endif /* not lint */
/*-
previous->flags &= ~ (JOB_FIRST|JOB_IGNERR|JOB_SILENT|JOB_REMOTE);
job = previous;
} else {
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");
}
if (job == (Job *)NULL) {
Punt("JobStart out of memory");
}
* All default shells are located in _PATH_DEFSHELLDIR.
*/
shellName = commandShell->name;
* 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) {
}
if (commandShell->exit == (char *)NULL) {
while (isspace (*line)) {
line++;
}
while (isspace (*line)) {
line++;
}
- words = Str_BreakString (line, " \t", "\n", &wordCount);
+ words = brk_string (line, &wordCount);
bzero ((Address)&newShell, sizeof(newShell));
bzero ((Address)&newShell, sizeof(newShell));
} else {
Parse_Error (PARSE_FATAL, "Unknown keyword \"%s\"",
*argv);
} else {
Parse_Error (PARSE_FATAL, "Unknown keyword \"%s\"",
*argv);
- Str_FreeVec (wordCount, words);
return (FAILURE);
}
fullSpec = TRUE;
return (FAILURE);
}
fullSpec = TRUE;
*/
if (newShell.name == (char *)NULL) {
Parse_Error (PARSE_FATAL, "Neither path nor name specified");
*/
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);
return (FAILURE);
} else {
commandShell = JobMatchShell (newShell.name);
if (!fullSpec) {
commandShell = JobMatchShell (shellName);
} else {
if (!fullSpec) {
commandShell = JobMatchShell (shellName);
} else {
- commandShell = (Shell *) malloc(sizeof(Shell));
+ commandShell = (Shell *) emalloc(sizeof(Shell));
*commandShell = newShell;
}
}
*commandShell = newShell;
}
}