Sun Mar 14 15:22:21 2021 UTC ()

make: separate parsing and evaluating for modifier ':u'

No functional change.


(rillig)

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

--- src/usr.bin/make/var.c 2021/03/14 15:19:15	1.861
+++ src/usr.bin/make/var.c 2021/03/14 15:22:21	1.862

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.861 2021/03/14 15:19:15 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.862 2021/03/14 15:22:21 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.861 2021/03/14 15:19:15 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.862 2021/03/14 15:22:21 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
 @@ -3319,28 +3319,28 @@ ApplyModifier_Assign(const char **pp, Ap
 	Expr *expr = st->expr;
 	GNode *scope;
 	char *val;
 	VarParseResult res;
 	const char *mod = *pp;
 	const char *op = mod + 1;
 	if (op[0] == '=')
 		goto ok;
 	if ((op[0] == '!' || op[0] == '+' || op[0] == '?') && op[1] == '=')
 		goto ok;
 	return AMR_UNKNOWN;	/* "::<unrecognised>" */
 ok:
 ok:
 	if (expr->var->name.str[0] == '\0') {
 		*pp = mod + 1;
 		return AMR_BAD;
+	}
 	scope = expr->scope;	/* scope where v belongs */
 	if (expr->defined == DEF_REGULAR && expr->scope != SCOPE_GLOBAL) {
 		Var *gv = VarFind(expr->var->name.str, expr->scope, FALSE);
 		if (gv == NULL)
 			scope = SCOPE_GLOBAL;
 		else
 			VarFreeEnv(gv);
+	}
 @@ -3432,32 +3432,33 @@ ApplyModifier_WordFunc(const char **pp,
 		       ModifyWordProc modifyWord)
+{
 	if (!IsDelimiter((*pp)[1], st))
 		return AMR_UNKNOWN;
 	ModifyWords(st, modifyWord, NULL, st->oneBigWord);
 	(*pp)++;
 	return AMR_OK;
+}
 static ApplyModifierResult
 ApplyModifier_Unique(const char **pp, ApplyModifiersState *st)
+{
-	if (IsDelimiter((*pp)[1], st)) {
+	if (!IsDelimiter((*pp)[1], st))
 		Expr_SetValueOwn(st->expr, VarUniq(st->expr->value.str));
 		(*pp)++;
 		return AMR_OK;
 	} else
 		return AMR_UNKNOWN;
 	(*pp)++;
 	Expr_SetValueOwn(st->expr, VarUniq(st->expr->value.str));
 	return AMR_OK;
+}
 #ifdef SYSVVARSUB
 /* :from=to */
 static ApplyModifierResult
 ApplyModifier_SysV(const char **pp, ApplyModifiersState *st)
+{
 	Expr *expr = st->expr;
 	char *lhs, *rhs;
 	VarParseResult res;
 	const char *mod = *pp;
 	Boolean eqFound = FALSE;