Sat Sep 12 19:13:43 2020 UTC ()

make(1): remove double negation in Var_Parse


(rillig)

diff -r1.498 -r1.499 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2020/09/12 18:45:24	1.498
+++ src/usr.bin/make/var.c 2020/09/12 19:13:43	1.499

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.498 2020/09/12 18:45:24 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.499 2020/09/12 19:13:43 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.498 2020/09/12 18:45:24 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.499 2020/09/12 19:13:43 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.498 2020/09/12 18:45:24 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.499 2020/09/12 19:13:43 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.
+ *
 @@ -3578,35 +3578,33 @@ Var_Parse(const char **pp, GNode *ctxt,
 	    nstr = ApplyModifiers(&p, nstr, startc, endc,
 				  v, ctxt, eflags, freePtr);
 	    free(extraFree);
 	} else {
 	    *freePtr = extraFree;
+	}
+    }
     /* Skip past endc if possible. */
     *pp = p + (*p ? 1 : 0);
     if (v->flags & VAR_FROM_ENV) {
-	Boolean destroy = nstr != Buf_GetAll(&v->val, NULL);
+        /* Free the environment variable now since we own it,
-	if (!destroy) {
+         * but don't free the variable value if it will be returned. */
-	    /*
+	Boolean keepValue = nstr == Buf_GetAll(&v->val, NULL);
-	     * Returning the value unmodified, so tell the caller to free
+	if (keepValue)
 	     * the thing.
 	     */
 	    *freePtr = nstr;
 	(void)VarFreeEnv(v, !keepValue);
 	(void)VarFreeEnv(v, destroy);
     } else if (v->flags & VAR_JUNK) {
 	/*
 	 * Perform any freeing 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 != NULL) {
 		free(*freePtr);
 		*freePtr = NULL;
+	    }
 	    if (dynamic) {
 		nstr = bmake_strldup(start, (size_t)(*pp - start));