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

Make ::= work again with the VAR_FOR context changes.

Browse Source
This commit is contained in:
sjg 2000-06-01 09:39:02 +00:00
parent 86d8882273
commit 2293fdd17b
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
usr.bin/make/var.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: var.c,v 1.46 2000/06/01 04:16:39 mycroft Exp $ */ /* $NetBSD: var.c,v 1.47 2000/06/01 09:39:02 sjg Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -39,14 +39,14 @@
*/ */
#ifdef MAKE_BOOTSTRAP #ifdef MAKE_BOOTSTRAP
static char rcsid[] = "$NetBSD: var.c,v 1.46 2000/06/01 04:16:39 mycroft Exp $"; static char rcsid[] = "$NetBSD: var.c,v 1.47 2000/06/01 09:39:02 sjg Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else #else
__RCSID("$NetBSD: var.c,v 1.46 2000/06/01 04:16:39 mycroft Exp $"); __RCSID("$NetBSD: var.c,v 1.47 2000/06/01 09:39:02 sjg Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -1947,26 +1947,28 @@ Var_Parse (str, ctxt, err, lengthPtr, freePtr)
termc = *--cp; termc = *--cp;
delim = '\0'; delim = '\0';
switch (how) { if (ctxt != VAR_FOR) {
case '+': switch (how) {
Var_Append(v->name, pattern.rhs, v_ctxt); case '+':
break; Var_Append(v->name, pattern.rhs, v_ctxt);
case '!':
newStr = Cmd_Exec (pattern.rhs, &emsg);
if (emsg)
Error (emsg, str);
else
Var_Set(v->name, newStr, v_ctxt);
if (newStr)
free(newStr);
break;
case '?':
if ((v->flags & VAR_JUNK) == 0)
break; break;
/* FALLTHROUGH */ case '!':
default: newStr = Cmd_Exec (pattern.rhs, &emsg);
Var_Set(v->name, pattern.rhs, v_ctxt); if (emsg)
break; Error (emsg, str);
else
Var_Set(v->name, newStr, v_ctxt);
if (newStr)
free(newStr);
break;
case '?':
if ((v->flags & VAR_JUNK) == 0)
break;
/* FALLTHROUGH */
default:
Var_Set(v->name, pattern.rhs, v_ctxt);
break;
}
} }
if (v->flags & VAR_JUNK) { if (v->flags & VAR_JUNK) {
free(v->name); free(v->name);