 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.651 2020/11/02 21:24:23 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.652 2020/11/02 21:34:40 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -120,27 +120,27 @@
 #include <regex.h>
 #endif
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.651 2020/11/02 21:24:23 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.652 2020/11/02 21:34:40 rillig Exp $");
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
 #define VAR_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(VAR, fmt, arg1, arg2, arg3)
 #define VAR_DEBUG4(fmt, arg1, arg2, arg3, arg4) DEBUG4(VAR, fmt, arg1, arg2, arg3, arg4)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
 @@ -3534,80 +3534,82 @@ ParseVarname(const char **pp, char start
 	    /* TODO: handle errors */
 	    Buf_AddStr(&buf, nested_val);
 	    free(nested_val_freeIt);
 	} else {
 	    Buf_AddByte(&buf, *p);
 	    p++;
+	}
+    }
     *pp = p;
     *out_varname_len = Buf_Len(&buf);
     return Buf_Destroy(&buf, FALSE);
+}
-static Boolean
+static VarParseResult
 ValidShortVarname(char varname, const char *start)
+{
     switch (varname) {
     case '\0':
     case ')':
     case '}':
     case ':':
     case '$':
 	break;			/* and continue below */
     default:
-	return TRUE;
+	return VPR_OK;
+    }
     if (!DEBUG(LINT))
-	return FALSE;
+	return VPR_PARSE_SILENT;
     if (varname == '$')
 	Parse_Error(PARSE_FATAL,
 		    "To escape a dollar, use \\$, not $$, at \"%s\"", start);
     else if (varname == '\0')
 	Parse_Error(PARSE_FATAL, "Dollar followed by nothing");
     else
 	Parse_Error(PARSE_FATAL,
 		    "Invalid variable name '%c', at \"%s\"", varname, start);
-    return FALSE;
+    return VPR_PARSE_MSG;
+}
 /* Parse a single-character variable name such as $V or $@.
  * Return whether to continue parsing. */
 static Boolean
 ParseVarnameShort(
 	char startc,
 	const char **pp,
 	GNode *ctxt,
 	VarEvalFlags eflags,
 	VarParseResult *out_FALSE_res,
 	const char **out_FALSE_val,
 	Var **out_TRUE_var
 ) {
     char name[2];
     Var *v;
     VarParseResult vpr;
     /*
      * If it's not bounded by braces of some sort, life is much simpler.
      * We just need to check for the first character and return the
      * value if it exists.
      */
-    if (!ValidShortVarname(startc, *pp)) {
+    vpr = ValidShortVarname(startc, *pp);
     if (vpr != VPR_OK) {
 	(*pp)++;
 	*out_FALSE_val = var_Error;
-	*out_FALSE_res = VPR_PARSE_MSG;
+	*out_FALSE_res = vpr;
 	return FALSE;
+    }
     name[0] = startc;
     name[1] = '\0';
     v = VarFind(name, ctxt, TRUE);
     if (v == NULL) {
 	*pp += 2;
 	*out_FALSE_val = UndefinedShortVarValue(startc, ctxt, eflags);
 	if (DEBUG(LINT) && *out_FALSE_val == var_Error) {
 	    Parse_Error(PARSE_FATAL, "Variable \"%s\" is undefined", name);
 	    *out_FALSE_res = VPR_UNDEF_MSG;