 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat.c,v 1.137 2020/08/30 14:11:42 rillig Exp $	*/
+/*	$NetBSD: compat.c,v 1.138 2020/08/30 19:56:02 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 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.
 @@ -60,34 +60,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: compat.c,v 1.137 2020/08/30 14:11:42 rillig Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.138 2020/08/30 19:56:02 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: compat.c,v 1.137 2020/08/30 14:11:42 rillig Exp $");
+__RCSID("$NetBSD: compat.c,v 1.138 2020/08/30 19:56:02 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * compat.c --
  *	The routines in this file implement the full-compatibility
  *	mode of PMake. Most of the special functionality of PMake
  *	is available in this mode. Things not supported:
  *	    - different shells.
  *	    - friendly variable substitution.
+ *
  * Interface:
 @@ -326,37 +326,38 @@ again:
 	shargc = 0;
 	shargv[shargc++] = shellPath;
 	/*
 	 * The following work for any of the builtin shell specs.
 	 */
 	if (errCheck && shellErrFlag) {
 	    shargv[shargc++] = shellErrFlag;
+	}
 	if (DEBUG(SHELL))
 		shargv[shargc++] = "-xc";
 	else
 		shargv[shargc++] = "-c";
 	shargv[shargc++] = cmd;
-	shargv[shargc++] = NULL;
+	shargv[shargc] = NULL;
 	av = shargv;
 	bp = NULL;
 	mav = NULL;
     } else {
         size_t argc;
 	/*
 	 * No meta-characters, so no need to exec a shell. Break the command
 	 * into words to form an argument vector we can execute.
 	 */
-	mav = brk_string(cmd, TRUE, &argc, &bp);
+	Words words = Str_Words(cmd, TRUE);
 	mav = words.words;
 	bp = words.freeIt;
 	if (mav == NULL) {
 		useShell = 1;
 		goto again;
+	}
 	av = (void *)mav;
+    }
 #ifdef USE_META
     if (useMeta) {
 	meta_compat_start();
+    }
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: for.c,v 1.66 2020/08/29 10:32:00 rillig Exp $	*/
+/*	$NetBSD: for.c,v 1.67 2020/08/30 19:56:02 rillig Exp $	*/
 /*
  * Copyright (c) 1992, The Regents of the University of California.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,34 +20,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: for.c,v 1.66 2020/08/29 10:32:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: for.c,v 1.67 2020/08/30 19:56:02 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)for.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: for.c,v 1.66 2020/08/29 10:32:00 rillig Exp $");
+__RCSID("$NetBSD: for.c,v 1.67 2020/08/30 19:56:02 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * for.c --
  *	Functions to handle loops in a makefile.
+ *
  * Interface:
  *	For_Eval 	Evaluate the loop in the passed line.
  *	For_Run		Run accumulated loop
+ *
  */
 @@ -123,28 +123,27 @@ For_Free(For *arg)
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 int
 For_Eval(char *line)
