 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.354 2020/07/29 19:48:33 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.355 2020/07/29 20:33:38 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.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.354 2020/07/29 19:48:33 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.355 2020/07/29 20:33:38 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.354 2020/07/29 19:48:33 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.355 2020/07/29 20:33:38 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * var.c --
  *	Variable-handling functions
+ *
  * Interface:
  *	Var_Set		    Set the value of a variable in the given
  *			    context. The variable is created if it doesn't
  *			    yet exist.
+ *
 @@ -2565,27 +2565,27 @@ ApplyModifier_ToSep(const char *sep, App
     } else {
 	return FALSE;		/* Found ":ts<unrecognised><unrecognised>". */
+    }
     st->newVal = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->val,
 			     ModifyWord_Copy, NULL);
     return TRUE;
+}
 /* :tA, :tu, :tl, :ts<separator>, etc. */
 static Boolean
 ApplyModifier_To(const char *mod, ApplyModifiersState *st)
+{
-    st->next = mod + 1;	/* make sure it is set */
+    st->next = mod + 1;		/* make sure it is set */
     if (mod[1] == st->endc || mod[1] == ':')
 	return FALSE;		/* Found ":t<endc>" or ":t:". */
     if (mod[1] == 's')
 	return ApplyModifier_ToSep(mod + 2, st);
     if (mod[2] != st->endc && mod[2] != ':')
 	return FALSE;		/* Found ":t<unrecognised><unrecognised>". */
     /* Check for two-character options: ":tu", ":tl" */
     if (mod[1] == 'A') {	/* absolute path */
 	st->newVal = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->val,
 				 ModifyWord_Realpath, NULL);
 @@ -2808,28 +2808,30 @@ ApplyModifier_IfElse(const char *mod, Ap
  *			variable.
  */
 static int
 ApplyModifier_Assign(const char *mod, ApplyModifiersState *st)
+{
     const char *op = mod + 1;
     if (!(op[0] == '=' ||
 	(op[1] == '=' &&
 	 (op[0] == '!' || op[0] == '+' || op[0] == '?'))))
 	return 'd';		/* "::<unrecognised>" */
     GNode *v_ctxt;		/* context where v belongs */
-    if (st->v->name[0] == 0)
+    if (st->v->name[0] == 0) {
 	st->next = mod + 1;
 	return 'b';
+    }
     v_ctxt = st->ctxt;
     char *sv_name = NULL;
     if (st->v->flags & VAR_JUNK) {
 	/*
 	 * We need to bmake_strdup() it incase ParseModifierPart() recurses.
 	 */
 	sv_name = st->v->name;
 	st->v->name = bmake_strdup(st->v->name);
     } else if (st->ctxt != VAR_GLOBAL) {
 	Var *gv = VarFind(st->v->name, st->ctxt, 0);
 	if (gv == NULL)
 	    v_ctxt = VAR_GLOBAL;
 @@ -3107,26 +3109,27 @@ ApplyModifiers(char *val, const char * c
 		Error("Unclosed variable specification after complex "
 		    "modifier (expecting '%c') for %s", st.endc, st.v->name);
 		goto out;
+	    }
 	    continue;
+	}
     apply_mods:
 	if (DEBUG(VAR)) {
 	    fprintf(debug_file, "Applying[%s] :%c to \"%s\"\n", st.v->name,
 		*p, st.val);
+	}
 	st.newVal = var_Error;
 	char modifier = *p;
 	st.next = NULL;	/* fail fast if an ApplyModifier forgets to set this */
 	switch (modifier) {
 	case ':':
+	    {
 		int res = ApplyModifier_Assign(p, &st);
 		if (res == 'b')
 		    goto bad_modifier;
 		if (res == 'c')
 		    goto cleanup;
 		if (res == 'd')
 		    goto default_case;
 		break;
+	    }
 	case '@':

 @@ -1,14 +1,14 @@
-# $Id: moderrs.mk,v 1.7 2020/07/29 19:48:33 rillig Exp $
+# $Id: moderrs.mk,v 1.8 2020/07/29 20:33:38 rillig Exp $
+#
 # various modifier error tests
 VAR=TheVariable
 # incase we have to change it ;-)
 MOD_UNKN=Z
 MOD_TERM=S,V,v
 MOD_S:= ${MOD_TERM},
 FIB=	1 1 2 3 5 8 13 21 34
 all:	modunkn modunknV varterm vartermV modtermV modloop
 all:	modloop-close
 @@ -141,29 +141,27 @@ mod-t-parse:
 	@echo ${FIB:t:M*}
 mod-ifelse-parse:
 	@echo $@:
 	@echo ${FIB:?
 	@echo ${FIB:?then
 	@echo ${FIB:?then:
 	@echo ${FIB:?then:else
 	@echo ${FIB:?then:else}
 mod-assign-parse:
 	@echo $@:
 	@echo ${ASSIGN::x}	# 'x' is an unknown assignment operator
-# disabled for now; segfaults on NetBSD-8.0-x86_64 in Var_Parse line 3636:
+	@echo ${::=value}	# trying to set the empty variable
 # *lengthPtr = tstr - str + (*tstr ? 1 : 0);
 #	@echo ${::=value}	# trying to set the empty variable
 	@echo ${ASSIGN::=value	# missing closing brace
 mod-remember-parse:
 	@echo $@:
 	@echo ${FIB:_}		# ok
 	@echo ${FIB:__}		# modifier name too long
 mod-sysv-parse:
 	@echo $@:
 	@echo ${FIB:3
 	@echo ${FIB:3=
 	@echo ${FIB:3=x3
 	@echo ${FIB:3=x3}	# ok

 @@ -107,26 +107,28 @@ M*}
 mod-ifelse-parse:
 make: Unclosed substitution for FIB (: missing)
 make: Unclosed substitution for FIB (: missing)
 make: Unclosed substitution for FIB (} missing)
 make: Unclosed substitution for FIB (} missing)
 then
 mod-assign-parse:
 make: Unknown modifier ':'
 make: Bad modifier `:' for
 value}
 make: Unclosed substitution for ASSIGN (} missing)
 mod-remember-parse:
 1 2 3 5 8 13 21 34
 make: Unknown modifier '_'
 mod-sysv-parse:
 make: Unknown modifier '3'
 make: Unclosed variable specification (expecting '}') for "FIB" (value "") modifier 3
 make: Unknown modifier '3'
 make: Unclosed variable specification (expecting '}') for "FIB" (value "") modifier 3