Module Name: src
Committed By: rillig
Date: Sun Mar 14 20:03:56 UTC 2021
Modified Files:
src/usr.bin/make: var.c
Log Message:
make: do not evaluate the ':O' modifiers in parse-only mode
No functional change in practical usage. Theoretically this change can
be observed by looking at the generated random numbers for the ':Ox'
modifier, but the quality or exact sequence of these random numbers is
not guaranteed anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.878 -r1.879 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.878 src/usr.bin/make/var.c:1.879
--- src/usr.bin/make/var.c:1.878 Sun Mar 14 20:00:48 2021
+++ src/usr.bin/make/var.c Sun Mar 14 20:03:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.878 2021/03/14 20:00:48 rillig Exp $ */
+/* $NetBSD: var.c,v 1.879 2021/03/14 20:03:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.878 2021/03/14 20:00:48 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.879 2021/03/14 20:03:56 rillig Exp $");
typedef enum VarFlags {
VFL_NONE = 0,
@@ -3275,6 +3275,9 @@ ApplyModifier_Order(const char **pp, App
} else
return AMR_BAD;
+ if (!(st->expr->eflags & VARE_WANTRES))
+ return AMR_OK;
+
words = Str_Words(st->expr->value.str, FALSE);
if (mode == SHUFFLE)
ShuffleStrings(words.words, words.len);
