Module Name: src
Committed By: rillig
Date: Mon Nov 2 20:48:36 UTC 2020
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: cmd-errors-lint.exp cmd-errors.exp
Log Message:
make(1): error out on unclosed expressions after the colon
To generate a diff of this commit:
cvs rdiff -u -r1.648 -r1.649 src/usr.bin/make/var.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cmd-errors-lint.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/cmd-errors.exp
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.648 src/usr.bin/make/var.c:1.649
--- src/usr.bin/make/var.c:1.648 Mon Nov 2 19:07:09 2020
+++ src/usr.bin/make/var.c Mon Nov 2 20:48:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.648 2020/11/02 19:07:09 rillig Exp $ */
+/* $NetBSD: var.c,v 1.649 2020/11/02 20:48:36 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.648 2020/11/02 19:07:09 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.649 2020/11/02 20:48:36 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -3357,6 +3357,13 @@ ApplyModifiers(
assert(val != NULL);
p = *pp;
+
+ if (*p == '\0' && endc != '\0') {
+ Error("Unclosed variable expression (expecting '%c') for \"%s\"",
+ st.endc, st.v->name);
+ goto cleanup;
+ }
+
while (*p != '\0' && *p != endc) {
if (*p == '$') {
Index: src/usr.bin/make/unit-tests/cmd-errors-lint.exp
diff -u src/usr.bin/make/unit-tests/cmd-errors-lint.exp:1.1 src/usr.bin/make/unit-tests/cmd-errors-lint.exp:1.2
--- src/usr.bin/make/unit-tests/cmd-errors-lint.exp:1.1 Mon Nov 2 20:43:27 2020
+++ src/usr.bin/make/unit-tests/cmd-errors-lint.exp Mon Nov 2 20:48:36 2020
@@ -1,6 +1,7 @@
: undefined
make: Unclosed variable "UNCLOSED"
: unclosed-variable
+make: Unclosed variable expression (expecting '}') for "UNCLOSED"
: unclosed-modifier
make: Unknown modifier 'Z'
: unknown-modifier
Index: src/usr.bin/make/unit-tests/cmd-errors.exp
diff -u src/usr.bin/make/unit-tests/cmd-errors.exp:1.2 src/usr.bin/make/unit-tests/cmd-errors.exp:1.3
--- src/usr.bin/make/unit-tests/cmd-errors.exp:1.2 Mon Nov 2 20:37:50 2020
+++ src/usr.bin/make/unit-tests/cmd-errors.exp Mon Nov 2 20:48:36 2020
@@ -1,6 +1,7 @@
: undefined
make: Unclosed variable "UNCLOSED"
: unclosed-variable
+make: Unclosed variable expression (expecting '}') for "UNCLOSED"
: unclosed-modifier
make: Unknown modifier 'Z'
: unknown-modifier
