 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.339 2020/07/27 21:08:41 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.340 2020/07/27 21:54:25 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.339 2020/07/27 21:08:41 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.340 2020/07/27 21:54:25 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.339 2020/07/27 21:08:41 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.340 2020/07/27 21:54:25 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.
+ *
 @@ -2057,32 +2057,41 @@ typedef struct {
     Byte	sep;		/* Word separator in expansions */
     Boolean	oneBigWord;	/* TRUE if we will treat the variable as a
 				 * single big word, even if it contains
 				 * embedded spaces (as opposed to the
 				 * usual behaviour of treating it as
 				 * several space-separated words). */
     /* result */
     char *newStr;		/* New value to return */
 } ApplyModifiersState;
 /* we now have some modifiers with long names */
-#define STRMOD_MATCH(s, want, n) \
+static Boolean
-    (strncmp(s, want, n) == 0 && (s[n] == st->endc || s[n] == ':'))
+ModMatch(const char *mod, const char *modname, char endc)
 #define STRMOD_MATCHX(s, want, n) \
-    (strncmp(s, want, n) == 0 && \
+    size_t n = strlen(modname);
-     (s[n] == st->endc || s[n] == ':' || s[n] == '='))
+    return strncmp(mod, modname, n) == 0 &&
-#define CHARMOD_MATCH(c) (c == st->endc || c == ':')
+	   (mod[n] == endc || mod[n] == ':');
+}
 static inline Boolean
 ModMatchEq(const char *mod, const char *modname, char endc)
