Module Name: src
Committed By: rillig
Date: Sun Jul 26 10:11:04 UTC 2020
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: moderrs.exp
Log Message:
make(1): fix missing error message about missing @ delimiter
This had been broken since 2020-07-03, during a "refactoring".
To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/usr.bin/make/var.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/moderrs.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.308 src/usr.bin/make/var.c:1.309
--- src/usr.bin/make/var.c:1.308 Fri Jul 24 08:24:23 2020
+++ src/usr.bin/make/var.c Sun Jul 26 10:11:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.308 2020/07/24 08:24:23 rillig Exp $ */
+/* $NetBSD: var.c,v 1.309 2020/07/26 10:11:04 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.308 2020/07/24 08:24:23 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.309 2020/07/26 10:11:04 rillig 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.308 2020/07/24 08:24:23 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.309 2020/07/26 10:11:04 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -3171,7 +3171,8 @@ ApplyModifiers(char *nstr, const char *t
break;
}
case '@':
- ApplyModifier_Loop(p, &st);
+ if (!ApplyModifier_Loop(p, &st))
+ goto cleanup;
break;
case '_':
if (!ApplyModifier_Remember(p, &st))
Index: src/usr.bin/make/unit-tests/moderrs.exp
diff -u src/usr.bin/make/unit-tests/moderrs.exp:1.2 src/usr.bin/make/unit-tests/moderrs.exp:1.3
--- src/usr.bin/make/unit-tests/moderrs.exp:1.2 Sun Jul 26 10:04:06 2020
+++ src/usr.bin/make/unit-tests/moderrs.exp Sun Jul 26 10:11:04 2020
@@ -14,7 +14,9 @@ Expect: Unclosed substitution for VAR (,
make: Unclosed substitution for VAR (, missing)
VAR:S,V,v=
Expect: errors about missing @ delimiter
+make: Unclosed substitution for UNDEF (@ missing)
+make: Unclosed substitution for UNDEF (@ missing)
1 2 3
exit status 0
