Sun Jul 19 15:47:10 2020 UTC ()

make(1): eliminate macro from VarGetPattern


(rillig)

diff -r1.262 -r1.263 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2020/07/19 14:05:39	1.262
+++ src/usr.bin/make/var.c 2020/07/19 15:47:10	1.263

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.262 2020/07/19 14:05:39 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.263 2020/07/19 15:47:10 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.262 2020/07/19 14:05:39 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.263 2020/07/19 15:47:10 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.262 2020/07/19 14:05:39 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.263 2020/07/19 15:47:10 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. The value and variable name need not
  *			    be preserved.
 @@ -2050,38 +2050,36 @@ VarGetPattern(GNode *ctxt, Var_Parse_Sta
 	      VarEvalFlags eflags, const char **tstr, int delim,
 	      VarPatternFlags *mpflags, int *length, VarPattern *pattern)
+{
     const char *cp;
     char *rstr;
     Buffer buf;
     int junk;
     VarEvalFlags errnum = eflags & VARE_UNDEFERR;
     Buf_Init(&buf, 0);
     if (length == NULL)
 	length = &junk;
 #define IS_A_MATCH(cp, delim) \
     ((cp[0] == '\\') && ((cp[1] == delim) ||  \
      (cp[1] == '\\') || (cp[1] == '$') || (pattern && (cp[1] == '&'))))
     /*
      * 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 && (*cp != delim); cp++) {
-	if (IS_A_MATCH(cp, delim)) {
+	Boolean is_escaped = cp[0] == '\\' && (cp[1] == delim ||
 	    cp[1] == '\\' || cp[1] == '$' || (pattern && cp[1] == '&'));
 	if (is_escaped) {
 	    Buf_AddByte(&buf, cp[1]);
 	    cp++;
 	} else if (*cp == '$') {
 	    if (cp[1] == delim) {
 		if (mpflags == NULL)
 		    Buf_AddByte(&buf, *cp);
 		else
 		    /*
 		     * Unescaped $ at end of pattern => anchor
 		     * pattern at end.
 		     */
 		    *mpflags |= VARP_MATCH_END;
 	    } else {