[src/trunk]: src/usr.bin/make make(1): fix missing error message about missin...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/92fc9583e3c6
branches:  trunk
changeset: 974198:92fc9583e3c6
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Jul 26 10:11:04 2020 +0000

description:
make(1): fix missing error message about missing @ delimiter

This had been broken since 2020-07-03, during a "refactoring".

diffstat:

 usr.bin/make/unit-tests/moderrs.exp |  2 ++
 usr.bin/make/var.c                  |  9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r 4342328f608f -r 92fc9583e3c6 usr.bin/make/unit-tests/moderrs.exp
--- a/usr.bin/make/unit-tests/moderrs.exp       Sun Jul 26 10:04:06 2020 +0000
+++ b/usr.bin/make/unit-tests/moderrs.exp       Sun Jul 26 10:11:04 2020 +0000
@@ -14,7 +14,9 @@
 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
diff -r 4342328f608f -r 92fc9583e3c6 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Jul 26 10:04:06 2020 +0000
+++ b/usr.bin/make/var.c        Sun Jul 26 10:11:04 2020 +0000
@@ -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 @@
                break;
            }
        case '@':
-           ApplyModifier_Loop(p, &st);
+           if (!ApplyModifier_Loop(p, &st))
+               goto cleanup;
            break;
        case '_':
            if (!ApplyModifier_Remember(p, &st))