Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert to revision 1.128. Now that the Var* functions no longer try to

Browse Source 
write into const strings, it's safe to pass a truly constant string to
Var_Subst.
This commit is contained in:
apb 2007-10-13 20:01:33 +00:00
parent 7da86686ca
commit ec2d191f5e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/make/job.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: job.c,v 1.131 2007/10/13 08:58:48 dsl Exp $ */
/* $NetBSD: job.c,v 1.132 2007/10/13 20:01:33 apb Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: job.c,v 1.131 2007/10/13 08:58:48 dsl Exp $";
static char rcsid[] = "$NetBSD: job.c,v 1.132 2007/10/13 20:01:33 apb Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
__RCSID("$NetBSD: job.c,v 1.131 2007/10/13 08:58:48 dsl Exp $");
__RCSID("$NetBSD: job.c,v 1.132 2007/10/13 20:01:33 apb Exp $");
#endif
#endif /* not lint */
#endif
@ -2063,7 +2063,6 @@ Shell_GetNewline(void)
void
Job_SetPrefix(void)
{
static char job_prefix[] = "${" MAKE_JOB_PREFIX "}";
if (targPrefix) {
free(targPrefix);
@ -2071,7 +2070,7 @@ Job_SetPrefix(void)
Var_Set(MAKE_JOB_PREFIX, "---", VAR_GLOBAL, 0);
}
targPrefix = Var_Subst(NULL, job_prefix, VAR_GLOBAL, 0);
targPrefix = Var_Subst(NULL, "${" MAKE_JOB_PREFIX "}", VAR_GLOBAL, 0);
}
/*-