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

Fix merge problem with ts modifier and const correctness.

Browse Source 
Need to pass nstr to VarModify.
This commit is contained in:
sjg 2003-07-23 18:06:46 +00:00
parent 117c044a56
commit 59b1f67a11
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: var.c,v 1.74 2003/07/14 20:39:20 sjg Exp $ */
/* $NetBSD: var.c,v 1.75 2003/07/23 18:06:46 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -39,14 +39,14 @@
*/
#ifdef MAKE_BOOTSTRAP
static char rcsid[] = "$NetBSD: var.c,v 1.74 2003/07/14 20:39:20 sjg Exp $";
static char rcsid[] = "$NetBSD: var.c,v 1.75 2003/07/23 18:06:46 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
__RCSID("$NetBSD: var.c,v 1.74 2003/07/14 20:39:20 sjg Exp $");
__RCSID("$NetBSD: var.c,v 1.75 2003/07/23 18:06:46 sjg Exp $");
#endif
#endif /* not lint */
#endif
@ -2304,7 +2304,7 @@ Var_Parse(const char *str, GNode *ctxt, Boolean err, int *lengthPtr,
pattern.lhs = pattern.rhs = "\032";
pattern.leftLen = pattern.rightLen = 1;
newStr = VarModify(ctxt, str, VarSubstitute,
newStr = VarModify(ctxt, nstr, VarSubstitute,
(ClientData)&pattern);
} else if (tstr[2] == endc || tstr[2] == ':') {
if (tstr[1] == 'u' || tstr[1] == 'l') {