Module Name: src
Committed By: sjg
Date: Sat Nov 18 22:34:05 UTC 2017
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: varcmd.exp varcmd.mk
Log Message:
Do not append to variable set on command line
POSIX requires that variables set on the command line
be immutable.
Var_Append needs to pass FIND_CMD and skip append
if found variable has VAR_FROM_CMD flag set.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/usr.bin/make/var.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/varcmd.exp \
src/usr.bin/make/unit-tests/varcmd.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.215 src/usr.bin/make/var.c:1.216
--- src/usr.bin/make/var.c:1.215 Sun Apr 16 21:39:49 2017
+++ src/usr.bin/make/var.c Sat Nov 18 22:34:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.215 2017/04/16 21:39:49 riastradh Exp $ */
+/* $NetBSD: var.c,v 1.216 2017/11/18 22:34:04 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.215 2017/04/16 21:39:49 riastradh Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.216 2017/11/18 22:34:04 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.215 2017/04/16 21:39:49 riastradh Exp $");
+__RCSID("$NetBSD: var.c,v 1.216 2017/11/18 22:34:04 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -1061,11 +1061,11 @@ Var_Append(const char *name, const char
name = expanded_name;
}
- v = VarFind(name, ctxt, (ctxt == VAR_GLOBAL) ? FIND_ENV : 0);
+ v = VarFind(name, ctxt, (ctxt == VAR_GLOBAL) ? (FIND_CMD|FIND_ENV) : 0);
if (v == NULL) {
VarAdd(name, val, ctxt);
- } else {
+ } else if (!(v->flags & VAR_FROM_CMD)) {
Buf_AddByte(&v->val, ' ');
Buf_AddBytes(&v->val, strlen(val), val);
Index: src/usr.bin/make/unit-tests/varcmd.exp
diff -u src/usr.bin/make/unit-tests/varcmd.exp:1.1 src/usr.bin/make/unit-tests/varcmd.exp:1.2
--- src/usr.bin/make/unit-tests/varcmd.exp:1.1 Thu Aug 21 13:44:52 2014
+++ src/usr.bin/make/unit-tests/varcmd.exp Sat Nov 18 22:34:04 2017
@@ -1,5 +1,6 @@
default FU=<v>fu</v> FOO=<v>foo</v> VAR=<v></v>
two FU=<v>bar</v> FOO=<v>goo</v> VAR=<v></v>
+immutable FU='bar'
three FU=<v>bar</v> FOO=<v>goo</v> VAR=<v></v>
four FU=<v>bar</v> FOO=<v>goo</v> VAR=<v>Internal</v>
five FU=<v>bar</v> FOO=<v>goo</v> VAR=<v>Internal</v>
Index: src/usr.bin/make/unit-tests/varcmd.mk
diff -u src/usr.bin/make/unit-tests/varcmd.mk:1.1 src/usr.bin/make/unit-tests/varcmd.mk:1.2
--- src/usr.bin/make/unit-tests/varcmd.mk:1.1 Thu Aug 21 13:44:52 2014
+++ src/usr.bin/make/unit-tests/varcmd.mk Sat Nov 18 22:34:04 2017
@@ -1,4 +1,4 @@
-# $Id: varcmd.mk,v 1.1 2014/08/21 13:44:52 apb Exp $
+# $Id: varcmd.mk,v 1.2 2017/11/18 22:34:04 sjg Exp $
#
# Test behaviour of recursive make and vars set on command line.
@@ -24,6 +24,14 @@ three: show
@${.MAKE} -f ${MAKEFILE} four
+.ifmake two
+# this should not work
+FU+= oops
+_FU:= ${FU}
+two: immutable
+immutable:
+ @echo "$@ FU='${_FU}'"
+.endif
.ifmake four
VAR=Internal
.MAKEOVERRIDES+= VAR