+{
     size_t n = strlen(modname);
     return strncmp(mod, modname, n) == 0 &&
 	   (mod[n] == endc || mod[n] == ':' || mod[n] == '=');
+}
 /* :@var@...${var}...@ */
 static Boolean
 ApplyModifier_Loop(const char *mod, ApplyModifiersState *st) {
     ModifyWord_LoopArgs args;
     args.ctx = st->ctxt;
     st->cp = mod + 1;
     char delim = '@';
     args.tvar = ParseModifierPart(&st->cp, delim, st->eflags & ~VARE_WANTRES,
 				  st->ctxt, NULL, NULL, NULL);
     if (args.tvar == NULL) {
 	st->missing_delim = delim;
 @@ -2169,74 +2178,77 @@ ApplyModifier_Defined(const char *mod, A
 	st->v->flags |= VAR_KEEP;
     if (neflags & VARE_WANTRES) {
 	st->newStr = Buf_Destroy(&buf, FALSE);
     } else {
 	st->newStr = st->nstr;
 	Buf_Destroy(&buf, TRUE);
+    }
+}
 /* :gmtime */
 static Boolean
 ApplyModifier_Gmtime(const char *mod, ApplyModifiersState *st)
+{
-    time_t utc;
+    if (!ModMatchEq(mod, "gmtime", st->endc)) {
-    char *ep;
+	st->cp = mod + 1;
     st->cp = mod + 1;		/* make sure it is set */
     if (!STRMOD_MATCHX(mod, "gmtime", 6))
 	return FALSE;
+    }
     time_t utc;
     if (mod[6] == '=') {
 	char *ep;
 	utc = strtoul(mod + 7, &ep, 10);
 	st->cp = ep;
     } else {
 	utc = 0;
 	st->cp = mod + 6;
+    }
     st->newStr = VarStrftime(st->nstr, 1, utc);
     st->termc = *st->cp;
     return TRUE;
+}
 /* :localtime */
 static Boolean
 ApplyModifier_Localtime(const char *mod, ApplyModifiersState *st)
+{
-    time_t utc;
+    if (!ModMatchEq(mod, "localtime", st->endc)) {
-    char *ep;
+	st->cp = mod + 1;
     st->cp = mod + 1;	/* make sure it is set */
     if (!STRMOD_MATCHX(mod, "localtime", 9))
 	return FALSE;
+    }
     time_t utc;
     if (mod[9] == '=') {
 	char *ep;
 	utc = strtoul(mod + 10, &ep, 10);
 	st->cp = ep;
     } else {
 	utc = 0;
 	st->cp = mod + 9;
+    }
     st->newStr = VarStrftime(st->nstr, 0, utc);
     st->termc = *st->cp;
     return TRUE;
+}
 /* :hash */
 static Boolean
 ApplyModifier_Hash(const char *mod, ApplyModifiersState *st)
+{
-    st->cp = mod + 1;	/* make sure it is set */
+    if (!ModMatch(mod, "hash", st->endc)) {
-    if (!STRMOD_MATCH(mod, "hash", 4))
+	st->cp = mod + 1;
 	return FALSE;
+    }
     st->newStr = VarHash(st->nstr);
     st->cp = mod + 4;
     st->termc = *st->cp;
     return TRUE;
+}
 /* :P */
 static void
 ApplyModifier_Path(const char *mod, ApplyModifiersState *st)
+{
     if (st->v->flags & VAR_JUNK)
 	st->v->flags |= VAR_KEEP;
     GNode *gn = Targ_FindNode(st->v->name, TARG_NOCREATE);
 @@ -2276,34 +2288,34 @@ ApplyModifier_Exclam(const char *mod, Ap
     if (emsg)
 	Error(emsg, st->nstr);
     st->termc = *st->cp;
     if (st->v->flags & VAR_JUNK)
 	st->v->flags |= VAR_KEEP;
     return TRUE;
+}
 /* :range */
 static Boolean
 ApplyModifier_Range(const char *mod, ApplyModifiersState *st)
+{
-    int n;
+    if (!ModMatchEq(mod, "range", st->endc)) {
-    char *ep;
+	st->cp = mod + 1;
     st->cp = mod + 1;	/* make sure it is set */
     if (!STRMOD_MATCHX(mod, "range", 5))
 	return FALSE;
+    }
     int n;
     if (mod[5] == '=') {
 	char *ep;
 	n = strtoul(mod + 6, &ep, 10);
 	st->cp = ep;
     } else {
 	n = 0;
 	st->cp = mod + 5;
+    }
     st->newStr = VarRange(st->nstr, n);
     st->termc = *st->cp;
     return TRUE;
+}
 /* :Mpattern or :Npattern */
 static void
 @@ -2900,43 +2912,40 @@ ApplyModifier_Assign(const char *mod, Ap
 	    Var_Set(st->v->name, val, v_ctxt);
 	    break;
+	}
+    }
     free(val);
     st->newStr = varNoError;
     return 0;
+}
 /* remember current value */
 static Boolean
 ApplyModifier_Remember(const char *mod, ApplyModifiersState *st)
+{
-    st->cp = mod + 1;	/* make sure it is set */
+    if (!ModMatchEq(mod, "_", st->endc)) {
-    if (!STRMOD_MATCHX(mod, "_", 1))
+	st->cp = mod + 1;
 	return FALSE;
+    }
     if (mod[1] == '=') {
-	char *np;
+	size_t n = strcspn(mod + 2, ":)}");
-	int n;
+	char *name = bmake_strndup(mod + 2, n);
 	Var_Set(name, st->nstr, st->ctxt);
-	st->cp++;
+	free(name);
 	n = strcspn(st->cp, ":)}");
 	np = bmake_strndup(st->cp, n + 1);
 	np[n] = '\0';
 	st->cp = mod + 2 + n;
 	Var_Set(np, st->nstr, st->ctxt);
 	free(np);
     } else {
 	Var_Set("_", st->nstr, st->ctxt);
 	st->cp = mod + 1;
+    }
     st->newStr = st->nstr;
     st->termc = *st->cp;
     return TRUE;
+}
 #ifdef SYSVVARSUB
 /* :from=to */
 static int
 ApplyModifier_SysV(const char *mod, ApplyModifiersState *st)
+{
     Boolean eqFound = FALSE;

 @@ -1,14 +1,14 @@
-# $Id: modmisc.mk,v 1.26 2020/07/26 13:09:53 rillig Exp $
+# $Id: modmisc.mk,v 1.27 2020/07/27 21:54:25 rillig Exp $
+#
 # miscellaneous modifier tests
 # do not put any dirs in this list which exist on some
 # but not all target systems - an exists() check is below.
 path=:/bin:/tmp::/:.:/no/such/dir:.
 # strip cwd from path.
 MOD_NODOT=S/:/ /g:N.:ts:
 # and decorate, note that $'s need to be doubled. Also note that
 # the modifier_variable can be used with other modifiers.
 MOD_NODOTX=S/:/ /g:N.:@d@'$$d'@
 # another mod - pretend it is more interesting
 MOD_HOMES=S,/home/,/homes/,
 @@ -17,26 +17,27 @@ MOD_SEP=S,:, ,g
 all:	modvar modvarloop modsysv mod-HTE emptyvar undefvar
 all:	mod-subst
 all:	mod-regex
 all:	mod-loop-varname mod-loop-resolve mod-loop-varname-dollar
 all:	mod-subst-dollar mod-loop-dollar
 all:	mod-regex-limits
 all:	mod-regex-errors
 all:	mod-assign
 all:	mod-assign-nested
 all:	mod-tu-space
 all:	mod-quote
 all:	mod-break-many-words
 all:	mod-remember
 # See also sysv.mk.
 modsysv:
 	@echo "The answer is ${libfoo.a:L:libfoo.a=42}"
 # Demonstrates modifiers that are given indirectly from a variable.
 modvar:
 	@echo "path='${path}'"
 	@echo "path='${path:${MOD_NODOT}}'"
 	@echo "path='${path:S,home,homes,:${MOD_NODOT}}'"
 	@echo "path=${path:${MOD_NODOTX}:ts:}"
 	@echo "path=${path:${MOD_HOMES}:${MOD_NODOTX}:ts:}"
 @@ -232,13 +233,21 @@ SINK4:=	${0:?${THEN4::=then4${IT4::=t4}}
 mod-tu-space:
 	# The :tu and :tl modifiers operate on the variable value
 	# as a single string, not as a list of words. Therefore,
 	# the adjacent spaces are preserved.
 	@echo $@: ${a   b:L:tu:Q}
 mod-quote:
 	@echo $@: new${.newline:Q}${.newline:Q}line
 # Cover the bmake_realloc in brk_string.
 mod-break-many-words:
 	@echo $@: ${UNDEF:U:range=500:[#]}
 # Demonstrate the :_ modifier.
 # In the parameterized form, having the variable name on the right side
 # of the = assignment operator is confusing. Luckily this modifier is
 # only rarely needed.
 mod-remember:
 	@echo $@: ${1 2 3:L:_:@var@${_}@}
 	@echo $@: ${1 2 3:L:@var@${var:_=SAVED:}@}, SAVED=${SAVED}

 @@ -81,14 +81,16 @@ mod-assign: appended=1 2 3.
 mod-assign: ran:3.
 mod-assign: global: 1, 3, 1 2 3, 3.
 mod-assign-nested: then1t1
 mod-assign-nested: else2e2
 mod-assign-nested: then3t3
 mod-assign-nested: else4e4
 mod-tu-space: A   B
 mod-quote: new
 line
 mod-break-many-words: 500
 mod-remember: 1 2 3 1 2 3 1 2 3
 mod-remember: 1 2 3, SAVED=3
 exit status 0