 @@ -1,14 +1,14 @@
-/*	$NetBSD: arch.c,v 1.192 2020/12/30 10:03:16 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.193 2021/01/09 16:06:09 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.
 @@ -116,27 +116,27 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <ar.h>
 #include <utime.h>
 #include "make.h"
 #include "dir.h"
 #include "config.h"
 /*	"@(#)arch.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: arch.c,v 1.192 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.193 2021/01/09 16:06:09 rillig Exp $");
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
 static ArchList archives;	/* The archives we've already examined */
 typedef struct Arch {
 	char *name;		/* Name of archive */
 	HashTable members;	/* All the members of the archive described
 				 * by <name, struct ar_hdr *> key/value pairs */
 	char *fnametab;		/* Extended name table strings */
 	size_t fnamesize;	/* Size of the string table */
 } Arch;
 @@ -861,26 +861,27 @@ Arch_Touch(GNode *gn)
 	snprintf(arh.ar_date, sizeof arh.ar_date, "%-ld", (unsigned long)now);
 	(void)fwrite(&arh, sizeof arh, 1, f);
 	fclose(f);		/* TODO: handle errors */
+}
 /*
  * Given a node which represents a library, touch the thing, making sure that
  * the table of contents is also touched.
+ *
  * Both the modification time of the library and of the RANLIBMAG member are
  * set to 'now'.
  */
 /*ARGSUSED*/
 void
 Arch_TouchLib(GNode *gn MAKE_ATTR_UNUSED)
+{
 #ifdef RANLIBMAG
 	FILE *f;
 	struct ar_hdr arh;	/* Header describing table of contents */
 	struct utimbuf times;
 	f = ArchFindMember(gn->path, RANLIBMAG, &arh, "r+");
 	if (f == NULL)
 		return;
 	snprintf(arh.ar_date, sizeof arh.ar_date, "%-ld", (unsigned long)now);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cond.c,v 1.233 2020/12/30 10:03:16 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.234 2021/01/09 16:06:09 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.
 @@ -85,27 +85,27 @@
  *	Cond_restore_depth
  *			Save and restore the nesting of the conditions, at
  *			the start and end of including another makefile, to
  *			ensure that in each makefile the conditional
  *			directives are well-balanced.
  */
 #include <errno.h>
 #include "make.h"
 #include "dir.h"
 /*	"@(#)cond.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: cond.c,v 1.233 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.234 2021/01/09 16:06:09 rillig Exp $");
 /*
  * The parsing of conditional expressions is based on this grammar:
  *	E -> F || E
  *	E -> F
  *	F -> T && F
  *	F -> T
  *	T -> defined(variable)
  *	T -> make(target)
  *	T -> exists(file)
  *	T -> empty(varspec)
  *	T -> target(name)
  *	T -> commands(name)
 @@ -276,74 +276,79 @@ ParseFuncArg(const char **pp, Boolean do
 	if (func != NULL && *p++ != ')') {
 		Parse_Error(PARSE_WARNING,
 			    "Missing closing parenthesis for %s()",
 			    func);
 		/* The PARSE_FATAL follows in CondEvalExpression. */
 		return 0;
+	}
 	*pp = p;
 	return argLen;