+{
     For *new_for;
     char *ptr = line, *sub;
     size_t len;
     int escapes;
     unsigned char ch;
-    char **words, *word_buf;
+    Words words;
     size_t nwords;
     /* Skip the '.' and any following whitespace */
     for (ptr++; *ptr && isspace((unsigned char)*ptr); ptr++)
 	continue;
     /*
      * If we are not in a for loop quickly determine if the statement is
      * a for.
      */
     if (ptr[0] != 'f' || ptr[1] != 'o' || ptr[2] != 'r' ||
 	!isspace((unsigned char)ptr[3])) {
 	if (ptr[0] == 'e' && strncmp(ptr + 1, "ndfor", 5) == 0) {
 	    Parse_Error(PARSE_FATAL, "for-less endfor");
 @@ -193,62 +192,62 @@ For_Eval(char *line)
     /*
      * Make a list with the remaining words
      * The values are substituted as ${:U<value>...} so we must \ escape
      * characters that break that syntax.
      * Variables are fully expanded - so it is safe for escape $.
      * We can't do the escapes here - because we don't know whether
      * we are substuting into ${...} or $(...).
      */
     sub = Var_Subst(ptr, VAR_GLOBAL, VARE_WANTRES);
     /*
      * Split into words allowing for quoted strings.
      */
-    words = brk_string(sub, FALSE, &nwords, &word_buf);
+    words = Str_Words(sub, FALSE);
     free(sub);
     if (words != NULL) {
         size_t n;
-	for (n = 0; n < nwords; n++) {
+	for (n = 0; n < words.len; n++) {
-	    ptr = words[n];
+	    ptr = words.words[n];
 	    if (!*ptr)
 		continue;
 	    escapes = 0;
 	    while ((ch = *ptr++)) {
 		switch (ch) {
 		case ':':
 		case '$':
 		case '\\':
 		    escapes |= FOR_SUB_ESCAPE_CHAR;
 		    break;
 		case ')':
 		    escapes |= FOR_SUB_ESCAPE_PAREN;
 		    break;
 		case /*{*/ '}':
 		    escapes |= FOR_SUB_ESCAPE_BRACE;
 		    break;
+		}
+	    }
 	    /*
 	     * We have to dup words[n] to maintain the semantics of
 	     * strlist.
 	     */
-	    strlist_add_str(&new_for->items, bmake_strdup(words[n]), escapes);
+	    strlist_add_str(&new_for->items, bmake_strdup(words.words[n]),
 			    escapes);
+	}
-	free(words);
+	Words_Free(words);
 	free(word_buf);
 	if ((len = strlist_num(&new_for->items)) > 0 &&
 	    len % (n = strlist_num(&new_for->vars))) {
 	    Parse_Error(PARSE_FATAL,
 			"Wrong number of words (%zu) in .for substitution list"
 			" with %zu vars", len, n);
 	    /*
 	     * Return 'success' so that the body of the .for loop is
 	     * accumulated.
 	     * Remove all items so that the loop doesn't iterate.
 	     */
 	    strlist_clean(&new_for->items);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.c,v 1.226 2020/08/30 13:53:02 rillig Exp $	*/
+/*	$NetBSD: job.c,v 1.227 2020/08/30 19:56:02 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 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.
 @@ -60,34 +60,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: job.c,v 1.226 2020/08/30 13:53:02 rillig Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.227 2020/08/30 19:56:02 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: job.c,v 1.226 2020/08/30 13:53:02 rillig Exp $");
+__RCSID("$NetBSD: job.c,v 1.227 2020/08/30 19:56:02 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * job.c --
  *	handle the creation etc. of our child processes.
+ *
  * Interface:
  *	Job_Make  	    	Start the creation of the given target.
+ *
  *	Job_CatchChildren   	Check for and handle the termination of any
  *	    	  	    	children. This must be called reasonably
 @@ -2404,46 +2404,50 @@ JobMatchShell(const char *name)
  *	    	  	    is TRUE or template of command to echo a command
  *	    	  	    for which error checking is off if hasErrCtl is
  *	    	  	    FALSE.
  *	    ignore	    Command to turn off error checking if hasErrCtl
  *	    	  	    is TRUE or template of command to execute a
  *	    	  	    command so as to ignore any errors it returns if
  *	    	  	    hasErrCtl is FALSE.
+ *
  *-----------------------------------------------------------------------
  */
 Boolean
 Job_ParseShell(char *line)
+{
     Words	wordsList;
     char	**words;
     char	**argv;
     size_t	argc;
     char	*path;
     Shell	newShell;
     Boolean	fullSpec = FALSE;
     Shell	*sh;
     while (isspace((unsigned char)*line)) {
 	line++;
+    }
     free(shellArgv);
     memset(&newShell, 0, sizeof(newShell));
     /*
      * Parse the specification by keyword
      */
-    words = brk_string(line, TRUE, &argc, &path);
+    wordsList = Str_Words(line, TRUE);
     words = wordsList.words;
     argc = wordsList.len;
     path = wordsList.freeIt;
     if (words == NULL) {
 	Error("Unterminated quoted string [%s]", line);
 	return FALSE;
+    }
     shellArgv = path;
     for (path = NULL, argv = words; argc != 0; argc--, argv++) {
 	    if (strncmp(*argv, "path=", 5) == 0) {
 		path = &argv[0][5];
 	    } else if (strncmp(*argv, "name=", 5) == 0) {
 		newShell.name = &argv[0][5];
 	    } else {
 		if (strncmp(*argv, "quiet=", 6) == 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.330 2020/08/30 11:15:05 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.331 2020/08/30 19:56:02 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,39 +59,39 @@
  * 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: main.c,v 1.330 2020/08/30 11:15:05 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.331 2020/08/30 19:56:02 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.330 2020/08/30 11:15:05 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.331 2020/08/30 19:56:02 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * main.c --
  *	The main file for this entire program. Exit routines etc
  *	reside here.
+ *
  * Utility functions defined in this file:
  *	Main_ParseArgLine	Takes a line of arguments, breaks them and
  *				treats them as if they were given when first
  *				invoked. Used by the parse module to implement
 @@ -680,54 +680,51 @@ noarg:
+ *
  * Input:
  *	line		Line to fracture
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	Only those that come from the various arguments.
  */
 void
 Main_ParseArgLine(const char *line)
+{
-	char **argv;			/* Manufactured argument vector */
+	Words words;
 	size_t argc;			/* Number of arguments in argv */
 	char *args;			/* Space used by the args */
 	char *p1;
 	const char *argv0 = Var_Value(".MAKE", VAR_GLOBAL, &p1);
 	char *buf;
 	if (line == NULL)
 		return;
 	for (; *line == ' '; ++line)
 		continue;
 	if (!*line)
 		return;
 	buf = str_concat3(argv0, " ", line);
 	free(p1);
-	argv = brk_string(buf, TRUE, &argc, &args);
+	words = Str_Words(buf, TRUE);
-	if (argv == NULL) {
+	if (words.words == NULL) {
 		Error("Unterminated quoted string [%s]", buf);
 		free(buf);
 		return;
+	}
 	free(buf);
-	MainParseArgs((int)argc, argv);
+	MainParseArgs((int)words.len, words.words);
-	free(args);
+	Words_Free(words);
 	free(argv);
+}
 Boolean
 Main_SetObjdir(const char *fmt, ...)
+{
 	struct stat sb;
 	char *path;
 	char buf[MAXPATHLEN + 1];
 	char buf2[MAXPATHLEN + 1];
 	Boolean rc = FALSE;
 	va_list ap;
 	va_start(ap, fmt);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: str.c,v 1.63 2020/08/29 07:52:55 rillig Exp $	*/
+/*	$NetBSD: str.c,v 1.64 2020/08/30 19:56:02 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: str.c,v 1.63 2020/08/29 07:52:55 rillig Exp $";
+static char rcsid[] = "$NetBSD: str.c,v 1.64 2020/08/30 19:56:02 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char     sccsid[] = "@(#)str.c	5.8 (Berkeley) 6/1/90";
 #else
-__RCSID("$NetBSD: str.c,v 1.63 2020/08/29 07:52:55 rillig Exp $");
+__RCSID("$NetBSD: str.c,v 1.64 2020/08/30 19:56:02 rillig Exp $");
 #endif
 #endif				/* not lint */
 #endif
 #include "make.h"
 /* Return the concatenation of s1 and s2, freshly allocated. */
 char *
 str_concat2(const char *s1, const char *s2)
+{
 	size_t len1 = strlen(s1);
 	size_t len2 = strlen(s2);
 	char *result = bmake_malloc(len1 + len2 + 1);
 @@ -115,45 +115,39 @@ str_concat4(const char *s1, const char *
+{
 	size_t len1 = strlen(s1);
 	size_t len2 = strlen(s2);
 	size_t len3 = strlen(s3);
 	size_t len4 = strlen(s4);
 	char *result = bmake_malloc(len1 + len2 + len3 + len4 + 1);
 	memcpy(result, s1, len1);
 	memcpy(result + len1, s2, len2);
 	memcpy(result + len1 + len2, s3, len3);
 	memcpy(result + len1 + len2 + len3, s4, len4 + 1);
 	return result;
+}
-/*-
+/* Fracture a string into an array of words (as delineated by tabs or spaces)
- * brk_string --
+ * taking quotation marks into account.  Leading tabs/spaces are ignored.
  *	Fracture a string into an array of words (as delineated by tabs or
- *	spaces) taking quotation marks into account.  Leading tabs/spaces
+ * If expand is TRUE, quotes are removed and escape sequences such as \r, \t,
- *	are ignored.
+ * etc... are expanded. In this case, the return value is NULL on parse
  * errors.
  *	If expand is TRUE, quotes are removed and escape sequences
- *	such as \r, \t, etc... are expanded. In this case, the return value
+ * Returns the fractured words, which must be freed later using Words_Free.
- *	is NULL on parse errors.
+ * If expand was TRUE and there was a parse error, words is NULL, and in that
  * case, nothing needs to be freed.
  * returns --
  *	Pointer to the array of pointers to the words.
  *	Memory containing the actual words in *out_words_buf.
  *	Both of these must be free'd by the caller.
  *	Number of words in *out_words_len.
  */
-char **
+Words
-brk_string(const char *str, Boolean expand,
+Str_Words(const char *str, Boolean expand)
 	   size_t *out_words_len, char **out_words_buf)
+{
 	size_t str_len;
 	char *words_buf;
 	size_t words_cap;
 	char **words;
 	size_t words_len;
 	char inquote;
 	char *word_start;
 	char *word_end;
 	const char *str_p;
 	/* skip leading space chars. */
 	for (; *str == ' ' || *str == '\t'; ++str)
 @@ -223,28 +217,27 @@ brk_string(const char *str, Boolean expa
 			*word_end++ = '\0';
 			if (words_len == words_cap) {
 				size_t new_size;
 				words_cap *= 2;		/* ramp up fast */
 				new_size = (words_cap + 1) * sizeof(char *);
 				words = bmake_realloc(words, new_size);
+			}
 			words[words_len++] = word_start;
 			word_start = NULL;
 			if (ch == '\n' || ch == '\0') {
 				if (expand && inquote) {
 					free(words);
 					free(words_buf);
-					*out_words_buf = NULL;
+					return (Words){ NULL, 0, NULL };
 					return NULL;
+				}
 				goto done;
+			}
 			continue;
 		case '\\':
 			if (!expand) {
 				if (word_start == NULL)
 					word_start = word_end;
 				*word_end++ = '\\';
 				/* catch '\' at end of line */
 				if (str_p[1] == '\0')
 					continue;
 				ch = *++str_p;
 @@ -272,29 +265,27 @@ brk_string(const char *str, Boolean expa
 				break;
 			case 't':
 				ch = '\t';
 				break;
+			}
 			break;
+		}
 		if (word_start == NULL)
 			word_start = word_end;
 		*word_end++ = ch;
+	}
 done:
 	words[words_len] = NULL;
-	*out_words_len = (int)words_len;
+	return (Words){ words, words_len, words_buf };
 	*out_words_buf = words_buf;
 	return words;
+}
 /*
  * Str_FindSubstring -- See if a string contains a particular substring.
+ *
  * Input:
  *	string		String to search.
  *	substring	Substring to find in string.
+ *
  * Results: If string contains substring, the return value is the location of
  * the first matching instance of substring in string.  If string doesn't
  * contain substring, the return value is NULL.  Matching is done on an exact
  * character-for-character basis with no wildcards or special characters.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.478 2020/08/29 13:38:48 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.479 2020/08/30 19:56:02 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.478 2020/08/29 13:38:48 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.479 2020/08/30 19:56:02 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.478 2020/08/29 13:38:48 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.479 2020/08/30 19:56:02 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.
+ *
 @@ -590,36 +590,32 @@ Var_ExportVars(void)
     setenv(MAKE_LEVEL_ENV, tmp, 1);
     if (var_exportedVars == VAR_EXPORTED_NONE)
 	return;
     if (var_exportedVars == VAR_EXPORTED_ALL) {
 	/* Ouch! This is crazy... */
 	Hash_ForEach(&VAR_GLOBAL->context, Var_ExportVars_callback, NULL);
 	return;
+    }
     val = Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, VARE_WANTRES);
     if (*val) {
-	char **av;
+        Words words = Str_Words(val, FALSE);
 	char *as;
 	size_t ac;
 	size_t i;
-	av = brk_string(val, FALSE, &ac, &as);
+	for (i = 0; i < words.len; i++)
-	for (i = 0; i < ac; i++)
+	    Var_Export1(words.words[i], 0);
-	    Var_Export1(av[i], 0);
+	Words_Free(words);
 	free(as);
 	free(av);
+    }
     free(val);
+}
 /*
  * This is called when .export is seen or .MAKE.EXPORTED is modified.
+ *
  * It is also called when any exported variable is modified.
  * XXX: Is it really?
+ *
  * str has the format "[-env|-literal] varname...".
  */
 void
 @@ -635,43 +631,40 @@ Var_Export(const char *str, Boolean isEx
     flags = 0;
     if (strncmp(str, "-env", 4) == 0) {
 	str += 4;
     } else if (strncmp(str, "-literal", 8) == 0) {
 	str += 8;
 	flags |= VAR_EXPORT_LITERAL;
     } else {
 	flags |= VAR_EXPORT_PARENT;
+    }
     val = Var_Subst(str, VAR_GLOBAL, VARE_WANTRES);
     if (val[0] != '\0') {
-	char *as;
+        Words words = Str_Words(val, FALSE);
 	size_t ac;
 	char **av = brk_string(val, FALSE, &ac, &as);
 	size_t i;
-	for (i = 0; i < ac; i++) {
+	for (i = 0; i < words.len; i++) {
-	    const char *name = av[i];
+	    const char *name = words.words[i];
 	    if (Var_Export1(name, flags)) {
 		if (var_exportedVars != VAR_EXPORTED_ALL)
 		    var_exportedVars = VAR_EXPORTED_YES;
 		if (isExport && (flags & VAR_EXPORT_PARENT)) {
 		    Var_Append(MAKE_EXPORTED, name, VAR_GLOBAL);
+		}
+	    }
+	}
-	free(as);
+	Words_Free(words);
 	free(av);
+    }
     free(val);
+}
 extern char **environ;
 /*
  * This is called when .unexport[-env] is seen.
+ *
  * str must have the form "unexport[-env] varname...".
  */
 void
 @@ -713,61 +706,58 @@ Var_UnExport(const char *str)
 	    continue;
 	if (str[0] != '\0')
 	    varnames = str;
+    }
     if (varnames == NULL) {
 	/* Using .MAKE.EXPORTED */
 	varnames = varnames_freeIt = Var_Subst("${" MAKE_EXPORTED ":O:u}",
 					       VAR_GLOBAL, VARE_WANTRES);
+    }
+    {
 	Var *v;
 	char **av;
 	char *as;
 	size_t ac;
 	size_t i;
-	av = brk_string(varnames, FALSE, &ac, &as);
+	Words words = Str_Words(varnames, FALSE);
-	for (i = 0; i < ac; i++) {
+	for (i = 0; i < words.len; i++) {
-	    v = VarFind(av[i], VAR_GLOBAL, 0);
+	    const char *varname = words.words[i];
 	    v = VarFind(varname, VAR_GLOBAL, 0);
 	    if (v == NULL) {
-		VAR_DEBUG("Not unexporting \"%s\" (not found)\n", av[i]);
+		VAR_DEBUG("Not unexporting \"%s\" (not found)\n", varname);
 		continue;
+	    }
-	    VAR_DEBUG("Unexporting \"%s\"\n", av[i]);
+	    VAR_DEBUG("Unexporting \"%s\"\n", varname);
 	    if (!unexport_env && (v->flags & VAR_EXPORTED) &&
 		!(v->flags & VAR_REEXPORT))
 		unsetenv(v->name);
 	    v->flags &= ~(unsigned)(VAR_EXPORTED | VAR_REEXPORT);
 	    /*
 	     * If we are unexporting a list,
 	     * remove each one from .MAKE.EXPORTED.
 	     * If we are removing them all,
 	     * just delete .MAKE.EXPORTED below.
 	     */
 	    if (varnames == str) {
 		char *expr = str_concat3("${" MAKE_EXPORTED ":N", v->name, "}");
 		char *cp = Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES);
 		Var_Set(MAKE_EXPORTED, cp, VAR_GLOBAL);
 		free(cp);
 		free(expr);
+	    }
+	}
-	free(as);
+	Words_Free(words);
 	free(av);
 	if (varnames != str) {
 	    Var_Delete(MAKE_EXPORTED, VAR_GLOBAL);
 	    free(varnames_freeIt);
+	}
+    }
+}
 /* See Var_Set for documentation. */
 void
 Var_Set_with_flags(const char *name, const char *val, GNode *ctxt,
 		   VarSet_Flags flags)
+{
     const char *unexpanded_name = name;
 @@ -1473,76 +1463,73 @@ ModifyWord_Loop(const char *word, SepBuf
     free(s);
+}
 /*-
  * Implements the :[first..last] modifier.
  * This is a special case of ModifyWords since we want to be able
  * to scan the list backwards if first > last.
  */
 static char *
 VarSelectWords(char sep, Boolean oneBigWord, const char *str, int first,
 	       int last)
+{
-    char **av;			/* word list */
+    Words words;
     char *as;			/* word list memory */
     size_t ac;
     int start, end, step;
     int i;
     SepBuf buf;
     SepBuf_Init(&buf, sep);
     if (oneBigWord) {
-	/* fake what brk_string() would do if there were only one word */
+	/* fake what Str_Words() would do if there were only one word */
-	ac = 1;
+	words.len = 1;
-	av = bmake_malloc((ac + 1) * sizeof(char *));
+	words.words = bmake_malloc((words.len + 1) * sizeof(char *));
-	as = bmake_strdup(str);
+	words.freeIt = bmake_strdup(str);
-	av[0] = as;
+	words.words[0] = words.freeIt;
-	av[1] = NULL;
+	words.words[1] = NULL;
     } else {
-	av = brk_string(str, FALSE, &ac, &as);
+	words = Str_Words(str, FALSE);
+    }
     /*
      * Now sanitize the given range.
      * If first or last are negative, convert them to the positive equivalents
      * (-1 gets converted to ac, -2 gets converted to (ac - 1), etc.).
      */
     if (first < 0)
-	first += (int)ac + 1;
+	first += (int)words.len + 1;
     if (last < 0)
-	last += (int)ac + 1;
+	last += (int)words.len + 1;
     /*
      * We avoid scanning more of the list than we need to.
      */
     if (first > last) {
-	start = MIN((int)ac, first) - 1;
+	start = MIN((int)words.len, first) - 1;
 	end = MAX(0, last - 1);
 	step = -1;
     } else {
 	start = MAX(0, first - 1);
-	end = MIN((int)ac, last);
+	end = MIN((int)words.len, last);
 	step = 1;
+    }
     for (i = start; (step < 0) == (i >= end); i += step) {
-	SepBuf_AddStr(&buf, av[i]);
+	SepBuf_AddStr(&buf, words.words[i]);
 	SepBuf_Sep(&buf);
+    }
-    free(as);
+    Words_Free(words);
     free(av);
     return SepBuf_Destroy(&buf, FALSE);
+}
 /* Callback for ModifyWords to implement the :tA modifier.
  * Replace each word with the result of realpath() if successful. */
 static void
 ModifyWord_Realpath(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
+{
     struct stat st;
     char rbuf[MAXPATHLEN];
 @@ -1561,93 +1548,89 @@ ModifyWord_Realpath(const char *word, Se
  *	str		String whose words should be modified
  *	modifyWord	Function that modifies a single word
  *	modifyWord_args Custom arguments for modifyWord
+ *
  * Results:
  *	A string of all the words modified appropriately.
  *-----------------------------------------------------------------------
  */
 static char *
 ModifyWords(GNode *ctx, char sep, Boolean oneBigWord, const char *str,
 	    ModifyWordsCallback modifyWord, void *modifyWord_args)
+{
     SepBuf result;
-    char **av;			/* word list */
+    Words words;
     char *as;			/* word list memory */
     size_t ac;
     size_t i;
     if (oneBigWord) {
 	SepBuf_Init(&result, sep);
 	modifyWord(str, &result, modifyWord_args);
 	return SepBuf_Destroy(&result, FALSE);
+    }
     SepBuf_Init(&result, sep);
-    av = brk_string(str, FALSE, &ac, &as);
+    words = Str_Words(str, FALSE);
-    VAR_DEBUG("ModifyWords: split \"%s\" into %zu words\n", str, ac);
+    VAR_DEBUG("ModifyWords: split \"%s\" into %zu words\n", str, words.len);
-    for (i = 0; i < ac; i++) {
+    for (i = 0; i < words.len; i++) {
-	modifyWord(av[i], &result, modifyWord_args);
+	modifyWord(words.words[i], &result, modifyWord_args);
 	if (result.buf.count > 0)
 	    SepBuf_Sep(&result);
+    }
-    free(as);
+    Words_Free(words);
     free(av);
     return SepBuf_Destroy(&result, FALSE);
+}
 static char *
-WordList_JoinFree(char **av, size_t ac, char *as)
+Words_JoinFree(Words words)
+{
     Buffer buf;
     size_t i;
     Buf_Init(&buf, 0);
-    for (i = 0; i < ac; i++) {
+    for (i = 0; i < words.len; i++) {
 	if (i != 0)
 	    Buf_AddByte(&buf, ' ');	/* XXX: st->sep, for consistency */
-	Buf_AddStr(&buf, av[i]);
+	Buf_AddStr(&buf, words.words[i]);
+    }
-    free(av);
+    Words_Free(words);
     free(as);
     return Buf_Destroy(&buf, FALSE);
+}
 /* Remove adjacent duplicate words. */
 static char *
 VarUniq(const char *str)
+{
-    char *as;			/* Word list memory */
+    Words words = Str_Words(str, FALSE);
-    size_t ac;
+    size_t ac = words.len;
-    char **av = brk_string(str, FALSE, &ac, &as);
+    char **av = words.words;
     if (ac > 1) {
 	size_t 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;
+    }
-    return WordList_JoinFree(av, ac, as);
+    return Words_JoinFree(words);
+}
 /*-
  * 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.  On successful return, the parsing position pp points right
  * after the delimiter.  The delimiter is not included in the returned
  * value though.
  */
 @@ -2228,30 +2211,29 @@ ApplyModifier_Range(const char **pp, App
     if (!ModMatchEq(mod, "range", st->endc))
 	return AMR_UNKNOWN;
     if (mod[5] == '=') {
 	char *ep;
 	n = (size_t)strtoul(mod + 6, &ep, 10);
 	*pp = ep;
     } else {
 	n = 0;
 	*pp = mod + 5;
+    }
     if (n == 0) {
-	char *as;
+        Words words = Str_Words(st->val, FALSE);
-	char **av = brk_string(st->val, FALSE, &n, &as);
+        n = words.len;
-	free(as);
+        Words_Free(words);
 	free(av);
+    }
     Buf_Init(&buf, 0);
     for (i = 0; i < n; i++) {
 	if (i != 0)
 	    Buf_AddByte(&buf, ' ');	/* XXX: st->sep, for consistency */
 	Buf_AddInt(&buf, 1 + (int)i);
+    }
     st->newVal = Buf_Destroy(&buf, FALSE);
     return AMR_OK;
+}
 @@ -2619,35 +2601,31 @@ ApplyModifier_Words(const char **pp, App
     /* now *pp points just after the closing ']' */
     if (**pp != ':' && **pp != st->endc)
 	goto bad_modifier;	/* Found junk after ']' */
     if (estr[0] == '\0')
 	goto bad_modifier;	/* empty square brackets in ":[]". */
     if (estr[0] == '#' && estr[1] == '\0') { /* Found ":[#]" */
 	if (st->oneBigWord) {
 	    st->newVal = bmake_strdup("1");
 	} else {
 	    Buffer buf;
-	    /* XXX: brk_string() is a rather expensive
+	    Words words = Str_Words(st->val, FALSE);
-	     * way of counting words. */
+	    size_t ac = words.len;
-	    char *as;
+	    Words_Free(words);
 	    size_t ac;
-	    char **av = brk_string(st->val, FALSE, &ac, &as);
+	    Buf_Init(&buf, 4);	/* 3 digits + '\0' is usually enough */
 	    free(as);
 	    free(av);
 	    Buf_Init(&buf, 4);	/* 3 digits + '\0' */
 	    Buf_AddInt(&buf, (int)ac);
 	    st->newVal = Buf_Destroy(&buf, FALSE);
+	}
 	goto ok;
+    }
     if (estr[0] == '*' && estr[1] == '\0') {
 	/* Found ":[*]" */
 	st->oneBigWord = TRUE;
 	st->newVal = st->val;
 	goto ok;
+    }
 @@ -2712,65 +2690,62 @@ str_cmp_asc(const void *a, const void *b
 static int
 str_cmp_desc(const void *a, const void *b)
+{
     return strcmp(*(const char * const *)b, *(const char * const *)a);
+}
 /* :O (order ascending) or :Or (order descending) or :Ox (shuffle) */
 static ApplyModifierResult
 ApplyModifier_Order(const char **pp, ApplyModifiersState *st)
+{
     const char *mod = (*pp)++;	/* skip past the 'O' in any case */
-    char *as;			/* word list memory */
+    Words words = Str_Words(st->val, FALSE);
     size_t ac;
     char **av = brk_string(st->val, FALSE, &ac, &as);
     if (mod[1] == st->endc || mod[1] == ':') {
 	/* :O sorts ascending */
-	qsort(av, ac, sizeof(char *), str_cmp_asc);
+	qsort(words.words, words.len, sizeof(char *), str_cmp_asc);
     } else if ((mod[1] == 'r' || mod[1] == 'x') &&
 	       (mod[2] == st->endc || mod[2] == ':')) {
 	(*pp)++;
 	if (mod[1] == 'r') {
 	    /* :Or sorts descending */
-	    qsort(av, ac, sizeof(char *), str_cmp_desc);
+	    qsort(words.words, words.len, sizeof(char *), str_cmp_desc);
 	} else {
 	    /* :Ox shuffles
+	     *
 	     * We will use [ac..2] range for mod factors. This will produce
 	     * random numbers in [(ac-1)..0] interval, and minimal
 	     * reasonable value for mod factor is 2 (the mod 1 will produce
 	     * 0 with probability 1).
 	     */
 	    size_t i;
-	    for (i = ac - 1; i > 0; i--) {
+	    for (i = words.len - 1; i > 0; i--) {
 		size_t rndidx = (size_t)random() % (i + 1);
-		char *t = av[i];
+		char *t = words.words[i];
-		av[i] = av[rndidx];
+		words.words[i] = words.words[rndidx];
-		av[rndidx] = t;
+		words.words[rndidx] = t;
+	    }
+	}
     } else {
-	free(as);
+	Words_Free(words);
 	free(av);
 	return AMR_BAD;
+    }
-    st->newVal = WordList_JoinFree(av, ac, as);
+    st->newVal = Words_JoinFree(words);
     return AMR_OK;
+}
 /* :? then : else */
 static ApplyModifierResult
 ApplyModifier_IfElse(const char **pp, ApplyModifiersState *st)
+{
     char delim;
     char *then_expr, *else_expr;
     Boolean value = FALSE;
     VarEvalFlags then_eflags = st->eflags & ~(unsigned)VARE_WANTRES;
     VarEvalFlags else_eflags = st->eflags & ~(unsigned)VARE_WANTRES;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nonints.h,v 1.101 2020/08/29 12:01:46 rillig Exp $	*/
+/*	$NetBSD: nonints.h,v 1.102 2020/08/30 19:56:02 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.
 @@ -123,30 +123,42 @@ char *cached_realpath(const char *, char
 /* parse.c */
 void Parse_Error(int, const char *, ...) MAKE_ATTR_PRINTFLIKE(2, 3);
 Boolean Parse_IsVar(char *);
 void Parse_DoVar(char *, GNode *);
 void Parse_AddIncludeDir(char *);
 void Parse_File(const char *, int);
 void Parse_Init(void);
 void Parse_End(void);
 void Parse_SetInput(const char *, int, int, char *(*)(void *, size_t *), void *);
 Lst Parse_MainName(void);
 /* str.c */
 typedef struct {
     char **words;
     size_t len;
     void *freeIt;
 } Words;
 Words Str_Words(const char *, Boolean);
 static inline void MAKE_ATTR_UNUSED
 Words_Free(Words w) {
     free(w.words);
     free(w.freeIt);
+}
 char *str_concat2(const char *, const char *);
 char *str_concat3(const char *, const char *, const char *);
 char *str_concat4(const char *, const char *, const char *, const char *);
 char **brk_string(const char *, Boolean, size_t *, char **);
 char *Str_FindSubstring(const char *, const char *);
 Boolean Str_Match(const char *, const char *);
 /* suff.c */
 void Suff_ClearSuffixes(void);
 Boolean Suff_IsTransform(char *);
 GNode *Suff_AddTransform(char *);
 int Suff_EndTransform(void *, void *);
 void Suff_AddSuffix(const char *, GNode **);
 Lst Suff_GetPath(char *);
 void Suff_DoPaths(void);
 void Suff_AddInclude(char *);
 void Suff_AddLib(const char *);