 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.391 2020/08/02 09:36:54 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.392 2020/08/02 09:43:22 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.391 2020/08/02 09:36:54 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.392 2020/08/02 09:43:22 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.391 2020/08/02 09:36:54 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.392 2020/08/02 09:43:22 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.
+ *
 @@ -1721,124 +1721,124 @@ VarUniq(const char *str)
+}
 /*-
  * Parse a text part of a modifier such as the "from" and "to" in :S/from/to/
  * or the :@ modifier, until the next unescaped delimiter.  The delimiter, as
  * well as the backslash or the dollar, can be escaped with a backslash.
+ *
  * Return the parsed (and possibly expanded) string, or NULL if no delimiter
  * was found.
  */
 static char *
 ParseModifierPart(
-    const char **tstr,		/* The parsing position, updated upon return */
+    const char **pp,		/* The parsing position, updated upon return */
     int delim,			/* Parsing stops at this delimiter */
     VarEvalFlags eflags,	/* Flags for evaluating nested variables;
 				 * if VARE_WANTRES is not set, the text is
 				 * only parsed */
     GNode *ctxt,		/* For looking up nested variables */
     size_t *out_length,		/* Optionally stores the length of the returned
 				 * string, just to save another strlen call. */
     VarPatternFlags *out_pflags,/* For the first part of the :S modifier,
 				 * sets the VARP_ANCHOR_END flag if the last
 				 * character of the pattern is a $. */
     ModifyWord_SubstArgs *subst	/* For the second part of the :S modifier,
 				 * allow ampersands to be escaped and replace
 				 * unescaped ampersands with subst->lhs. */
 ) {
     const char *cp;
     char *rstr;
     Buffer buf;
     VarEvalFlags errnum = eflags & VARE_UNDEFERR;
     Buf_InitZ(&buf, 0);
     /*
      * Skim through until the matching delimiter is found;
      * pick up variable substitutions on the way. Also allow
      * backslashes to quote the delimiter, $, and \, but don't
      * touch other backslashes.
      */
-    for (cp = *tstr; *cp != '\0' && *cp != delim; cp++) {
+    const char *p;
-	Boolean is_escaped = cp[0] == '\\' && (
+    for (p = *pp; *p != '\0' && *p != delim; p++) {
-	    cp[1] == delim || cp[1] == '\\' || cp[1] == '$' ||
+	Boolean is_escaped = p[0] == '\\' && (
-	    (cp[1] == '&' && subst != NULL));
+	    p[1] == delim || p[1] == '\\' || p[1] == '$' ||
 	    (p[1] == '&' && subst != NULL));
 	if (is_escaped) {
-	    Buf_AddByte(&buf, cp[1]);
+	    Buf_AddByte(&buf, p[1]);
-	    cp++;
+	    p++;
 	    continue;
+	}
-	if (*cp != '$') {	/* Unescaped, simple text */
+	if (*p != '$') {	/* Unescaped, simple text */
-	    if (subst != NULL && *cp == '&')
+	    if (subst != NULL && *p == '&')
 		Buf_AddBytesZ(&buf, subst->lhs, subst->lhsLen);
 	    else
-		Buf_AddByte(&buf, *cp);
+		Buf_AddByte(&buf, *p);
 	    continue;
+	}
-	if (cp[1] == delim) {	/* Unescaped $ at end of pattern */
+	if (p[1] == delim) {	/* Unescaped $ at end of pattern */
 	    if (out_pflags != NULL)
 		*out_pflags |= VARP_ANCHOR_END;
 	    else
-		Buf_AddByte(&buf, *cp);
+		Buf_AddByte(&buf, *p);
 	    continue;
+	}
 	if (eflags & VARE_WANTRES) {	/* Nested variable, evaluated */
 	    const char *cp2;
 	    int     len;
 	    void   *freeIt;
-	    cp2 = Var_Parse(cp, ctxt, errnum | (eflags & VARE_WANTRES),
+	    cp2 = Var_Parse(p, ctxt, errnum | (eflags & VARE_WANTRES),
 			    &len, &freeIt);
 	    Buf_AddStr(&buf, cp2);
 	    free(freeIt);
-	    cp += len - 1;
+	    p += len - 1;
 	    continue;
+	}
-	const char *cp2 = &cp[1];	/* Nested variable, only parsed */
+	const char *cp2 = &p[1];	/* Nested variable, only parsed */
 	if (*cp2 == PROPEN || *cp2 == BROPEN) {
 	    /*
 	     * Find the end of this variable reference
 	     * and suck it in without further ado.
 	     * It will be interpreted later.
 	     */
 	    int have = *cp2;
 	    int want = *cp2 == PROPEN ? PRCLOSE : BRCLOSE;
 	    int depth = 1;
 	    for (++cp2; *cp2 != '\0' && depth > 0; ++cp2) {
 		if (cp2[-1] != '\\') {
 		    if (*cp2 == have)
 			++depth;
 		    if (*cp2 == want)
 			--depth;
+		}
+	    }
-	    Buf_AddBytesBetween(&buf, cp, cp2);
+	    Buf_AddBytesBetween(&buf, p, cp2);
-	    cp = --cp2;
+	    p = --cp2;
 	} else
-	    Buf_AddByte(&buf, *cp);
+	    Buf_AddByte(&buf, *p);
+    }
-    if (*cp != delim) {
+    if (*p != delim) {
-	*tstr = cp;
+	*pp = p;
 	return NULL;
+    }
-    *tstr = ++cp;
+    *pp = ++p;
     if (out_length != NULL)
 	*out_length = Buf_Size(&buf);
     rstr = Buf_Destroy(&buf, FALSE);
     if (DEBUG(VAR))
 	fprintf(debug_file, "Modifier part: \"%s\"\n", rstr);
     return rstr;
+}
 /*-
  *-----------------------------------------------------------------------
  * VarQuote --
  *	Quote shell meta-characters and space characters in the string
  *	if quoteDollar is set, also quote and double any '$' characters.