+}
 /* Test whether the given variable is defined. */
 /*ARGSUSED*/
 static Boolean
 FuncDefined(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
+{
 	FStr value = Var_Value(arg, VAR_CMDLINE);
 	Boolean result = value.str != NULL;
 	FStr_Done(&value);
 	return result;
+}
 /* See if the given target is being made. */
 /*ARGSUSED*/
 static Boolean
 FuncMake(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
+{
 	StringListNode *ln;
 	for (ln = opts.create.first; ln != NULL; ln = ln->next)
 		if (Str_Match(ln->datum, arg))
 			return TRUE;
 	return FALSE;
+}
 /* See if the given file exists. */
 /*ARGSUSED*/
 static Boolean
 FuncExists(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
+{
 	Boolean result;
 	char *path;
 	path = Dir_FindFile(arg, &dirSearchPath);
 	DEBUG2(COND, "exists(%s) result is \"%s\"\n",
 	       arg, path != NULL ? path : "");
 	result = path != NULL;
 	free(path);
 	return result;
+}
 /* See if the given node exists and is an actual target. */
 /*ARGSUSED*/
 static Boolean
 FuncTarget(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
+{
 	GNode *gn = Targ_FindNode(arg);
 	return gn != NULL && GNode_IsTarget(gn);
+}
 /*
  * See if the given node exists and is an actual target with commands
  * associated with it.
  */
 /*ARGSUSED*/
 static Boolean
 FuncCommands(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
+{
 	GNode *gn = Targ_FindNode(arg);
 	return gn != NULL && GNode_IsTarget(gn) && !Lst_IsEmpty(&gn->commands);
+}
 /*
  * Convert the given number into a double.
  * We try a base 10 or 16 integer conversion first, if that fails
  * then we try a floating point conversion instead.
+ *
  * Results:
 @@ -687,26 +692,27 @@ CondParser_Comparison(CondParser *par, B
 	t = EvalCompare(lhs.str, lhsQuoted, op, rhs.str, rhsQuoted);
 done_rhs:
 	FStr_Done(&rhs);
 done_lhs:
 	FStr_Done(&lhs);
 	return t;
+}
 /*
  * The argument to empty() is a variable name, optionally followed by
  * variable modifiers.
  */
 /*ARGSUSED*/
 static size_t
 ParseEmptyArg(const char **pp, Boolean doEval,
 	      const char *func MAKE_ATTR_UNUSED, char **out_arg)
+{
 	FStr val;
 	size_t magic_res;
 	/* We do all the work here and return the result as the length */
 	*out_arg = NULL;
 	(*pp)--;		/* Make (*pp)[1] point to the '('. */
 	(void)Var_Parse(pp, VAR_CMDLINE, doEval ? VARE_WANTRES : VARE_NONE,
 	    &val);
 @@ -723,26 +729,27 @@ ParseEmptyArg(const char **pp, Boolean d
 	 * 4/15/92, christos
 	 */
 	cpp_skip_whitespace(&val.str);
 	/*
 	 * For consistency with the other functions we can't generate the
 	 * true/false here.
 	 */
 	magic_res = val.str[0] != '\0' ? 2 : 1;
 	FStr_Done(&val);
 	return magic_res;
+}
 /*ARGSUSED*/
 static Boolean
 FuncEmpty(size_t arglen, const char *arg MAKE_ATTR_UNUSED)
+{
 	/* Magic values ahead, see ParseEmptyArg. */
 	return arglen == 1;
+}
 static Boolean
 CondParser_Func(CondParser *par, Boolean doEval, Token *out_token)
+{
 	static const struct fn_def {
 		const char *fn_name;
 		size_t fn_name_len;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: enum.c,v 1.13 2020/12/30 10:03:16 rillig Exp $	*/
+/*	$NetBSD: enum.c,v 1.14 2021/01/09 16:06:09 rillig Exp $	*/
 /*
  Copyright (c) 2020 Roland Illig <rillig@NetBSD.org>
  All rights reserved.
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
 . Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
 @@ -19,27 +19,27 @@
  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
  */
 #include "make.h"
-MAKE_RCSID("$NetBSD: enum.c,v 1.13 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: enum.c,v 1.14 2021/01/09 16:06:09 rillig Exp $");
 /*
  * Convert a bitset into a string representation, showing the names of the
  * individual bits.
+ *
  * Optionally, shortcuts for groups of bits can be added.  To have an effect,
  * they need to be listed before their individual bits.
  */
 const char *
 Enum_FlagsToString(char *buf, size_t buf_size,
 		   int value, const EnumToStringSpec *spec)
+{
 	const char *buf_start = buf;
 @@ -78,14 +78,15 @@ Enum_FlagsToString(char *buf, size_t buf
 	buf[0] = '\0';
 	return buf_start;
+}
 /* Convert a fixed-value enum into a string representation. */
 const char *
 Enum_ValueToString(int value, const EnumToStringSpec *spec)
+{
 	for (; spec->es_name[0] != '\0'; spec++) {
 		if (value == spec->es_value)
 			return spec->es_name;
+	}
 	abort(/* unknown enum value */);
 	/*NOTREACHED*/
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: for.c,v 1.132 2020/12/31 14:10:04 rillig Exp $	*/
+/*	$NetBSD: for.c,v 1.133 2021/01/09 16:06:09 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.
 @@ -48,27 +48,27 @@
  * body is scanned for variable expressions, and those that match the variable
  * names are replaced with expressions of the form ${:U...} or $(:U...).
  * After that, the body is treated like a file from an .include directive.
+ *
  * Interface:
  *	For_Eval	Evaluate the loop in the passed line.
+ *
  *	For_Run		Run accumulated loop
  */
 #include "make.h"
 /*	"@(#)for.c	8.1 (Berkeley) 6/6/93"	*/
-MAKE_RCSID("$NetBSD: for.c,v 1.132 2020/12/31 14:10:04 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.133 2021/01/09 16:06:09 rillig Exp $");
 static int forLevel = 0;	/* Nesting level */
 /* One of the variables to the left of the "in" in a .for loop. */
 typedef struct ForVar {
 	char *name;
 	size_t nameLen;
 } ForVar;
 /*
  * State of a for loop.
  */
 typedef struct For {
 @@ -468,27 +468,27 @@ ForSubstBody(For *f)
 static char *
 ForReadMore(void *v_arg, size_t *out_len)
+{
 	For *f = v_arg;
 	if (f->sub_next == f->items.len) {
 		/* No more iterations */
 		For_Free(f);
 		return NULL;
+	}
 	ForSubstBody(f);
 	DEBUG1(FOR, "For: loop body:\n%s", f->curBody.data);
-	f->sub_next += f->vars.len;
+	f->sub_next += (unsigned int)f->vars.len;
 	*out_len = f->curBody.len;
 	return f->curBody.data;
+}
 /* Run the .for loop, imitating the actions of an include file. */
 void
 For_Run(int lineno)
+{
 	For *f = accumFor;
 	accumFor = NULL;
 	if (f->items.len == 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.c,v 1.394 2021/01/08 21:46:50 sjg Exp $	*/
+/*	$NetBSD: job.c,v 1.395 2021/01/09 16:06:09 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.
 @@ -133,27 +133,27 @@
 #ifndef USE_SELECT
 #include <poll.h>
 #endif
 #include <signal.h>
 #include <utime.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 #include "trace.h"
 /*	"@(#)job.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: job.c,v 1.394 2021/01/08 21:46:50 sjg Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.395 2021/01/09 16:06:09 rillig Exp $");
 /*
  * A shell defines how the commands are run.  All commands for a target are
  * written into a single file, which is then given to the shell to execute
  * the commands from it.  The commands are written to the file using a few
  * templates for echo control and error control.
+ *
  * The name of the shell is the basename for the predefined shells, such as
  * "sh", "csh", "bash".  For custom shells, it is the full pathname, and its
  * basename is used to select the type of shell; the longest match wins.
  * So /usr/pkg/bin/bash has type sh, /usr/local/bin/tcsh has type csh.
+ *
  * The echoing of command lines is controlled using hasEchoCtl, echoOff,
 @@ -589,36 +589,38 @@ JobCondPassSig(int signo)
 		if (job->status != JOB_ST_RUNNING)
 			continue;
 		DEBUG2(JOB, "JobCondPassSig passing signal %d to child %d.\n",
 		    signo, job->pid);
 		KILLPG(job->pid, signo);
+	}
+}
 /*
  * SIGCHLD handler.
+ *
  * Sends a token on the child exit pipe to wake us up from select()/poll().
  */
 /*ARGSUSED*/
 static void
 JobChildSig(int signo MAKE_ATTR_UNUSED)
+{
 	while (write(childExitJob.outPipe, CHILD_EXIT, 1) == -1 &&
 	       errno == EAGAIN)
 		continue;
+}
 /* Resume all stopped jobs. */
 /*ARGSUSED*/
 static void
 JobContinueSig(int signo MAKE_ATTR_UNUSED)
+{
 	/*
 	 * Defer sending SIGCONT to our stopped children until we return
 	 * from the signal handler.
 	 */
 	while (write(childExitJob.outPipe, DO_JOB_RESUME, 1) == -1 &&
 	       errno == EAGAIN)
 		continue;
+}
 /*
 @@ -2055,28 +2057,30 @@ Job_CatchOutput(void)
 		    POLL_MSEC);
 	} while (nready < 0 && errno == EINTR);
 	if (nready < 0)
 		Punt("poll: %s", strerror(errno));
 	if (nready > 0 && readyfd(&childExitJob)) {
 		char token = 0;
 		ssize_t count;
 		count = read(childExitJob.inPipe, &token, 1);
 		switch (count) {
 		case 0:
 			Punt("unexpected eof on token pipe");
 			/*NOTREACHED*/
 		case -1:
 			Punt("token pipe read: %s", strerror(errno));
 			/*NOTREACHED*/
 		case 1:
 			if (token == DO_JOB_RESUME[0])
 				/*
 				 * Complete relay requested from our SIGCONT
 				 * handler
 				 */
 				JobRestartJobs();
 			break;
 		default:
 			abort();
+		}
 		nready--;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.509 2021/01/08 21:46:50 sjg Exp $	*/
+/*	$NetBSD: main.c,v 1.510 2021/01/09 16:06:09 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.
 @@ -100,27 +100,27 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 #include "trace.h"
 /*	"@(#)main.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: main.c,v 1.509 2021/01/08 21:46:50 sjg Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.510 2021/01/09 16:06:09 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
 	    "The Regents of the University of California.  "
 	    "All rights reserved.");
 #endif
 CmdOpts opts;
 time_t now;			/* Time at start of make */
 GNode *defaultNode;		/* .DEFAULT node */
 Boolean allPrecious;		/* .PRECIOUS given on line by itself */
 Boolean deleteOnError;		/* .DELETE_ON_ERROR: set */
 static int maxJobTokens;	/* -j argument */
 @@ -1002,31 +1002,31 @@ static const char *
 InitVarMachineArch(void)
+{
 	const char *env = getenv("MACHINE_ARCH");
 	if (env != NULL)
 		return env;
 #ifdef MAKE_NATIVE
+	{
 		struct utsname utsname;
 		static char machine_arch_buf[sizeof utsname.machine];
 		const int mib[2] = { CTL_HW, HW_MACHINE_ARCH };
 		size_t len = sizeof machine_arch_buf;
-		if (sysctl(mib, __arraycount(mib), machine_arch_buf,
+		if (sysctl(mib, (unsigned int)__arraycount(mib),
-			&len, NULL, 0) < 0) {
+		    machine_arch_buf, &len, NULL, 0) < 0) {
-		    (void)fprintf(stderr, "%s: sysctl failed (%s).\n", progname,
+			(void)fprintf(stderr, "%s: sysctl failed (%s).\n",
-			strerror(errno));
+			    progname, strerror(errno));
-		    exit(2);
+			exit(2);
+		}
 		return machine_arch_buf;
+	}
 #elif defined(MACHINE_ARCH)
 	return MACHINE_ARCH;
 #elif defined(MAKE_MACHINE_ARCH)
 	return MAKE_MACHINE_ARCH;
 #else
 	return "unknown";
 #endif
+}

 @@ -1,14 +1,14 @@
-/*      $NetBSD: meta.c,v 1.166 2020/12/31 17:39:36 rillig Exp $ */
+/*      $NetBSD: meta.c,v 1.167 2021/01/09 16:06:09 rillig Exp $ */
 /*
  * Implement 'meta' mode.
  * Adapted from John Birrell's patches to FreeBSD make.
  * --sjg
  */
 /*
  * Copyright (c) 2009-2016, Juniper Networks, Inc.
  * Portions Copyright (c) 2009, John Birrell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -393,27 +393,27 @@ printCMDs(GNode *gn, FILE *fp)
+}
 /*
  * Certain node types never get a .meta file
  */
 #define SKIP_META_TYPE(_type) do { \
     if ((gn->type & __CONCAT(OP_, _type))) { \
 	if (verbose) { \
 	    debug_printf("Skipping meta for %s: .%s\n", \
 		    gn->name, __STRING(_type)); \
 	} \
 	return FALSE; \
     } \
-} while (0)
+} while (/*CONSTCOND*/0)
 /*
  * Do we need/want a .meta file ?
  */
 static Boolean
 meta_needed(GNode *gn, const char *dname,
 	    char *objdir_realpath, Boolean verbose)
+{
     struct cached_stat cst;
     if (verbose)
 	verbose = DEBUG(META);
 @@ -1684,22 +1684,22 @@ meta_compat_parent(pid_t child)
 	    /* XXX this is not line-buffered */
 	    ssize_t nread = read(outfd, buf, sizeof buf - 1);
 	    if (nread == -1)
 		err(1, "read");
 	    if (nread == 0) {
 		close(outfd);
 		outfd = -1;
 		break;
+	    }
 	    fwrite(buf, 1, (size_t)nread, stdout);
 	    fflush(stdout);
 	    buf[nread] = '\0';
 	    meta_job_output(NULL, buf, "");
-	} while (0);
+	} while (/*CONSTCOND*/0);
 	if (metafd != -1 && FD_ISSET(metafd, &readfds)) {
 	    if (meta_job_event(NULL) <= 0)
 		metafd = -1;
+	}
+    }
+}
 #endif /* USE_META */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.333 2020/12/30 10:03:16 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.334 2021/01/09 16:06:09 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.
 @@ -104,27 +104,27 @@
  *	Suff_FindDeps	Find implicit sources for and the location of
  *			a target based on its suffix. Returns the
  *			bottom-most node added to the graph or NULL
  *			if the target had no implicit sources.
+ *
  *	Suff_FindPath	Return the appropriate path to search in order to
  *			find the node.
  */
 #include "make.h"
 #include "dir.h"
 /*	"@(#)suff.c	8.4 (Berkeley) 3/21/94"	*/
-MAKE_RCSID("$NetBSD: suff.c,v 1.333 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.334 2021/01/09 16:06:09 rillig Exp $");
 typedef List SuffixList;
 typedef ListNode SuffixListNode;
 typedef List CandidateList;
 typedef ListNode CandidateListNode;
 /* The defined suffixes, such as '.c', '.o', '.l'. */
 static SuffixList sufflist = LST_INIT;
 #ifdef CLEANUP
 /* The suffixes to be cleaned up at the end. */
 static SuffixList suffClean = LST_INIT;
 #endif
 @@ -605,26 +605,27 @@ Suff_AddTransform(const char *name)
 		 * don't actually free the commands themselves, because a
 		 * given command can be attached to several different
 		 * transformations.
 		 */
 		Lst_Done(&gn->commands);
 		Lst_Init(&gn->commands);
 		Lst_Done(&gn->children);
 		Lst_Init(&gn->children);
+	}
 	gn->type = OP_TRANSFORM;
+	{
 		/* TODO: Avoid the redundant parsing here. */
 		Boolean ok = ParseTransform(name, &srcSuff, &targSuff);
 		assert(ok);
 		(void)ok;
+	}
 	/* Link the two together in the proper relationship and order. */
 	DEBUG2(SUFF, "defining transformation from `%s' to `%s'\n",
 	    srcSuff->name, targSuff->name);
 	Relate(srcSuff, targSuff);
 	return gn;
+}
 @@ -1002,26 +1003,27 @@ Candidate_New(char *name, char *prefix,
 	cand->prefix = prefix;
 	cand->suff = Suffix_Ref(suff);
 	cand->parent = parent;
 	cand->node = gn;
 	cand->numChildren = 0;
 #ifdef DEBUG_SRC
 	Lst_Init(&cand->childrenList);
 #endif
 	return cand;
+}
 /* Add a new candidate to the list. */
 /*ARGSUSED*/
 static void
 CandidateList_Add(CandidateList *list, char *srcName, Candidate *targ,
 		  Suffix *suff, const char *debug_tag)
+{
 	Candidate *cand = Candidate_New(srcName, targ->prefix, suff, targ,
 	    NULL);
 	targ->numChildren++;
 	Lst_Append(list, cand);
 #ifdef DEBUG_SRC
 	Lst_Append(&targ->childrenList, cand);
 	debug_printf("%s add suff %p:%s candidate %p:%s to list %p:",
 	    debug_tag, targ, targ->file, cand, cand->file, list);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.778 2020/12/30 10:03:16 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.779 2021/01/09 16:06:09 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.
 @@ -121,27 +121,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.778 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.779 2021/01/09 16:06:09 rillig Exp $");
 typedef enum VarFlags {
 	VAR_NONE	= 0,
 	/*
 	 * The variable's value is currently being used by Var_Parse or
 	 * Var_Subst.  This marker is used to avoid endless recursion.
 	 */
 	VAR_IN_USE = 0x01,
 	/*
 	 * The variable comes from the environment.
 	 * These variables are not registered in any GNode, therefore they
 @@ -1225,62 +1225,66 @@ SepBuf_Destroy(SepBuf *buf, Boolean free
  * and typically adds a modification of this word to the buffer. It may also
  * do nothing or add several words.
+ *
  * For example, in ${:Ua b c:M*2}, the callback is called 3 times, once for
  * each word of "a b c".
  */
 typedef void (*ModifyWordsCallback)(const char *word, SepBuf *buf, void *data);
 /*
  * Callback for ModifyWords to implement the :H modifier.
  * Add the dirname of the given word to the buffer.
  */
 /*ARGSUSED*/
 static void
 ModifyWord_Head(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
+{
 	const char *slash = strrchr(word, '/');
 	if (slash != NULL)
 		SepBuf_AddBytesBetween(buf, word, slash);
 	else
 		SepBuf_AddStr(buf, ".");
+}
 /*
  * Callback for ModifyWords to implement the :T modifier.
  * Add the basename of the given word to the buffer.
  */
 /*ARGSUSED*/
 static void
 ModifyWord_Tail(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
+{
 	SepBuf_AddStr(buf, str_basename(word));
+}
 /*
  * Callback for ModifyWords to implement the :E modifier.
  * Add the filename suffix of the given word to the buffer, if it exists.
  */
 /*ARGSUSED*/
 static void
 ModifyWord_Suffix(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
+{
 	const char *lastDot = strrchr(word, '.');
 	if (lastDot != NULL)
 		SepBuf_AddStr(buf, lastDot + 1);
+}
 /*
  * Callback for ModifyWords to implement the :R modifier.
  * Add the basename of the given word to the buffer.
  */
 /*ARGSUSED*/
 static void
 ModifyWord_Root(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
+{
 	const char *lastDot = strrchr(word, '.');
 	size_t len = lastDot != NULL ? (size_t)(lastDot - word) : strlen(word);
 	SepBuf_AddBytes(buf, word, len);
+}
 /*
  * Callback for ModifyWords to implement the :M modifier.
  * Place the word in the buffer if it matches the given pattern.
  */
 static void
 @@ -1680,26 +1684,27 @@ VarSelectWords(char sep, Boolean oneBigW
 		SepBuf_Sep(&buf);
+	}
 	Words_Free(words);
 	return SepBuf_Destroy(&buf, FALSE);
+}
 /*
  * Callback for ModifyWords to implement the :tA modifier.
  * Replace each word with the result of realpath() if successful.
  */
 /*ARGSUSED*/
 static void
 ModifyWord_Realpath(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
+{
 	struct stat st;
 	char rbuf[MAXPATHLEN];
 	const char *rp = cached_realpath(word, rbuf);
 	if (rp != NULL && *rp == '/' && stat(rp, &st) == 0)
 		word = rp;
 	SepBuf_AddStr(buf, word);
+}
 @@ -2779,26 +2784,27 @@ ApplyModifier_Regex(const char **pp, con
 /* :Q, :q */
 static ApplyModifierResult
 ApplyModifier_Quote(const char **pp, const char *val, ApplyModifiersState *st)
+{
 	if ((*pp)[1] == st->endc || (*pp)[1] == ':') {
 		st->newVal = FStr_InitOwn(VarQuote(val, **pp == 'q'));
 		(*pp)++;
 		return AMR_OK;
 	} else
 		return AMR_UNKNOWN;
+}
 /*ARGSUSED*/
 static void
 ModifyWord_Copy(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
+{
 	SepBuf_AddStr(buf, word);
+}
 /* :ts<separator> */
 static ApplyModifierResult
 ApplyModifier_ToSep(const char **pp, const char *val, ApplyModifiersState *st)
+{
 	const char *sep = *pp + 2;
 	/* ":ts<any><endc>" or ":ts<any>:" */
 @@ -3095,27 +3101,27 @@ ApplyModifier_Order(const char **pp, con
 		} else
 			ShuffleStrings(words.words, words.len);
 	} else {
 		Words_Free(words);
 		return AMR_BAD;
+	}
 	st->newVal = FStr_InitOwn(Words_JoinFree(words));
 	return AMR_OK;
+}
 /* :? then : else */
 static ApplyModifierResult
-ApplyModifier_IfElse(const char **pp, const char *val, ApplyModifiersState *st)
+ApplyModifier_IfElse(const char **pp, ApplyModifiersState *st)
+{
 	char *then_expr, *else_expr;
 	VarParseResult res;
 	Boolean value = FALSE;
 	VarEvalFlags then_eflags = VARE_NONE;
 	VarEvalFlags else_eflags = VARE_NONE;
 	int cond_rc = COND_PARSE;	/* anything other than COND_INVALID */
 	if (st->eflags & VARE_WANTRES) {
 		cond_rc = Cond_EvalCondition(st->var->name.str, &value);
 		if (cond_rc != COND_INVALID && value)
 			then_eflags = st->eflags;
 @@ -3451,27 +3457,27 @@ ApplyModifier(const char **pp, const cha
 		return ApplyModifier_Gmtime(pp, val, st);
 	case 'h':
 		return ApplyModifier_Hash(pp, val, st);
 	case 'l':
 		return ApplyModifier_Localtime(pp, val, st);
 	case 't':
 		return ApplyModifier_To(pp, val, st);
 	case 'N':
 	case 'M':
 		return ApplyModifier_Match(pp, val, st);
 	case 'S':
 		return ApplyModifier_Subst(pp, val, st);
 	case '?':
-		return ApplyModifier_IfElse(pp, val, st);
+		return ApplyModifier_IfElse(pp, st);
 #ifndef NO_REGEX
 	case 'C':
 		return ApplyModifier_Regex(pp, val, st);
 #endif
 	case 'q':
 	case 'Q':
 		return ApplyModifier_Quote(pp, val, st);
 	case 'T':
 		return ApplyModifier_WordFunc(pp, val, st, ModifyWord_Tail);
 	case 'H':
 		return ApplyModifier_WordFunc(pp, val, st, ModifyWord_Head);
 	case 'E':
 		return ApplyModifier_WordFunc(pp, val, st, ModifyWord_Suffix);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: filemon_ktrace.c,v 1.9 2020/12/31 17:39:36 rillig Exp $	*/
+/*	$NetBSD: filemon_ktrace.c,v 1.10 2021/01/09 16:06:09 rillig Exp $	*/
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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.
 @@ -120,43 +120,45 @@ struct filemon_state {
 	struct filemon_key {
 		pid_t		pid;
 		lwpid_t		lid;
 	}		key;
 	struct rb_node	node;
 	int		syscode;
 	void		(*show)(struct filemon *, const struct filemon_state *,
 			    const struct ktr_sysret *);
 	unsigned	i;
 	unsigned	npath;
 	char		*path[/*npath*/];
 };
 /*ARGSUSED*/
 static int
 compare_filemon_states(void *cookie, const void *na, const void *nb)
+{
 	const struct filemon_state *Sa = na;
 	const struct filemon_state *Sb = nb;
 	if (Sa->key.pid < Sb->key.pid)
 		return -1;
 	if (Sa->key.pid > Sb->key.pid)
 		return +1;
 	if (Sa->key.lid < Sb->key.lid)
 		return -1;
 	if (Sa->key.lid > Sb->key.lid)
 		return +1;
 	return 0;
+}
 /*ARGSUSED*/
 static int
 compare_filemon_key(void *cookie, const void *n, const void *k)
+{
 	const struct filemon_state *S = n;
 	const struct filemon_key *key = k;
 	if (S->key.pid < key->pid)
 		return -1;
 	if (S->key.pid > key->pid)
 		return +1;
 	if (S->key.lid < key->lid)
 		return -1;
 	if (S->key.lid > key->lid)
 @@ -571,27 +573,27 @@ top:	/* If the child has exited, nothing
 		goto top;
 	default:		/* paranoia */
 		F->state = FILEMON_ERROR;
 		/*FALLTHROUGH*/
 	case FILEMON_ERROR:	/* persistent error indicator */
 		F->p = NULL;
 		F->resid = 0;
 		errno = EIO;
 		return -1;
+	}
+}
 static struct filemon_state *
-syscall_enter(struct filemon *F,
+syscall_enter(
     const struct filemon_key *key, const struct ktr_syscall *call,
     unsigned npath,
     void (*show)(struct filemon *, const struct filemon_state *,
 	const struct ktr_sysret *))
+{
 	struct filemon_state *S;
 	unsigned i;
 	S = calloc(1, offsetof(struct filemon_state, path[npath]));
 	if (S == NULL)
 		return NULL;
 	S->key = *key;
 	S->show = show;
 @@ -653,27 +655,27 @@ show_retval(struct filemon *F, const str
+}
 static void
 show_chdir(struct filemon *F, const struct filemon_state *S,
     const struct ktr_sysret *ret)
+{
 	show_paths(F, S, ret, "C");
+}
 static void
 show_execve(struct filemon *F, const struct filemon_state *S,
     const struct ktr_sysret *ret)
+{
-	return show_paths(F, S, ret, "E");
+	show_paths(F, S, ret, "E");
+}
 static void
 show_fork(struct filemon *F, const struct filemon_state *S,
     const struct ktr_sysret *ret)
+{
 	show_retval(F, S, ret, "F");
+}
 static void
 show_link(struct filemon *F, const struct filemon_state *S,
     const struct ktr_sysret *ret)
+{
 @@ -741,137 +743,143 @@ static void
 show_unlink(struct filemon *F, const struct filemon_state *S,
     const struct ktr_sysret *ret)
+{
 	show_paths(F, S, ret, "D");
+}
 static void
 show_rename(struct filemon *F, const struct filemon_state *S,
     const struct ktr_sysret *ret)
+{
 	show_paths(F, S, ret, "M");
+}
 /*ARGSUSED*/
 static struct filemon_state *
 filemon_sys_chdir(struct filemon *F, const struct filemon_key *key,
     const struct ktr_syscall *call)
+{
-	return syscall_enter(F, key, call, 1, &show_chdir);
+	return syscall_enter(key, call, 1, &show_chdir);
+}
 /*ARGSUSED*/
 static struct filemon_state *
 filemon_sys_execve(struct filemon *F, const struct filemon_key *key,
     const struct ktr_syscall *call)
+{
-	return syscall_enter(F, key, call, 1, &show_execve);
+	return syscall_enter(key, call, 1, &show_execve);
+}
 static struct filemon_state *
 filemon_sys_exit(struct filemon *F, const struct filemon_key *key,
     const struct ktr_syscall *call)
+{
 	const register_t *args = (const void *)&call[1];
 	int status = (int)args[0];
 	if (F->out != NULL) {
 		fprintf(F->out, "X %jd %d\n", (intmax_t)key->pid, status);
 		if (key->pid == F->child) {
 			fprintf(F->out, "# Bye bye\n");
 			F->child = 0;
+		}
+	}
 	return NULL;
+}
 /*ARGSUSED*/
 static struct filemon_state *
 filemon_sys_fork(struct filemon *F, const struct filemon_key *key,
     const struct ktr_syscall *call)
+{
-	return syscall_enter(F, key, call, 0, &show_fork);
+	return syscall_enter(key, call, 0, &show_fork);
+}
 /*ARGSUSED*/
 static struct filemon_state *
 filemon_sys_link(struct filemon *F, const struct filemon_key *key,
     const struct ktr_syscall *call)
+{
-	return syscall_enter(F, key, call, 2, &show_link);
+	return syscall_enter(key, call, 2, &show_link);
+}
 /*ARGSUSED*/
 static struct filemon_state *
 filemon_sys_open(struct filemon *F, const struct filemon_key *key,
     const struct ktr_syscall *call)
+{
 	const register_t *args = (const void *)&call[1];
 	int flags;
 	if (call->ktr_argsize < 2)
 		return NULL;
 	flags = (int)args[1];
 	if ((flags & O_RDWR) == O_RDWR)
-		return syscall_enter(F, key, call, 1, &show_open_readwrite);
+		return syscall_enter(key, call, 1, &show_open_readwrite);
 	else if ((flags & O_WRONLY) == O_WRONLY)
-		return syscall_enter(F, key, call, 1, &show_open_write);
+		return syscall_enter(key, call, 1, &show_open_write);
 	else if ((flags & O_RDONLY) == O_RDONLY)
-		return syscall_enter(F, key, call, 1, &show_open_read);
+		return syscall_enter(key, call, 1, &show_open_read);
 	else
 		return NULL;	/* XXX Do we care if no read or write?  */
+}
 /*ARGSUSED*/
 static struct filemon_state *
 filemon_sys_openat(struct filemon *F, const struct filemon_key *key,
     const struct ktr_syscall *call)
+{
 	const register_t *args = (const void *)&call[1];
 	int flags, fd;
 	if (call->ktr_argsize < 3)
 		return NULL;
 	fd = (int)args[0];
 	flags = (int)args[2];
 	if (fd == AT_CWD) {
 		if ((flags & O_RDWR) == O_RDWR)
-			return syscall_enter(F, key, call, 1,
+			return syscall_enter(key, call, 1,
 			    &show_open_readwrite);
 		else if ((flags & O_WRONLY) == O_WRONLY)
-			return syscall_enter(F, key, call, 1,
+			return syscall_enter(key, call, 1, &show_open_write);
 			    &show_open_write);
 		else if ((flags & O_RDONLY) == O_RDONLY)
-			return syscall_enter(F, key, call, 1, &show_open_read);
+			return syscall_enter(key, call, 1, &show_open_read);
 		else
 			return NULL;
 	} else {
 		if ((flags & O_RDWR) == O_RDWR)
-			return syscall_enter(F, key, call, 1,
+			return syscall_enter(key, call, 1,
 			    &show_openat_readwrite);
 		else if ((flags & O_WRONLY) == O_WRONLY)
-			return syscall_enter(F, key, call, 1,
+			return syscall_enter(key, call, 1, &show_openat_write);
 			    &show_openat_write);
 		else if ((flags & O_RDONLY) == O_RDONLY)
-			return syscall_enter(F, key, call, 1,
+			return syscall_enter(key, call, 1, &show_openat_read);
 			    &show_openat_read);
 		else
 			return NULL;
+	}
+}
 /*ARGSUSED*/
 static struct filemon_state *
 filemon_sys_symlink(struct filemon *F, const struct filemon_key *key,
     const struct ktr_syscall *call)
+{
-	return syscall_enter(F, key, call, 2, &show_symlink);
+	return syscall_enter(key, call, 2, &show_symlink);
+}
 /*ARGSUSED*/
 static struct filemon_state *
 filemon_sys_unlink(struct filemon *F, const struct filemon_key *key,
     const struct ktr_syscall *call)
+{
-	return syscall_enter(F, key, call, 1, &show_unlink);
+	return syscall_enter(key, call, 1, &show_unlink);
+}
 /*ARGSUSED*/
 static struct filemon_state *
 filemon_sys_rename(struct filemon *F, const struct filemon_key *key,
     const struct ktr_syscall *call)
+{
-	return syscall_enter(F, key, call, 2, &show_rename);
+	return syscall_enter(key, call, 2, &show_rename);
+}