 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.402 2020/08/02 18:57:55 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.403 2020/08/02 19:08:54 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.402 2020/08/02 18:57:55 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.403 2020/08/02 19:08:54 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.402 2020/08/02 18:57:55 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.403 2020/08/02 19:08:54 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.
+ *
 @@ -1562,56 +1562,62 @@ ModifyWords(GNode *ctx, Byte sep, Boolea
 static int
 VarWordCompare(const void *a, const void *b)
+{
     return strcmp(*(const char * const *)a, *(const char * const *)b);
+}
 static int
 VarWordCompareReverse(const void *a, const void *b)
+{
     return strcmp(*(const char * const *)b, *(const char * const *)a);
+}
 /* Remove adjacent duplicate words. */
 static char *
-VarUniq(const char *str)
+WordList_JoinFree(char **av, int ac, char *as)
+{
-    Buffer buf;			/* Buffer for new string */
+    Buffer buf;
     Buf_InitZ(&buf, 0);
     int i;
     for (i = 0; i < ac; i++) {
 	if (i != 0)
 	    Buf_AddByte(&buf, ' ');
 	Buf_AddStr(&buf, av[i]);
+    }
     free(av);
     free(as);
     return Buf_Destroy(&buf, FALSE);
+}
 /* Remove adjacent duplicate words. */
 static char *
 VarUniq(const char *str)
+{
     char *as;			/* Word list memory */
     int ac;
     char **av = brk_string(str, &ac, FALSE, &as);
     if (ac > 1) {
 	int i, j;
 	for (j = 0, i = 1; i < ac; i++)
 	    if (strcmp(av[i], av[j]) != 0 && (++j != i))
 		av[j] = av[i];
 	ac = j + 1;
+    }
-    int i;
+    return WordList_JoinFree(av, ac, as);
     for (i = 0; i < ac; i++) {
 	if (i != 0)
 	    Buf_AddByte(&buf, ' ');
 	Buf_AddStr(&buf, av[i]);
     free(as);
     free(av);
     return Buf_Destroy(&buf, FALSE);
+}
 /*-
  * Parse a text part of a modifier such as the "from" and "to" in :S/from/to/
  * or the :@ modifier, until the next unescaped delimiter.  The delimiter, as
  * well as the backslash or the dollar, can be escaped with a backslash.
+ *
  * Return the parsed (and possibly expanded) string, or NULL if no delimiter
  * was found.
  */
 static char *
 ParseModifierPart(
 @@ -2591,40 +2597,27 @@ ApplyModifier_Order(const char *mod, App
 	    for (i = ac - 1; i > 0; i--) {
 		int rndidx = random() % (i + 1);
 		char *t = av[i];
 		av[i] = av[rndidx];
 		av[rndidx] = t;
+	    }
+	}
     } else {
 	free(as);
 	free(av);
 	return AMR_BAD;
+    }
-    Buffer buf;
+    st->newVal = WordList_JoinFree(av, ac, as);
     Buf_InitZ(&buf, 0);
     int i;
     for (i = 0; i < ac; i++) {
 	if (i != 0)
 	    Buf_AddByte(&buf, ' ');
 	Buf_AddStr(&buf, av[i]);
     free(as);
     free(av);
     st->newVal = Buf_Destroy(&buf, FALSE);
     return AMR_OK;
+}
 /* :? then : else */
 static ApplyModifierResult
 ApplyModifier_IfElse(const char *mod, ApplyModifiersState *st)
+{
     Boolean value = FALSE;
     VarEvalFlags then_eflags = st->eflags & ~VARE_WANTRES;
     VarEvalFlags else_eflags = st->eflags & ~VARE_WANTRES;
     int cond_rc = COND_PARSE;	/* anything other than COND_INVALID */
     if (st->eflags & VARE_WANTRES) {