 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.326 2020/07/26 19:13:42 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.327 2020/07/26 19:16:17 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.326 2020/07/26 19:13:42 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.327 2020/07/26 19:16:17 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.326 2020/07/26 19:13:42 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.327 2020/07/26 19:16:17 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.
+ *
 @@ -3373,49 +3373,47 @@ cleanup:
  *	specification is invalid. The length of the specification is
  *	placed in *lengthPtr (for invalid specifications, this is just
  *	2...?).
  *	If *freePtr is non-NULL then it's a pointer that the caller
  *	should pass to free() to free memory used by the result.
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 /* coverity[+alloc : arg-*4] */
 char *
-Var_Parse(const char *str, GNode *ctxt, VarEvalFlags flags,
+Var_Parse(const char * const str, GNode *ctxt, VarEvalFlags flags,
 	  int *lengthPtr, void **freePtr)
+{
     const char	*tstr;		/* Pointer into str */
     Var		*v;		/* Variable in invocation */
     Boolean 	 haveModifier;	/* TRUE if have modifiers for the variable */
     char	 endc;		/* Ending character when variable in parens
 				 * or braces */
     char	 startc;	/* Starting character when variable in parens
 				 * or braces */
     int		 vlen;		/* Length of variable name */
     const char 	*start;		/* Points to original start of str */
     char	*nstr;		/* New string, used during expansion */
     Boolean	 dynamic;	/* TRUE if the variable is local and we're
 				 * expanding it in a non-local context. This
 				 * is done to support dynamic sources. The
 				 * result is just the invocation, unaltered */
     const char	*extramodifiers; /* extra modifiers to apply first */
     *freePtr = NULL;
     extramodifiers = NULL;
     dynamic = FALSE;
     start = str;
     startc = str[1];
     if (startc != PROPEN && startc != BROPEN) {
 	/*
 	 * If it's not bounded by braces of some sort, life is much simpler.
 	 * We just need to check for the first character and return the
 	 * value if it exists.
 	 */
 	/* Error out some really stupid names */
 	if (startc == '\0' || strchr(")}:$", startc)) {
 	    *lengthPtr = 1;
 	    return var_Error;
 @@ -3567,29 +3565,29 @@ Var_Parse(const char *str, GNode *ctxt,
 		    (strncmp(varname, ".ARCHIVE", len) == 0) ||
 		    (strncmp(varname, ".PREFIX", len) == 0) ||
 		    (strncmp(varname, ".MEMBER", len) == 0))
+		{
 		    dynamic = TRUE;
+		}
+	    }
 	    if (!haveModifier) {
 		/*
 		 * No modifiers -- have specification length so we can return
 		 * now.
 		 */
-		*lengthPtr = tstr - start + 1;
+		*lengthPtr = tstr - str + 1;
 		if (dynamic) {
-		    char *pstr = bmake_strndup(start, *lengthPtr);
+		    char *pstr = bmake_strndup(str, *lengthPtr);
 		    *freePtr = pstr;
 		    Buf_Destroy(&buf, TRUE);
 		    return pstr;
 		} else {
 		    Buf_Destroy(&buf, TRUE);
 		    return (flags & VARE_UNDEFERR) ? var_Error : varNoError;
+		}
 	    } else {
 		/*
 		 * Still need to get to the end of the variable specification,
 		 * so kludge up a Var structure for the modifications
 		 */
 		v = bmake_malloc(sizeof(Var));
 @@ -3637,54 +3635,54 @@ Var_Parse(const char *str, GNode *ctxt,
 	if (haveModifier) {
 	    /* Skip initial colon. */
 	    tstr++;
 	    nstr = ApplyModifiers(nstr, tstr, startc, endc,
 				  v, ctxt, flags, &used, freePtr);
 	    tstr += used;
 	    free(extraFree);
 	} else {
 	    *freePtr = extraFree;
+	}
+    }
-    *lengthPtr = tstr - start + (*tstr ? 1 : 0);
+    *lengthPtr = tstr - str + (*tstr ? 1 : 0);
     if (v->flags & VAR_FROM_ENV) {
 	Boolean destroy = FALSE;
 	if (nstr != Buf_GetAll(&v->val, NULL)) {
 	    destroy = TRUE;
 	} else {
 	    /*
 	     * Returning the value unmodified, so tell the caller to free
 	     * the thing.
 	     */
 	    *freePtr = nstr;
+	}
 	VarFreeEnv(v, destroy);
     } else if (v->flags & VAR_JUNK) {
 	/*
 	 * Perform any free'ing needed and set *freePtr to NULL so the caller
 	 * doesn't try to free a static pointer.
 	 * If VAR_KEEP is also set then we want to keep str(?) as is.
 	 */
 	if (!(v->flags & VAR_KEEP)) {
 	    if (*freePtr) {
 		free(nstr);
 		*freePtr = NULL;
+	    }
 	    if (dynamic) {
-		nstr = bmake_strndup(start, *lengthPtr);
+		nstr = bmake_strndup(str, *lengthPtr);
 		*freePtr = nstr;
 	    } else {
 		nstr = (flags & VARE_UNDEFERR) ? var_Error : varNoError;
+	    }
+	}
 	if (nstr != Buf_GetAll(&v->val, NULL))
 	    Buf_Destroy(&v->val, TRUE);
 	free(v->name);
 	free(v);
+    }
     return nstr;
+}