Mon Jul 27 22:50:01 2020 UTC ()

make(1): replace comment in ApplyModifier_Match with code


(rillig)

diff -r1.344 -r1.345 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2020/07/27 22:30:00	1.344
+++ src/usr.bin/make/var.c 2020/07/27 22:50:01	1.345

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.344 2020/07/27 22:30:00 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.345 2020/07/27 22:50:01 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.344 2020/07/27 22:30:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.345 2020/07/27 22:50:01 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.344 2020/07/27 22:30:00 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.345 2020/07/27 22:50:01 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.
+ *
 @@ -2341,39 +2341,34 @@ ApplyModifier_Match(const char *mod, App
 	if (*st->cp == '(' || *st->cp == '{')
 	    ++nest;
 	if (*st->cp == ')' || *st->cp == '}') {
 	    --nest;
 	    if (nest == 0)
 		break;
+	}
+    }
     st->termc = *st->cp;
     const char *endpat = st->cp;
     char *pattern = NULL;
     if (copy) {
-	/*
+	/* Compress the \:'s out of the pattern. */
-	 * Need to compress the \:'s out of the pattern, so
+	pattern = bmake_malloc(st->cp - (mod + 1) + 1);
 	 * allocate enough room to hold the uncompressed
 	 * pattern (note that st->cp started at mod+1, so
 	 * st->cp - mod takes the null byte into account) and
 	 * compress the pattern into the space.
 	 */
 	pattern = bmake_malloc(st->cp - mod);
 	char *cp2;
 	for (cp2 = pattern, st->cp = mod + 1;
 	     st->cp < endpat;
 	     st->cp++, cp2++) {
 	    if ((*st->cp == '\\') && (st->cp+1 < endpat) &&
 		/* XXX: st->startc is missing here; see above */
 		(st->cp[1] == ':' || st->cp[1] == st->endc))
 		st->cp++;
 	    *cp2 = *st->cp;
+	}
 	*cp2 = '\0';
 	endpat = cp2;
     } else {
 	/*
 	 * Either Var_Subst or ModifyWords will need a
 	 * nul-terminated string soon, so construct one now.
 	 */
 	pattern = bmake_strndup(mod + 1, endpat - (mod + 1));
+    }