Sun Mar 14 15:19:15 2021 UTC ()

make: separate parsing and evaluating for modifiers ':Q' and ':q'

No functional change.


(rillig)

diff -r1.860 -r1.861 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2021/03/14 15:15:28	1.860
+++ src/usr.bin/make/var.c 2021/03/14 15:19:15	1.861

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.860 2021/03/14 15:15:28 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.861 2021/03/14 15:19:15 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.
 @@ -130,27 +130,27 @@
 #include <regex.h>
 #endif
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.860 2021/03/14 15:15:28 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.861 2021/03/14 15:19:15 rillig Exp $");
 typedef enum VarFlags {
 	VFL_NONE	= 0,
 	/*
 	 * The variable's value is currently being used by Var_Parse or
 	 * Var_Subst.  This marker is used to avoid endless recursion.
 	 */
 	VFL_IN_USE	= 1 << 0,
 	/*
 	 * The variable comes from the environment.
 	 * These variables are not registered in any GNode, therefore they
 @@ -2914,33 +2914,34 @@ ApplyModifier_Regex(const char **pp, App
 	ModifyWords(st, ModifyWord_SubstRegex, &args, oneBigWord);
 	regfree(&args.re);
 	free(args.replace);
 	return AMR_OK;
+}
 #endif
 /* :Q, :q */
 static ApplyModifierResult
 ApplyModifier_Quote(const char **pp, ApplyModifiersState *st)
+{
-	if (IsDelimiter((*pp)[1], st)) {
+	Boolean quoteDollar = **pp == 'q';
-		Expr_SetValueOwn(st->expr,
+	if (!IsDelimiter((*pp)[1], st))
 		    VarQuote(st->expr->value.str, **pp == 'q'));
 		(*pp)++;
 		return AMR_OK;
 	} else
 		return AMR_UNKNOWN;
 	(*pp)++;
 	Expr_SetValueOwn(st->expr, VarQuote(st->expr->value.str, quoteDollar));
 	return AMR_OK;
+}
 /*ARGSUSED*/
 static void
 ModifyWord_Copy(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
+{
 	SepBuf_AddStr(buf, word);
+}
 /* :ts<separator> */
 static ApplyModifierResult
 ApplyModifier_ToSep(const char **pp, ApplyModifiersState *st)
+{