 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat.c,v 1.229 2021/11/28 23:12:51 rillig Exp $	*/
+/*	$NetBSD: compat.c,v 1.230 2021/12/15 10:04:49 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.
 @@ -86,27 +86,27 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <errno.h>
 #include <signal.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 #include "pathnames.h"
 /*	"@(#)compat.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: compat.c,v 1.229 2021/11/28 23:12:51 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.230 2021/12/15 10:04:49 rillig Exp $");
 static GNode *curTarg = NULL;
 static pid_t compatChild;
 static int compatSigno;
 /*
  * CompatDeleteTarget -- delete the file of a failed, interrupted, or
  * otherwise duffed target if not inhibited by .PRECIOUS.
  */
 static void
 CompatDeleteTarget(GNode *gn)
+{
 	if (gn != NULL && !Targ_Precious(gn)) {
 @@ -207,122 +207,122 @@ UseShell(const char *cmd MAKE_ATTR_UNUSE
 #endif
+}
 /*
  * Execute the next command for a target. If the command returns an error,
  * the node's made field is set to ERROR and creation stops.
+ *
  * Input:
  *	cmdp		Command to execute
  *	gn		Node from which the command came
  *	ln		List node that contains the command
+ *
  * Results:
- *	0 if the command succeeded, 1 if an error occurred.
+ *	true if the command succeeded.
  */
-int
+bool
 Compat_RunCommand(const char *cmdp, GNode *gn, StringListNode *ln)
+{
 	char *cmdStart;		/* Start of expanded command */
 	char *bp;
 	bool silent;		/* Don't print command */
 	bool doIt;		/* Execute even if -n */
 	volatile bool errCheck; /* Check errors */
 	int reason;		/* Reason for child's death */
 	int status;		/* Description of child's death */
 	pid_t cpid;		/* Child actually found */
 	pid_t retstat;		/* Result of wait */
 	const char **volatile av; /* Argument vector for thing to exec */
 	char **volatile mav;	/* Copy of the argument vector for freeing */
 	bool useShell;		/* True if command should be executed
 				 * using a shell */
 	const char *volatile cmd = cmdp;
 	silent = (gn->type & OP_SILENT) != OP_NONE;
 	errCheck = !(gn->type & OP_IGNORE);
 	doIt = false;
 	(void)Var_Subst(cmd, gn, VARE_WANTRES, &cmdStart);
 	/* TODO: handle errors */
 	if (cmdStart[0] == '\0') {
 		free(cmdStart);
-		return 0;
+		return true;
+	}
 	cmd = cmdStart;
 	LstNode_Set(ln, cmdStart);
 	if (gn->type & OP_SAVE_CMDS) {
 		GNode *endNode = Targ_GetEndNode();
 		if (gn != endNode) {
 			/*
 			 * Append the expanded command, to prevent the
 			 * local variables from being interpreted in the
 			 * scope of the .END node.
+			 *
 			 * A probably unintended side effect of this is that
 			 * the expanded command will be expanded again in the
 			 * .END node.  Therefore, a literal '$' in these
 			 * commands must be written as '$$$$' instead of the
 			 * usual '$$'.
 			 */
 			Lst_Append(&endNode->commands, cmdStart);
-			return 0;
+			return true;
+		}
+	}
 	if (strcmp(cmdStart, "...") == 0) {
 		gn->type |= OP_SAVE_CMDS;
-		return 0;
+		return true;
+	}
 	for (;;) {
 		if (*cmd == '@')
 			silent = !DEBUG(LOUD);
 		else if (*cmd == '-')
 			errCheck = false;
 		else if (*cmd == '+') {
 			doIt = true;
 			if (shellName == NULL)	/* we came here from jobs */
 				Shell_Init();
 		} else
 			break;
 		cmd++;
+	}
 	while (ch_isspace(*cmd))
 		cmd++;
 	/*
 	 * If we did not end up with a command, just skip it.
 	 */
 	if (cmd[0] == '\0')
-		return 0;
+		return true;
 	useShell = UseShell(cmd);
 	/*
 	 * Print the command before echoing if we're not supposed to be quiet
 	 * for this one. We also print the command if -n given.
 	 */
 	if (!silent || !GNode_ShouldExecute(gn)) {
 		printf("%s\n", cmd);
 		fflush(stdout);
+	}
 	/*
 	 * If we're not supposed to execute any commands, this is as far as
 	 * we go...
 	 */
 	if (!doIt && !GNode_ShouldExecute(gn))
-		return 0;
+		return true;
 	DEBUG1(JOB, "Execute: '%s'\n", cmd);
 	if (useShell) {
 		/*
 		 * We need to pass the command off to the shell, typically
 		 * because the command contains a "meta" character.
 		 */
 		static const char *shargv[5];
 		/* The following work for any of the builtin shell specs. */
 		int shargc = 0;
 		shargv[shargc++] = shellPath;
 @@ -444,37 +444,37 @@ Compat_RunCommand(const char *cmdp, GNod
 			 */
 			printf(" (ignored)\n");
 			status = 0;
+		}
+	}
 	free(cmdStart);
 	compatChild = 0;
 	if (compatSigno != 0) {
 		bmake_signal(compatSigno, SIG_DFL);
 		kill(myPid, compatSigno);
+	}
-	return status;
+	return status == 0;
+}
 static void
 RunCommands(GNode *gn)
+{
 	StringListNode *ln;
 	for (ln = gn->commands.first; ln != NULL; ln = ln->next) {
 		const char *cmd = ln->datum;
-		if (Compat_RunCommand(cmd, gn, ln) != 0)
+		if (!Compat_RunCommand(cmd, gn, ln))
 			break;
+	}
+}
 static void
 MakeNodes(GNodeList *gnodes, GNode *pgn)
+{
 	GNodeListNode *ln;
 	for (ln = gnodes->first; ln != NULL; ln = ln->next) {
 		GNode *cohort = ln->datum;
 		Compat_Make(cohort, pgn);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.c,v 1.440 2021/11/28 19:51:06 rillig Exp $	*/
+/*	$NetBSD: job.c,v 1.441 2021/12/15 10:04:49 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.
 @@ -132,27 +132,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.440 2021/11/28 19:51:06 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.441 2021/12/15 10:04:49 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,
 @@ -901,41 +901,41 @@ static void
 JobWriteCommand(Job *job, ShellWriter *wr, StringListNode *ln, const char *ucmd)
+{
 	bool run;
 	CommandFlags cmdFlags;
 	/* Template for writing a command to the shell file */
 	const char *cmdTemplate;
 	char *xcmd;		/* The expanded command */
 	char *xcmdStart;
 	char *escCmd;		/* xcmd escaped to be used in double quotes */
 	run = GNode_ShouldExecute(job->node);
-	Var_Subst(ucmd, job->node, VARE_WANTRES, &xcmd);
+	(void)Var_Subst(ucmd, job->node, VARE_WANTRES, &xcmd);
 	/* TODO: handle errors */
 	xcmdStart = xcmd;
 	cmdTemplate = "%s\n";
 	ParseCommandFlags(&xcmd, &cmdFlags);
 	/* The '+' command flag overrides the -n or -N options. */
 	if (cmdFlags.always && !run) {
 		/*
 		 * We're not actually executing anything...
 		 * but this one needs to be - use compat mode just for it.
 		 */
-		Compat_RunCommand(ucmd, job->node, ln);
+		(void)Compat_RunCommand(ucmd, job->node, ln);
 		free(xcmdStart);
 		return;
+	}
 	/*
 	 * If the shell doesn't have error control, the alternate echoing
 	 * will be done (to avoid showing additional error checking code)
 	 * and this needs some characters escaped.
 	 */
 	escCmd = shell->hasErrCtl ? NULL : EscapeShellDblQuot(xcmd);
 	if (!cmdFlags.echo) {
 		if (job->echo && run && shell->hasEchoCtl) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nonints.h,v 1.219 2021/12/15 09:53:41 rillig Exp $	*/
+/*	$NetBSD: nonints.h,v 1.220 2021/12/15 10:04:49 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.
 @@ -76,27 +76,27 @@
 void Arch_Init(void);
 void Arch_End(void);
 bool Arch_ParseArchive(char **, GNodeList *, GNode *);
 void Arch_Touch(GNode *);
 void Arch_TouchLib(GNode *);
 void Arch_UpdateMTime(GNode *gn);
 void Arch_UpdateMemberMTime(GNode *gn);
 void Arch_FindLib(GNode *, SearchPath *);
 bool Arch_LibOODate(GNode *) MAKE_ATTR_USE;
 bool Arch_IsLib(GNode *) MAKE_ATTR_USE;
 /* compat.c */
-int Compat_RunCommand(const char *, GNode *, StringListNode *);
+bool Compat_RunCommand(const char *, GNode *, StringListNode *);
 void Compat_Run(GNodeList *);
 void Compat_Make(GNode *, GNode *);
 /* cond.c */
 CondEvalResult Cond_EvalCondition(const char *, bool *) MAKE_ATTR_USE;
 CondEvalResult Cond_EvalLine(const char *) MAKE_ATTR_USE;
 void Cond_restore_depth(unsigned int);
 unsigned int Cond_save_depth(void) MAKE_ATTR_USE;
 /* dir.c; see also dir.h */
 MAKE_INLINE const char * MAKE_ATTR_USE
 str_basename(const char *pathname)