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

make(1): error out on unclosed expressions after the colon

Browse Source
This commit is contained in:
rillig 2020-11-02 20:48:36 +00:00
parent 2d4a31316a
commit d0a7e917ea
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.bin/make/unit-tests/cmd-errors-lint.exp
View File

@ -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

1
usr.bin/make/unit-tests/cmd-errors.exp
View File

@ -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

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

@ -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 == '$') {