 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.934 2021/06/21 08:40:44 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.935 2021/06/21 17:21:37 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.
 @@ -130,27 +130,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.934 2021/06/21 08:40:44 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.935 2021/06/21 17:21:37 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.
 @@ -1596,104 +1596,100 @@ struct ModifyWord_SubstRegexArgs {
 /*
  * Callback for ModifyWords to implement the :C/from/to/ modifier.
  * Perform a regex substitution on the given word.
  */
 static void
 ModifyWord_SubstRegex(Substring word, SepBuf *buf, void *data)
+{
 	struct ModifyWord_SubstRegexArgs *args = data;
 	int xrv;
 	const char *wp;
 	const char *rp;
 	int flags = 0;
 	regmatch_t m[10];
 	size_t n;
 	assert(word.end[0] == '\0');	/* assume null-terminated word */
 	wp = word.start;
-	if (args->pflags.subOnce && args->matched)
+	if (args->pflags.subOnce && args->matched) {
-		goto nosub;
+	nosub:
 		SepBuf_AddStr(buf, wp);
 		return;
+	}
-tryagain:
+again:
 	xrv = regexec(&args->re, wp, args->nsub, m, flags);
 	if (xrv == 0)
 		goto ok;
 	if (xrv != REG_NOMATCH)
 		VarREError(xrv, &args->re, "Unexpected regex error");
 	goto nosub;
-	switch (xrv) {
+ok:
-	case 0:
+	args->matched = true;
-		args->matched = true;
+	SepBuf_AddBytes(buf, wp, (size_t)m[0].rm_so);
 		SepBuf_AddBytes(buf, wp, (size_t)m[0].rm_so);
-		/*
+	/*
-		 * Replacement of regular expressions is not specified by
+	 * Replacement of regular expressions is not specified by
-		 * POSIX, therefore implement it here.
+	 * POSIX, therefore re-implement it here.
-		 */
+	 */
-		for (rp = args->replace; *rp != '\0'; rp++) {
+	for (rp = args->replace; *rp != '\0'; rp++) {
-			if (*rp == '\\' && (rp[1] == '&' || rp[1] == '\\')) {
+		if (*rp == '\\' && (rp[1] == '&' || rp[1] == '\\')) {
-				SepBuf_AddBytes(buf, rp + 1, 1);
+			SepBuf_AddBytes(buf, rp + 1, 1);
-				rp++;
+			rp++;
-				continue;
+			continue;
+		}
-			if (*rp == '&') {
+		if (*rp == '&') {
-				SepBuf_AddBytesBetween(buf,
+			SepBuf_AddBytesBetween(buf,
-				    wp + m[0].rm_so, wp + m[0].rm_eo);
+			    wp + m[0].rm_so, wp + m[0].rm_eo);
-				continue;
+			continue;
+		}
-			if (*rp != '\\' || !ch_isdigit(rp[1])) {
+		if (*rp != '\\' || !ch_isdigit(rp[1])) {
-				SepBuf_AddBytes(buf, rp, 1);
+			SepBuf_AddBytes(buf, rp, 1);
-				continue;
+			continue;
+		}
-			{	/* \0 to \9 backreference */
+		/* \0 to \9 backreference */
-				size_t n = (size_t)(rp[1] - '0');
+		n = (size_t)(rp[1] - '0');
-				rp++;
+		rp++;
-				if (n >= args->nsub) {
+		if (n >= args->nsub) {
-					Error("No subexpression \\%u",
+			Error("No subexpression \\%u", (unsigned)n);
-					    (unsigned)n);
+		} else if (m[n].rm_so == -1) {
-				} else if (m[n].rm_so == -1) {
+			if (opts.strict) {
-					if (opts.strict) {
+				Error("No match for subexpression \\%u",
-						Error(
+				    (unsigned)n);
 						    "No match for subexpression \\%u",
 							(unsigned)n);
 				} else {
 					SepBuf_AddBytesBetween(buf,
 					    wp + m[n].rm_so, wp + m[n].rm_eo);
+			}
 		} else {
 			SepBuf_AddBytesBetween(buf,
 			    wp + m[n].rm_so, wp + m[n].rm_eo);
+		}
+	}
-		wp += m[0].rm_eo;
+	wp += m[0].rm_eo;
-		if (args->pflags.subGlobal) {
+	if (args->pflags.subGlobal) {
-			flags |= REG_NOTBOL;
+		flags |= REG_NOTBOL;
-			if (m[0].rm_so == 0 && m[0].rm_eo == 0) {
+		if (m[0].rm_so == 0 && m[0].rm_eo == 0) {
-				SepBuf_AddBytes(buf, wp, 1);
+			SepBuf_AddBytes(buf, wp, 1);
-				wp++;
+			wp++;
 			if (*wp != '\0')
 				goto tryagain;
+		}
 		if (*wp != '\0')
-			SepBuf_AddStr(buf, wp);
+			goto again;
 		break;
 	default:
 		VarREError(xrv, &args->re, "Unexpected regex error");
 		/* FALLTHROUGH */
 	case REG_NOMATCH:
 	nosub:
 		SepBuf_AddStr(buf, wp);
 		break;
+	}
 	if (*wp != '\0')
 		SepBuf_AddStr(buf, wp);
+}
 #endif
 struct ModifyWord_LoopArgs {
 	GNode *scope;
 	const char *var;	/* name of the temporary variable */
 	const char *body;	/* string to expand */
 	VarEvalMode emode;
 };
 /* Callback for ModifyWords to implement the :@var@...@ modifier of ODE make. */
 static void