 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.1012 2022/02/11 21:44:10 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.1013 2022/03/03 19:52:41 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.
 @@ -129,27 +129,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.1012 2022/02/11 21:44:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1013 2022/03/03 19:52:41 rillig Exp $");
 /*
  * Variables are defined using one of the VAR=value assignments.  Their
  * value can be queried by expressions such as $V, ${VAR}, or with modifiers
  * such as ${VAR:S,from,to,g:Q}.
+ *
  * There are 3 kinds of variables: scope variables, environment variables,
  * undefined variables.
+ *
  * Scope variables are stored in a GNode.scope.  The only way to undefine
  * a scope variable is using the .undef directive.  In particular, it must
  * not be possible to undefine a variable during the evaluation of an
  * expression, or Var.name might point nowhere.  (There is another,
 @@ -2685,29 +2685,28 @@ ApplyModifier_Range(const char **pp, Mod
 			/*
 			 * XXX: Use ch->sep instead of ' ', for consistency.
 			 */
 			Buf_AddByte(&buf, ' ');
+		}
 		Buf_AddInt(&buf, 1 + (int)i);
+	}
 	Expr_SetValueOwn(ch->expr, Buf_DoneData(&buf));
 	return AMR_OK;
+}
 /* Parse a ':M' or ':N' modifier. */
-static void
+static char *
-ParseModifier_Match(const char **pp, const ModChain *ch,
+ParseModifier_Match(const char **pp, const ModChain *ch)
 		    char **out_pattern)
+{
 	const char *mod = *pp;
 	Expr *expr = ch->expr;
 	bool copy = false;	/* pattern should be, or has been, copied */
 	bool needSubst = false;
 	const char *endpat;
 	char *pattern;
 	/*
 	 * In the loop below, ignore ':' unless we are at (or back to) the
 	 * original brace level.
 	 * XXX: This will likely not work right if $() and ${} are intermixed.
 	 */
 @@ -2751,44 +2750,48 @@ ParseModifier_Match(const char **pp, con
 			if (src[0] == '\\' && src + 1 < endpat &&
 			    /* XXX: ch->startc is missing here; see above */
 			    IsDelimiter(src[1], ch))
 				src++;
 			*dst = *src;
+		}
 		*dst = '\0';
 	} else {
 		pattern = bmake_strsedup(mod + 1, endpat);
+	}
 	if (needSubst) {
 		char *old_pattern = pattern;
 		/*
 		 * XXX: Contrary to ParseModifierPart, a dollar in a ':M' or
 		 * ':N' modifier must be escaped as '$$', not as '\$'.
 		 */
 		(void)Var_Subst(pattern, expr->scope, expr->emode, &pattern);
 		/* TODO: handle errors */
 		free(old_pattern);
+	}
 	DEBUG2(VAR, "Pattern for ':%c' is \"%s\"\n", mod[0], pattern);
-	*out_pattern = pattern;
+	return pattern;
+}
 /* :Mpattern or :Npattern */
 static ApplyModifierResult
 ApplyModifier_Match(const char **pp, ModChain *ch)
+{
 	char mod = **pp;
 	char *pattern;
-	ParseModifier_Match(pp, ch, &pattern);
+	pattern = ParseModifier_Match(pp, ch);
 	if (ModChain_ShouldEval(ch)) {
 		ModifyWordProc modifyWord =
 		    mod == 'M' ? ModifyWord_Match : ModifyWord_NoMatch;
 		ModifyWords(ch, modifyWord, pattern, ch->oneBigWord);
+	}
 	free(pattern);
 	return AMR_OK;
+}
 static void
 ParsePatternFlags(const char **pp, PatternFlags *pflags, bool *oneBigWord)