Sun Mar 14 20:03:56 2021 UTC ()

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.


(rillig)

diff -r1.878 -r1.879 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2021/03/14 20:00:48	1.878
+++ src/usr.bin/make/var.c 2021/03/14 20:03:56	1.879

 @@ -1,14 +1,14 @@
-/*	$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
  *	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.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,
 	/*
 	 * 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
 @@ -3265,26 +3265,29 @@ ApplyModifier_Order(const char **pp, App
 	enum SortMode {
 		ASC, DESC, SHUFFLE
 	} mode;
 	if (IsDelimiter(mod[1], st)) {
 		mode = ASC;
 	} else if ((mod[1] == 'r' || mod[1] == 'x') &&
 	    IsDelimiter(mod[2], st)) {
 		(*pp)++;
 		mode = mod[1] == 'r' ? DESC : SHUFFLE;
 	} 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);
 	else
 		qsort(words.words, words.len, sizeof words.words[0],
 		    mode == ASC ? str_cmp_asc : str_cmp_desc);
 	Expr_SetValueOwn(st->expr, Words_JoinFree(words));
 	return AMR_OK;
+}
 /* :? then : else */
 static ApplyModifierResult