 @@ -1,706 +1,706 @@
-/*	$NetBSD: compat.c,v 1.172 2020/10/31 18:20:00 rillig Exp $	*/
+/*	$NetBSD: compat.c,v 1.173 2020/11/01 17:47:26 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.
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
  */
 /*
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * 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.
  * 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
  */
 /*-
  * 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:
  *	Compat_Run	Initialize things for this module and recreate
  *			thems as need creatin'
  */
 #include <sys/types.h>
 #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.172 2020/10/31 18:20:00 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.173 2020/11/01 17:47:26 rillig Exp $");
 static GNode *curTarg = NULL;
 static pid_t compatChild;
 static int compatSigno;
 /*
  * CompatDeleteTarget -- delete a failed, interrupted, or otherwise
  * duffed target if not inhibited by .PRECIOUS.
  */
 static void
 CompatDeleteTarget(GNode *gn)
+{
     if (gn != NULL && !Targ_Precious(gn)) {
 	const char *file = GNode_VarTarget(gn);
 	if (!opts.noExecute && eunlink(file) != -1) {
 	    Error("*** %s removed", file);
+	}
+    }
+}
 /* Interrupt the creation of the current target and remove it if it ain't
  * precious. Then exit.
+ *
  * If .INTERRUPT exists, its commands are run first WITH INTERRUPTS IGNORED.
+ *
  * XXX: is .PRECIOUS supposed to inhibit .INTERRUPT? I doubt it, but I've
  * left the logic alone for now. - dholland 20160826
  */
 static void
 CompatInterrupt(int signo)
+{
     GNode   *gn;
     CompatDeleteTarget(curTarg);
     if (curTarg != NULL && !Targ_Precious(curTarg)) {
 	/*
 	 * Run .INTERRUPT only if hit with interrupt signal
 	 */
 	if (signo == SIGINT) {
 	    gn = Targ_FindNode(".INTERRUPT");
 	    if (gn != NULL) {
 		Compat_Make(gn, gn);
+	    }
+	}
+    }
     if (signo == SIGQUIT)
 	_exit(signo);
     /*
      * If there is a child running, pass the signal on.
      * We will exist after it has exited.
      */
     compatSigno = signo;
     if (compatChild > 0) {
 	KILLPG(compatChild, signo);
     } else {
 	bmake_signal(signo, SIG_DFL);
 	kill(myPid, signo);
+    }
+}
 /* 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
  *	gnp		Node from which the command came
+ *
  * Results:
  *	0 if the command succeeded, 1 if an error occurred.
  */
 int
 Compat_RunCommand(const char *cmdp, GNode *gn)
+{
     char *cmdStart;		/* Start of expanded command */
     char *bp;
     Boolean silent;		/* Don't print command */
     Boolean doIt;		/* Execute even if -n */
     volatile Boolean 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 */
     StringListNode *cmdNode;	/* Node where current command is located */
     const char **volatile av;	/* Argument vector for thing to exec */
     char **volatile mav;	/* Copy of the argument vector for freeing */
     Boolean useShell;		/* TRUE if command should be executed
 				 * using a shell */
     const char *volatile cmd = cmdp;
     silent = (gn->type & OP_SILENT) != 0;
     errCheck = !(gn->type & OP_IGNORE);
     doIt = FALSE;
     /* Luckily the commands don't end up in a string pool, otherwise
      * this comparison could match too early, in a dependency using "..."
      * for delayed commands, run in parallel mode, using the same shell
      * command line more than once; see JobPrintCommand.
      * TODO: write a unit-test to protect against this potential bug. */
     cmdNode = Lst_FindDatum(gn->commands, cmd);
     (void)Var_Subst(cmd, gn, VARE_WANTRES, &cmdStart);
     /* TODO: handle errors */
     if (*cmdStart == '\0') {
 	free(cmdStart);
 	return 0;
+    }
     cmd = cmdStart;
     LstNode_Set(cmdNode, cmdStart);
     if (gn->type & OP_SAVE_CMDS) {
 	GNode *endNode = Targ_GetEndNode();
 	if (gn != endNode) {
 	    Lst_Append(endNode->commands, cmdStart);
 	    return 0;
+	}
+    }
     if (strcmp(cmdStart, "...") == 0) {
 	gn->type |= OP_SAVE_CMDS;
 	return 0;
+    }
     while (*cmd == '@' || *cmd == '-' || *cmd == '+') {
 	switch (*cmd) {
 	case '@':
 	    silent = !DEBUG(LOUD);
 	    break;
 	case '-':
 	    errCheck = FALSE;
 	    break;
 	case '+':
 	    doIt = TRUE;
 	    if (!shellName)		/* we came here from jobs */
 		Shell_Init();
 	    break;
+	}
 	cmd++;
+    }
     while (ch_isspace(*cmd))
 	cmd++;
     /*
      * If we did not end up with a command, just skip it.
      */
     if (!*cmd)
 	return 0;
 #if !defined(MAKE_NATIVE)
     /*
      * In a non-native build, the host environment might be weird enough
      * that it's necessary to go through a shell to get the correct
      * behaviour.  Or perhaps the shell has been replaced with something
      * that does extra logging, and that should not be bypassed.
      */
     useShell = TRUE;
 #else
     /*
      * Search for meta characters in the command. If there are no meta
      * characters, there's no need to execute a shell to execute the
      * command.
+     *
      * Additionally variable assignments and empty commands
      * go to the shell. Therefore treat '=' and ':' like shell
      * meta characters as documented in make(1).
      */
     useShell = needshell(cmd);
 #endif
     /*
      * 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 || NoExecute(gn)) {
+    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 && NoExecute(gn)) {
+    if (!doIt && !GNode_ShouldExecute(gn)) {
 	return 0;
+    }
     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];
 	int shargc;
 	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;
 	av = shargv;
 	bp = NULL;
 	mav = NULL;
     } else {
 	/*
 	 * No meta-characters, so no need to exec a shell. Break the command
 	 * into words to form an argument vector we can execute.
 	 */
 	Words words = Str_Words(cmd, FALSE);
 	mav = words.words;
 	bp = words.freeIt;
 	av = (void *)mav;
+    }
 #ifdef USE_META
     if (useMeta) {
 	meta_compat_start();
+    }
 #endif
     /*
      * Fork and execute the single command. If the fork fails, we abort.
      */
     compatChild = cpid = vFork();
     if (cpid < 0) {
 	Fatal("Could not fork");
+    }
     if (cpid == 0) {
 	Var_ExportVars();
 #ifdef USE_META
 	if (useMeta) {
 	    meta_compat_child();
+	}
 #endif
 	(void)execvp(av[0], (char *const *)UNCONST(av));
 	execDie("exec", av[0]);
+    }
     free(mav);
     free(bp);
     /* XXX: Memory management looks suspicious here. */
     /* XXX: Setting a list item to NULL is unexpected. */
     LstNode_SetNull(cmdNode);
 #ifdef USE_META
     if (useMeta) {
 	meta_compat_parent(cpid);
+    }
 #endif
     /*
      * The child is off and running. Now all we can do is wait...
      */
     while ((retstat = wait(&reason)) != cpid) {
 	if (retstat > 0)
 	    JobReapChild(retstat, reason, FALSE); /* not ours? */
 	if (retstat == -1 && errno != EINTR) {
 	    break;
+	}
+    }
     if (retstat < 0)
 	Fatal("error in wait: %d: %s", retstat, strerror(errno));
     if (WIFSTOPPED(reason)) {
 	status = WSTOPSIG(reason);		/* stopped */
     } else if (WIFEXITED(reason)) {
 	status = WEXITSTATUS(reason);		/* exited */
 #if defined(USE_META) && defined(USE_FILEMON_ONCE)
 	if (useMeta) {
 	    meta_cmd_finish(NULL);
+	}
 #endif
 	if (status != 0) {
 	    if (DEBUG(ERROR)) {
 		const char *cp;
 		debug_printf("\n*** Failed target:  %s\n*** Failed command: ",
 			     gn->name);
 		for (cp = cmd; *cp; ) {
 		    if (ch_isspace(*cp)) {
 			debug_printf(" ");
 			while (ch_isspace(*cp))
 			    cp++;
 		    } else {
 			debug_printf("%c", *cp);
 			cp++;
+		    }
+		}
 		debug_printf("\n");
+	    }
 	    printf("*** Error code %d", status);
+	}
     } else {
 	status = WTERMSIG(reason);		/* signaled */
 	printf("*** Signal %d", status);
+    }
     if (!WIFEXITED(reason) || status != 0) {
 	if (errCheck) {
 #ifdef USE_META
 	    if (useMeta) {
 		meta_job_error(NULL, gn, 0, status);
+	    }
 #endif
 	    gn->made = ERROR;
 	    if (opts.keepgoing) {
 		/* Abort the current target, but let others continue. */
 		printf(" (continuing)\n");
 	    } else {
 		printf("\n");
+	    }
 	    if (deleteOnError)
 		CompatDeleteTarget(gn);
 	} else {
 	    /*
 	     * Continue executing commands for this target.
 	     * If we return 0, this will happen...
 	     */
 	    printf(" (ignored)\n");
 	    status = 0;
+	}
+    }
     free(cmdStart);
     compatChild = 0;
     if (compatSigno) {
 	bmake_signal(compatSigno, SIG_DFL);
 	kill(myPid, compatSigno);
+    }
     return status;
+}
 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) != 0)
 	    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);
+    }
+}
 /* Make a target.
+ *
  * If an error is detected and not being ignored, the process exits.
+ *
  * Input:
  *	gn		The node to make
  *	pgn		Parent to abort if necessary
  */
 void
 Compat_Make(GNode *gn, GNode *pgn)
+{
     if (!shellName)		/* we came here from jobs */
 	Shell_Init();
     if (gn->made == UNMADE && (gn == pgn || !(pgn->type & OP_MADE))) {
 	/*
 	 * First mark ourselves to be made, then apply whatever transformations
 	 * the suffix module thinks are necessary. Once that's done, we can
 	 * descend and make all our children. If any of them has an error
 	 * but the -k flag was given, our 'make' field will be set FALSE again.
 	 * This is our signal to not attempt to do anything but abort our
 	 * parent as well.
 	 */
 	gn->flags |= REMAKE;
 	gn->made = BEINGMADE;
 	if (!(gn->type & OP_MADE))
 	    Suff_FindDeps(gn);
 	MakeNodes(gn->children, gn);
 	if (!(gn->flags & REMAKE)) {
 	    gn->made = ABORTED;
 	    pgn->flags &= ~(unsigned)REMAKE;
 	    goto cohorts;
+	}
 	if (Lst_FindDatum(gn->implicitParents, pgn) != NULL)
 	    Var_Set(IMPSRC, GNode_VarTarget(gn), pgn);
 	/*
 	 * All the children were made ok. Now youngestChild->mtime contains the
 	 * modification time of the newest child, we need to find out if we
 	 * exist and when we were modified last. The criteria for datedness
 	 * are defined by the Make_OODate function.
 	 */
 	DEBUG1(MAKE, "Examining %s...", gn->name);
 	if (!Make_OODate(gn)) {
 	    gn->made = UPTODATE;
 	    DEBUG0(MAKE, "up-to-date.\n");
 	    goto cohorts;
 	} else
 	    DEBUG0(MAKE, "out-of-date.\n");
 	/*
 	 * If the user is just seeing if something is out-of-date, exit now
 	 * to tell him/her "yes".
 	 */
 	if (opts.queryFlag) {
 	    exit(1);
+	}
 	/*
 	 * We need to be re-made. We also have to make sure we've got a $?
 	 * variable. To be nice, we also define the $> variable using
 	 * Make_DoAllVar().
 	 */
 	Make_DoAllVar(gn);
 	/*
 	 * Alter our type to tell if errors should be ignored or things
 	 * should not be printed so CompatRunCommand knows what to do.
 	 */
 	if (Targ_Ignore(gn))
 	    gn->type |= OP_IGNORE;
 	if (Targ_Silent(gn))
 	    gn->type |= OP_SILENT;
 	if (Job_CheckCommands(gn, Fatal)) {
 	    /*
 	     * Our commands are ok, but we still have to worry about the -t
 	     * flag...
 	     */
 	    if (!opts.touchFlag || (gn->type & OP_MAKE)) {
 		curTarg = gn;
 #ifdef USE_META
-		if (useMeta && !NoExecute(gn)) {
+		if (useMeta && GNode_ShouldExecute(gn)) {
 		    meta_job_start(NULL, gn);
+		}
 #endif
 		RunCommands(gn);
 		curTarg = NULL;
 	    } else {
 		Job_Touch(gn, (gn->type & OP_SILENT) != 0);
+	    }
 	} else {
 	    gn->made = ERROR;
+	}
 #ifdef USE_META
-	if (useMeta && !NoExecute(gn)) {
+	if (useMeta && GNode_ShouldExecute(gn)) {
 	    if (meta_job_finish(NULL) != 0)
 		gn->made = ERROR;
+	}
 #endif
 	if (gn->made != ERROR) {
 	    /*
 	     * If the node was made successfully, mark it so, update
 	     * its modification time and timestamp all its parents. Note
 	     * that for .ZEROTIME targets, the timestamping isn't done.
 	     * This is to keep its state from affecting that of its parent.
 	     */
 	    gn->made = MADE;
 	    pgn->flags |= Make_Recheck(gn) == 0 ? FORCE : 0;
 	    if (!(gn->type & OP_EXEC)) {
 		pgn->flags |= CHILDMADE;
 		Make_TimeStamp(pgn, gn);
+	    }
 	} else if (opts.keepgoing) {
 	    pgn->flags &= ~(unsigned)REMAKE;
 	} else {
 	    PrintOnError(gn, "\nStop.");
 	    exit(1);
+	}
     } else if (gn->made == ERROR) {
 	/* Already had an error when making this. Tell the parent to abort. */
 	pgn->flags &= ~(unsigned)REMAKE;
     } else {
 	if (Lst_FindDatum(gn->implicitParents, pgn) != NULL) {
 	    const char *target = GNode_VarTarget(gn);
 	    Var_Set(IMPSRC, target != NULL ? target : "", pgn);
+	}
 	switch(gn->made) {
 	    case BEINGMADE:
 		Error("Graph cycles through %s", gn->name);
 		gn->made = ERROR;
 		pgn->flags &= ~(unsigned)REMAKE;
 		break;
 	    case MADE:
 		if ((gn->type & OP_EXEC) == 0) {
 		    pgn->flags |= CHILDMADE;
 		    Make_TimeStamp(pgn, gn);
+		}
 		break;
 	    case UPTODATE:
 		if ((gn->type & OP_EXEC) == 0) {
 		    Make_TimeStamp(pgn, gn);
+		}
 		break;
 	    default:
 		break;
+	}
+    }
 cohorts:
     MakeNodes(gn->cohorts, pgn);
+}
 /* Initialize this module and start making.
+ *
  * Input:
  *	targs		The target nodes to re-create
  */
 void
 Compat_Run(GNodeList *targs)
+{
     GNode *gn = NULL;		/* Current root target */
     int errors;			/* Number of targets not remade due to errors */
     if (!shellName)
 	Shell_Init();
     if (bmake_signal(SIGINT, SIG_IGN) != SIG_IGN)
 	bmake_signal(SIGINT, CompatInterrupt);
     if (bmake_signal(SIGTERM, SIG_IGN) != SIG_IGN)
 	bmake_signal(SIGTERM, CompatInterrupt);
     if (bmake_signal(SIGHUP, SIG_IGN) != SIG_IGN)
 	bmake_signal(SIGHUP, CompatInterrupt);
     if (bmake_signal(SIGQUIT, SIG_IGN) != SIG_IGN)
 	bmake_signal(SIGQUIT, CompatInterrupt);
     /* Create the .END node now, to keep the (debug) output of the
      * counter.mk test the same as before 2020-09-23.  This implementation
      * detail probably doesn't matter though. */
     (void)Targ_GetEndNode();
     /*
      * If the user has defined a .BEGIN target, execute the commands attached
      * to it.
      */
     if (!opts.queryFlag) {
 	gn = Targ_FindNode(".BEGIN");
 	if (gn != NULL) {
 	    Compat_Make(gn, gn);
 	    if (gn->made == ERROR) {
 		PrintOnError(gn, "\nStop.");
 		exit(1);
+	    }
+	}
+    }
     /*
      * Expand .USE nodes right now, because they can modify the structure
      * of the tree.
      */
     Make_ExpandUse(targs);
     /*
      * For each entry in the list of targets to create, call Compat_Make on
      * it to create the thing. Compat_Make will leave the 'made' field of gn
      * in one of several states:
      *	    UPTODATE	gn was already up-to-date
      *	    MADE	gn was recreated successfully
      *	    ERROR	An error occurred while gn was being created
      *	    ABORTED	gn was not remade because one of its inferiors
      *			could not be made due to errors.
      */
     errors = 0;
     while (!Lst_IsEmpty(targs)) {
 	gn = Lst_Dequeue(targs);
 	Compat_Make(gn, gn);
 	if (gn->made == UPTODATE) {
 	    printf("`%s' is up to date.\n", gn->name);
 	} else if (gn->made == ABORTED) {
 	    printf("`%s' not remade because of errors.\n", gn->name);
 	    errors++;
+	}
+    }
     /*
      * If the user has defined a .END target, run its commands.
      */
     if (errors == 0) {
 	GNode *endNode = Targ_GetEndNode();
 	Compat_Make(endNode, endNode);
 	/* XXX: Did you mean endNode->made instead of gn->made? */
 	if (gn->made == ERROR) {
 	    PrintOnError(gn, "\nStop.");
 	    exit(1);
+	}
+    }
+}

 @@ -1,2602 +1,2602 @@
-/*	$NetBSD: job.c,v 1.299 2020/11/01 17:07:03 rillig Exp $	*/
+/*	$NetBSD: job.c,v 1.300 2020/11/01 17:47:26 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.
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
  */
 /*
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * 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.
  * 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
  */
 /*-
  * job.c --
  *	handle the creation etc. of our child processes.
+ *
  * Interface:
  *	Job_Init	Called to initialize this module. In addition,
  *			any commands attached to the .BEGIN target
  *			are executed before this function returns.
  *			Hence, the makefiles must have been parsed
  *			before this function is called.
+ *
  *	Job_End		Clean up any memory used.
+ *
  *	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
  *			frequently to keep the whole make going at
  *			a decent clip, since job table entries aren't
  *			removed until their process is caught this way.
+ *
  *	Job_CatchOutput
  *			Print any output our children have produced.
  *			Should also be called fairly frequently to
  *			keep the user informed of what's going on.
  *			If no output is waiting, it will block for
  *			a time given by the SEL_* constants, below,
  *			or until output is ready.
+ *
  *	Job_ParseShell	Given the line following a .SHELL target, parse
  *			the line as a shell specification. Returns
  *			FALSE if the spec was incorrect.
+ *
  *	Job_Finish	Perform any final processing which needs doing.
  *			This includes the execution of any commands
  *			which have been/were attached to the .END
  *			target. It should only be called when the
  *			job table is empty.
+ *
  *	Job_AbortAll	Abort all currently running jobs. It doesn't
  *			handle output or do anything for the jobs,
  *			just kills them. It should only be called in
  *			an emergency.
+ *
  *	Job_CheckCommands
  *			Verify that the commands for a target are
  *			ok. Provide them if necessary and possible.
+ *
  *	Job_Touch	Update a target without really updating it.
+ *
  *	Job_Wait	Wait for all currently-running jobs to finish.
  */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <errno.h>
 #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.299 2020/11/01 17:07:03 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.300 2020/11/01 17:47:26 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,
  * echoOn, noPrint and noPrintLen.  When echoOff is executed by the shell, it
  * still outputs something, but this something is not interesting, therefore
  * it is filtered out using noPrint and noPrintLen.
+ *
  * The error checking for individual commands is controlled using hasErrCtl,
  * errOnOrEcho, errOffOrExecIgnore and errExit.
+ *
  * If a shell doesn't have error control, errOnOrEcho becomes a printf template
  * for echoing the command, should echoing be on; errOffOrExecIgnore becomes
  * another printf template for executing the command while ignoring the return
  * status. Finally errExit is a printf template for running the command and
  * causing the shell to exit on error. If any of these strings are empty when
  * hasErrCtl is FALSE, the command will be executed anyway as is, and if it
  * causes an error, so be it. Any templates setup to echo the command will
  * escape any '$ ` \ "' characters in the command string to avoid common
  * problems with echo "%s\n" as a template.
+ *
  * The command-line flags "echo" and "exit" also control the behavior.  The
  * "echo" flag causes the shell to start echoing commands right away.  The
  * "exit" flag causes the shell to exit when an error is detected in one of
  * the commands.
  */
 typedef struct Shell {
     /* The name of the shell. For Bourne and C shells, this is used only to
      * find the shell description when used as the single source of a .SHELL
      * target. For user-defined shells, this is the full path of the shell. */
     const char *name;
     Boolean hasEchoCtl;		/* True if both echoOff and echoOn defined */
     const char *echoOff;	/* command to turn off echo */
     const char *echoOn;		/* command to turn it back on again */
     const char *noPrint;	/* text to skip when printing output from
 				 * shell. This is usually the same as echoOff */
     size_t noPrintLen;		/* length of noPrint command */
     Boolean hasErrCtl;		/* set if can control error checking for
 				 * individual commands */
     /* XXX: split into errOn and echoCmd */
     const char *errOnOrEcho;	/* template to turn on error checking */
     /* XXX: split into errOff and execIgnore */
     const char *errOffOrExecIgnore; /* template to turn off error checking */
     const char *errExit;	/* template to use for testing exit code */
     /* string literal that results in a newline character when it appears
      * outside of any 'quote' or "quote" characters */
     const char *newline;
     char commentChar;		/* character used by shell for comment lines */
     /*
      * command-line flags
      */
     const char *echo;		/* echo commands */
     const char *exit;		/* exit on error */
 } Shell;
 /*
  * error handling variables
  */
 static int errors = 0;		/* number of errors reported */
 typedef enum AbortReason {	/* why is the make aborting? */
     ABORT_NONE,
     ABORT_ERROR,		/* Because of an error */
     ABORT_INTERRUPT,		/* Because it was interrupted */
     ABORT_WAIT			/* Waiting for jobs to finish */
 } AbortReason;
 static AbortReason aborting = ABORT_NONE;
 #define JOB_TOKENS	"+EI+"	/* Token to requeue for each abort state */
 /*
  * this tracks the number of tokens currently "out" to build jobs.
  */
 int jobTokensRunning = 0;
 /* The number of commands actually printed to the shell commands file for
  * the current job.  Should this number be 0, no shell will be executed. */
 static int numCommands;
 typedef enum JobStartResult {
     JOB_RUNNING,		/* Job is running */
     JOB_ERROR,			/* Error in starting the job */
     JOB_FINISHED		/* The job is already finished */
 } JobStartResult;
 /*
  * Descriptions for various shells.
+ *
  * The build environment may set DEFSHELL_INDEX to one of
  * DEFSHELL_INDEX_SH, DEFSHELL_INDEX_KSH, or DEFSHELL_INDEX_CSH, to
  * select one of the predefined shells as the default shell.
+ *
  * Alternatively, the build environment may set DEFSHELL_CUSTOM to the
  * name or the full path of a sh-compatible shell, which will be used as
  * the default shell.
+ *
  * ".SHELL" lines in Makefiles can choose the default shell from the
  * set defined here, or add additional shells.
  */
 #ifdef DEFSHELL_CUSTOM
 #define DEFSHELL_INDEX_CUSTOM 0
 #define DEFSHELL_INDEX_SH     1
 #define DEFSHELL_INDEX_KSH    2
 #define DEFSHELL_INDEX_CSH    3
 #else /* !DEFSHELL_CUSTOM */
 #define DEFSHELL_INDEX_SH     0
 #define DEFSHELL_INDEX_KSH    1
 #define DEFSHELL_INDEX_CSH    2
 #endif /* !DEFSHELL_CUSTOM */
 #ifndef DEFSHELL_INDEX
 #define DEFSHELL_INDEX 0	/* DEFSHELL_INDEX_CUSTOM or DEFSHELL_INDEX_SH */
 #endif /* !DEFSHELL_INDEX */
 static Shell    shells[] = {
 #ifdef DEFSHELL_CUSTOM
     /*
      * An sh-compatible shell with a non-standard name.
+     *
      * Keep this in sync with the "sh" description below, but avoid
      * non-portable features that might not be supplied by all
      * sh-compatible shells.
      */
+{
     DEFSHELL_CUSTOM,		/* .name */
     FALSE,			/* .hasEchoCtl */
     "",				/* .echoOff */
     "",				/* .echoOn */
     "",				/* .noPrint */
 ,				/* .noPrintLen */
     FALSE,			/* .hasErrCtl */
     "echo \"%s\"\n",		/* .errOnOrEcho */
     "%s\n",			/* .errOffOrExecIgnore */
     "{ %s \n} || exit $?\n",	/* .errExit */
     "'\n'",			/* .newline */
     '#',			/* .commentChar */
     "",				/* .echo */
     "",				/* .exit */
 },
 #endif /* DEFSHELL_CUSTOM */
     /*
      * SH description. Echo control is also possible and, under
      * sun UNIX anyway, one can even control error checking.
      */
+{
     "sh",			/* .name */
     FALSE,			/* .hasEchoCtl */
     "",				/* .echoOff */
     "",				/* .echoOn */
     "",				/* .noPrint */
 ,				/* .noPrintLen */
     FALSE,			/* .hasErrCtl */
     "echo \"%s\"\n", 		/* .errOnOrEcho */
     "%s\n",			/* .errOffOrExecIgnore */
     "{ %s \n} || exit $?\n",	/* .errExit */
     "'\n'",			/* .newline */
     '#',			/* .commentChar*/
 #if defined(MAKE_NATIVE) && defined(__NetBSD__)
     "q",			/* .echo */
 #else
     "",				/* .echo */
 #endif
     "",				/* .exit */
 },
     /*
      * KSH description.
      */
+{
     "ksh",			/* .name */
     TRUE,			/* .hasEchoCtl */
     "set +v",			/* .echoOff */
     "set -v",			/* .echoOn */
     "set +v",			/* .noPrint */
 ,				/* .noPrintLen */
     FALSE,			/* .hasErrCtl */
     "echo \"%s\"\n",		/* .errOnOrEcho */
     "%s\n",			/* .errOffOrExecIgnore */
     "{ %s \n} || exit $?\n",	/* .errExit */
     "'\n'",			/* .newline */
     '#',			/* .commentChar */
     "v",			/* .echo */
     "",				/* .exit */
 },
     /*
      * CSH description. The csh can do echo control by playing
      * with the setting of the 'echo' shell variable. Sadly,
      * however, it is unable to do error control nicely.
      */
+{
     "csh",			/* .name */
     TRUE,			/* .hasEchoCtl */
     "unset verbose",		/* .echoOff */
     "set verbose",		/* .echoOn */
     "unset verbose", 		/* .noPrint */
 ,				/* .noPrintLen */
     FALSE, 			/* .hasErrCtl */
     "echo \"%s\"\n", 		/* .errOnOrEcho */
     /* XXX: Mismatch between errOn and execIgnore */
     "csh -c \"%s || exit 0\"\n", /* .errOffOrExecIgnore */
     "", 			/* .errExit */
     "'\\\n'",			/* .newline */
     '#',			/* .commentChar */
     "v", 			/* .echo */
     "e",			/* .exit */
+}
 };
 /* This is the shell to which we pass all commands in the Makefile.
  * It is set by the Job_ParseShell function. */
 static Shell *commandShell = &shells[DEFSHELL_INDEX];
 const char *shellPath = NULL;	/* full pathname of executable image */
 const char *shellName = NULL;	/* last component of shellPath */
 char *shellErrFlag = NULL;
 static char *shellArgv = NULL;	/* Custom shell args */
 static Job *job_table;		/* The structures that describe them */
 static Job *job_table_end;	/* job_table + maxJobs */
 static unsigned int wantToken;	/* we want a token */
 static int lurking_children = 0;
 static int make_suspended = 0;	/* non-zero if we've seen a SIGTSTP (etc) */
 /*
  * Set of descriptors of pipes connected to
  * the output channels of children
  */
 static struct pollfd *fds = NULL;
 static Job **jobfds = NULL;
 static nfds_t nfds = 0;
 static void watchfd(Job *);
 static void clearfd(Job *);
 static int readyfd(Job *);
 static GNode *lastNode;		/* The node for which output was most recently
 				 * produced. */
 static char *targPrefix = NULL; /* What we print at the start of TARG_FMT */
 static Job tokenWaitJob;	/* token wait pseudo-job */
 static Job childExitJob;	/* child exit pseudo-job */
 #define	CHILD_EXIT	"."
 #define	DO_JOB_RESUME	"R"
 enum { npseudojobs = 2 };	/* number of pseudo-jobs */
 #define TARG_FMT  "%s %s ---\n" /* Default format */
 #define MESSAGE(fp, gn) \
 	if (opts.maxJobs != 1 && targPrefix && *targPrefix) \
 	    (void)fprintf(fp, TARG_FMT, targPrefix, gn->name)
 static sigset_t caught_signals;	/* Set of signals we handle */
 static void JobDoOutput(Job *, Boolean);
 static void JobInterrupt(int, int) MAKE_ATTR_DEAD;
 static void JobRestartJobs(void);
 static void JobSigReset(void);
 static unsigned
 nfds_per_job(void)
+{
 #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV)
     if (useMeta)
 	return 2;
 #endif
     return 1;
+}
 static void
 job_table_dump(const char *where)
+{
     Job *job;
     debug_printf("job table @ %s\n", where);
     for (job = job_table; job < job_table_end; job++) {
 	debug_printf("job %d, status %d, flags %d, pid %d\n",
 	    (int)(job - job_table), job->job_state, job->flags, job->pid);
+    }
+}
 /*
  * Delete the target of a failed, interrupted, or otherwise
  * unsuccessful job unless inhibited by .PRECIOUS.
  */
 static void
 JobDeleteTarget(GNode *gn)
+{
     const char *file;
     if (gn->type & OP_JOIN)
 	return;
     if (gn->type & OP_PHONY)
 	return;
     if (Targ_Precious(gn))
 	return;
     if (opts.noExecute)
 	return;
     file = GNode_Path(gn);
     if (eunlink(file) != -1)
 	Error("*** %s removed", file);
+}
 /*
  * JobSigLock/JobSigUnlock
+ *
  * Signal lock routines to get exclusive access. Currently used to
  * protect `jobs' and `stoppedJobs' list manipulations.
  */
 static void JobSigLock(sigset_t *omaskp)
+{
 	if (sigprocmask(SIG_BLOCK, &caught_signals, omaskp) != 0) {
 		Punt("JobSigLock: sigprocmask: %s", strerror(errno));
 		sigemptyset(omaskp);
+	}
+}
 static void JobSigUnlock(sigset_t *omaskp)
+{
 	(void)sigprocmask(SIG_SETMASK, omaskp, NULL);
+}
 static void
 JobCreatePipe(Job *job, int minfd)
+{
     int i, fd, flags;
     int pipe_fds[2];
     if (pipe(pipe_fds) == -1)
 	Punt("Cannot create pipe: %s", strerror(errno));
     for (i = 0; i < 2; i++) {
 	/* Avoid using low numbered fds */
 	fd = fcntl(pipe_fds[i], F_DUPFD, minfd);
 	if (fd != -1) {
 	    close(pipe_fds[i]);
 	    pipe_fds[i] = fd;
+	}
+    }
     job->inPipe = pipe_fds[0];
     job->outPipe = pipe_fds[1];
     /* Set close-on-exec flag for both */
     if (fcntl(job->inPipe, F_SETFD, FD_CLOEXEC) == -1)
 	Punt("Cannot set close-on-exec: %s", strerror(errno));
     if (fcntl(job->outPipe, F_SETFD, FD_CLOEXEC) == -1)
 	Punt("Cannot set close-on-exec: %s", strerror(errno));
     /*
      * We mark the input side of the pipe non-blocking; we poll(2) the
      * pipe when we're waiting for a job token, but we might lose the
      * race for the token when a new one becomes available, so the read
      * from the pipe should not block.
      */
     flags = fcntl(job->inPipe, F_GETFL, 0);
     if (flags == -1)
 	Punt("Cannot get flags: %s", strerror(errno));
     flags |= O_NONBLOCK;
     if (fcntl(job->inPipe, F_SETFL, flags) == -1)
 	Punt("Cannot set flags: %s", strerror(errno));
+}
 /* Pass the signal to each running job. */
 static void
 JobCondPassSig(int signo)
+{
     Job *job;
     DEBUG1(JOB, "JobCondPassSig(%d) called.\n", signo);
     for (job = job_table; job < job_table_end; job++) {
 	if (job->job_state != 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(). */
 static void
 JobChildSig(int signo MAKE_ATTR_UNUSED)
+{
     while (write(childExitJob.outPipe, CHILD_EXIT, 1) == -1 && errno == EAGAIN)
 	continue;
+}
 /* Resume all stopped jobs. */
 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;
+}
 /* Pass a signal on to all jobs, then resend to ourselves.
  * We die by the same signal. */
 MAKE_ATTR_DEAD static void
 JobPassSig_int(int signo)
+{
     /* Run .INTERRUPT target then exit */
     JobInterrupt(TRUE, signo);
+}
 /* Pass a signal on to all jobs, then resend to ourselves.
  * We die by the same signal. */
 MAKE_ATTR_DEAD static void
 JobPassSig_term(int signo)
+{
     /* Dont run .INTERRUPT target then exit */
     JobInterrupt(FALSE, signo);
+}
 static void
 JobPassSig_suspend(int signo)
+{
     sigset_t nmask, omask;
     struct sigaction act;
     /* Suppress job started/continued messages */
     make_suspended = 1;
     /* Pass the signal onto every job */
     JobCondPassSig(signo);
     /*
      * Send ourselves the signal now we've given the message to everyone else.
      * Note we block everything else possible while we're getting the signal.
      * This ensures that all our jobs get continued when we wake up before
      * we take any other signal.
      */
     sigfillset(&nmask);
     sigdelset(&nmask, signo);
     (void)sigprocmask(SIG_SETMASK, &nmask, &omask);
     act.sa_handler = SIG_DFL;
     sigemptyset(&act.sa_mask);
     act.sa_flags = 0;
     (void)sigaction(signo, &act, NULL);
     if (DEBUG(JOB))
 	debug_printf("JobPassSig passing signal %d to self.\n", signo);
     (void)kill(getpid(), signo);
     /*
      * We've been continued.
+     *
      * A whole host of signals continue to happen!
      * SIGCHLD for any processes that actually suspended themselves.
      * SIGCHLD for any processes that exited while we were alseep.
      * The SIGCONT that actually caused us to wakeup.
+     *
      * Since we defer passing the SIGCONT on to our children until
      * the main processing loop, we can be sure that all the SIGCHLD
      * events will have happened by then - and that the waitpid() will
      * collect the child 'suspended' events.
      * For correct sequencing we just need to ensure we process the
      * waitpid() before passing on the SIGCONT.
+     *
      * In any case nothing else is needed here.
      */
     /* Restore handler and signal mask */
     act.sa_handler = JobPassSig_suspend;
     (void)sigaction(signo, &act, NULL);
     (void)sigprocmask(SIG_SETMASK, &omask, NULL);
+}
 static Job *
 JobFindPid(int pid, JobState status, Boolean isJobs)
+{
     Job *job;
     for (job = job_table; job < job_table_end; job++) {
 	if ((job->job_state == status) && job->pid == pid)
 	    return job;
+    }
     if (DEBUG(JOB) && isJobs)
 	job_table_dump("no pid");
     return NULL;
+}
 /* Parse leading '@', '-' and '+', which control the exact execution mode. */
 static void
 ParseRunOptions(
 	char **pp,
 	Boolean *out_shutUp, Boolean *out_errOff, Boolean *out_runAlways)
+{
     char *p = *pp;
     *out_shutUp = FALSE;
     *out_errOff = FALSE;
     *out_runAlways = FALSE;
     for (;;) {
 	if (*p == '@')
 	    *out_shutUp = !DEBUG(LOUD);
 	else if (*p == '-')
 	    *out_errOff = TRUE;
 	else if (*p == '+')
 	    *out_runAlways = TRUE;
 	else
 	    break;
 	p++;
+    }
     pp_skip_whitespace(&p);
     *pp = p;
+}
 /* Escape a string for a double-quoted string literal in sh, csh and ksh. */
 static char *
 EscapeShellDblQuot(const char *cmd)
+{
     size_t i, j;
     /* Worst that could happen is every char needs escaping. */
     char *esc = bmake_malloc(strlen(cmd) * 2 + 1);
     for (i = 0, j = 0; cmd[i] != '\0'; i++, j++) {
 	if (cmd[i] == '$' || cmd[i] == '`' || cmd[i] == '\\' || cmd[i] == '"')
 	    esc[j++] = '\\';
 	esc[j] = cmd[i];
+    }
     esc[j] = '\0';
     return esc;
+}
 /*-
  *-----------------------------------------------------------------------
  * JobPrintCommand  --
  *	Put out another command for the given job. If the command starts
  *	with an @ or a - we process it specially. In the former case,
  *	so long as the -s and -n flags weren't given to make, we stick
  *	a shell-specific echoOff command in the script. In the latter,
  *	we ignore errors for the entire job, unless the shell has error
  *	control.
  *	If the command is just "..." we take all future commands for this
  *	job to be commands to be executed once the entire graph has been
  *	made and return non-zero to signal that the end of the commands
  *	was reached. These commands are later attached to the postCommands
  *	node and executed by Job_End when all things are done.
+ *
  * Side Effects:
  *	If the command begins with a '-' and the shell has no error control,
  *	the JOB_IGNERR flag is set in the job descriptor.
  *	numCommands is incremented if the command is actually printed.
  *-----------------------------------------------------------------------
  */
 static void
 JobPrintCommand(Job *job, char *cmd)
+{
     const char *const cmdp = cmd;
     Boolean noSpecials;		/* true if we shouldn't worry about
 				 * inserting special commands into
 				 * the input stream. */
     Boolean shutUp;		/* true if we put a no echo command
 				 * into the command file */
     Boolean errOff;		/* true if we turned error checking
 				 * off before printing the command
 				 * and need to turn it back on */
     Boolean runAlways;
     const char *cmdTemplate;	/* Template to use when printing the
 				 * command */
     char *cmdStart;		/* Start of expanded command */
     char *escCmd = NULL;	/* Command with quotes/backticks escaped */
-    noSpecials = NoExecute(job->node);
+    noSpecials = !GNode_ShouldExecute(job->node);
 #define DBPRINTF(fmt, arg) if (DEBUG(JOB)) {	\
 	debug_printf(fmt, arg);			\
     }						\
    (void)fprintf(job->cmdFILE, fmt, arg);	\
    (void)fflush(job->cmdFILE);
     numCommands++;
     Var_Subst(cmd, job->node, VARE_WANTRES, &cmd);
     /* TODO: handle errors */
     cmdStart = cmd;
     cmdTemplate = "%s\n";
     ParseRunOptions(&cmd, &shutUp, &errOff, &runAlways);
     if (runAlways && noSpecials) {
 	/*
 	 * We're not actually executing anything...
 	 * but this one needs to be - use compat mode just for it.
 	 */
 	Compat_RunCommand(cmdp, job->node);
 	free(cmdStart);
 	return;
+    }
     /*
      * If the shell doesn't have error control the alternate echo'ing will
      * be done (to avoid showing additional error checking code)
      * and this will need the characters '$ ` \ "' escaped
      */
     if (!commandShell->hasErrCtl)
         escCmd = EscapeShellDblQuot(cmd);
     if (shutUp) {
 	if (!(job->flags & JOB_SILENT) && !noSpecials &&
 	    commandShell->hasEchoCtl) {
 		DBPRINTF("%s\n", commandShell->echoOff);
 	} else {
 	    if (commandShell->hasErrCtl)
 		shutUp = FALSE;
+	}
+    }
     if (errOff) {
 	if (!noSpecials) {
 	    if (commandShell->hasErrCtl) {
 		/*
 		 * we don't want the error-control commands showing
 		 * up either, so we turn off echoing while executing
 		 * them. We could put another field in the shell
 		 * structure to tell JobDoOutput to look for this
 		 * string too, but why make it any more complex than
 		 * it already is?
 		 */
 		if (!(job->flags & JOB_SILENT) && !shutUp &&
 		    commandShell->hasEchoCtl) {
 			DBPRINTF("%s\n", commandShell->echoOff);
 			DBPRINTF("%s\n", commandShell->errOffOrExecIgnore);
 			DBPRINTF("%s\n", commandShell->echoOn);
 		} else {
 			DBPRINTF("%s\n", commandShell->errOffOrExecIgnore);
+		}
 	    } else if (commandShell->errOffOrExecIgnore &&
 		       commandShell->errOffOrExecIgnore[0] != '\0')
+	    {
 		/*
 		 * The shell has no error control, so we need to be
 		 * weird to get it to ignore any errors from the command.
 		 * If echoing is turned on, we turn it off and use the
 		 * errOnOrEcho template to echo the command. Leave echoing
 		 * off so the user doesn't see the weirdness we go through
 		 * to ignore errors. Set cmdTemplate to use the weirdness
 		 * instead of the simple "%s\n" template.
 		 */
 		job->flags |= JOB_IGNERR;
 		if (!(job->flags & JOB_SILENT) && !shutUp) {
 			if (commandShell->hasEchoCtl) {
 				DBPRINTF("%s\n", commandShell->echoOff);
+			}
 			DBPRINTF(commandShell->errOnOrEcho, escCmd);
 			shutUp = TRUE;
 		} else {
 			if (!shutUp) {
 				DBPRINTF(commandShell->errOnOrEcho, escCmd);
+			}
+		}
 		cmdTemplate = commandShell->errOffOrExecIgnore;
 		/*
 		 * The error ignoration (hee hee) is already taken care
 		 * of by the errOffOrExecIgnore template, so pretend error
 		 * checking is still on.
 		 */
 		errOff = FALSE;
 	    } else {
 		errOff = FALSE;
+	    }
 	} else {
 	    errOff = FALSE;
+	}
     } else {
 	/*
 	 * If errors are being checked and the shell doesn't have error control
 	 * but does supply an errExit template, then setup commands to run
 	 * through it.
 	 */
 	if (!commandShell->hasErrCtl && commandShell->errExit &&
 	    commandShell->errExit[0] != '\0') {
 		if (!(job->flags & JOB_SILENT) && !shutUp) {
 			if (commandShell->hasEchoCtl) {
 				DBPRINTF("%s\n", commandShell->echoOff);
+			}
 			DBPRINTF(commandShell->errOnOrEcho, escCmd);
 			shutUp = TRUE;
+		}
 		/* If it's a comment line or blank, treat as an ignored error */
 		if ((escCmd[0] == commandShell->commentChar) ||
 		    (escCmd[0] == 0))
 			cmdTemplate = commandShell->errOffOrExecIgnore;
 		else
 			cmdTemplate = commandShell->errExit;
 		errOff = FALSE;
+	}
+    }
     if (DEBUG(SHELL) && strcmp(shellName, "sh") == 0 &&
 	(job->flags & JOB_TRACED) == 0) {
 	    DBPRINTF("set -%s\n", "x");
 	    job->flags |= JOB_TRACED;
+    }
     DBPRINTF(cmdTemplate, cmd);
     free(cmdStart);
     free(escCmd);
     if (errOff) {
 	/*
 	 * If echoing is already off, there's no point in issuing the
 	 * echoOff command. Otherwise we issue it and pretend it was on
 	 * for the whole command...
 	 */
 	if (!shutUp && !(job->flags & JOB_SILENT) && commandShell->hasEchoCtl){
 	    DBPRINTF("%s\n", commandShell->echoOff);
 	    shutUp = TRUE;
+	}
 	DBPRINTF("%s\n", commandShell->errOnOrEcho);
+    }
     if (shutUp && commandShell->hasEchoCtl) {
 	DBPRINTF("%s\n", commandShell->echoOn);
+    }
+}
 /* Print all commands to the shell file that is later executed.
+ *
  * The special command "..." stops printing and saves the remaining commands
  * to be executed later. */
 static void
 JobPrintCommands(Job *job)
+{
     StringListNode *ln;
     for (ln = job->node->commands->first; ln != NULL; ln = ln->next) {
 	const char *cmd = ln->datum;
 	if (strcmp(cmd, "...") == 0) {
 	    job->node->type |= OP_SAVE_CMDS;
 	    if ((job->flags & JOB_IGNDOTS) == 0) {
 		job->tailCmds = ln->next;
 		break;
+	    }
 	} else
 	    JobPrintCommand(job, ln->datum);
+    }
+}
 /* Save the delayed commands, to be executed when everything else is done. */
 static void
 JobSaveCommands(Job *job)
+{
     StringListNode *node;
     for (node = job->tailCmds; node != NULL; node = node->next) {
 	const char *cmd = node->datum;
 	char *expanded_cmd;
 	/* XXX: This Var_Subst is only intended to expand the dynamic
 	 * variables such as .TARGET, .IMPSRC.  It is not intended to
 	 * expand the other variables as well; see deptgt-end.mk. */
 	(void)Var_Subst(cmd, job->node, VARE_WANTRES, &expanded_cmd);
 	/* TODO: handle errors */
 	Lst_Append(Targ_GetEndNode()->commands, expanded_cmd);
+    }
+}
 /* Called to close both input and output pipes when a job is finished. */
 static void
 JobClose(Job *job)
+{
     clearfd(job);
     (void)close(job->outPipe);
     job->outPipe = -1;
     JobDoOutput(job, TRUE);
     (void)close(job->inPipe);
     job->inPipe = -1;
+}
 /*-
  *-----------------------------------------------------------------------
  * JobFinish  --
  *	Do final processing for the given job including updating
  *	parents and starting new jobs as available/necessary. Note
  *	that we pay no attention to the JOB_IGNERR flag here.
  *	This is because when we're called because of a noexecute flag
  *	or something, jstat.w_status is 0 and when called from
  *	Job_CatchChildren, the status is zeroed if it s/b ignored.
+ *
  * Input:
  *	job		job to finish
  *	status		sub-why job went away
+ *
  * Side Effects:
  *	Final commands for the job are placed on postCommands.
+ *
  *	If we got an error and are aborting (aborting == ABORT_ERROR) and
  *	the job list is now empty, we are done for the day.
  *	If we recognized an error (errors !=0), we set the aborting flag
  *	to ABORT_ERROR so no more jobs will be started.
  *-----------------------------------------------------------------------
  */
 static void
 JobFinish(Job *job, int status)
+{
     Boolean done, return_job_token;
     DEBUG3(JOB, "JobFinish: %d [%s], status %d\n",
 	   job->pid, job->node->name, status);
     if ((WIFEXITED(status) &&
 	 (((WEXITSTATUS(status) != 0) && !(job->flags & JOB_IGNERR)))) ||
 	WIFSIGNALED(status))
+    {
 	/*
 	 * If it exited non-zero and either we're doing things our
 	 * way or we're not ignoring errors, the job is finished.
 	 * Similarly, if the shell died because of a signal
 	 * the job is also finished. In these
 	 * cases, finish out the job's output before printing the exit
 	 * status...
 	 */
 	JobClose(job);
 	if (job->cmdFILE != NULL && job->cmdFILE != stdout) {
 	   (void)fclose(job->cmdFILE);
 	   job->cmdFILE = NULL;
+	}
 	done = TRUE;
     } else if (WIFEXITED(status)) {
 	/*
 	 * Deal with ignored errors in -B mode. We need to print a message
 	 * telling of the ignored error as well as setting status.w_status
 	 * to 0 so the next command gets run. To do this, we set done to be
 	 * TRUE if in -B mode and the job exited non-zero.
 	 */
 	done = WEXITSTATUS(status) != 0;
 	/*
 	 * Old comment said: "Note we don't
 	 * want to close down any of the streams until we know we're at the
 	 * end."
 	 * But we do. Otherwise when are we going to print the rest of the
 	 * stuff?
 	 */
 	JobClose(job);
     } else {
 	/*
 	 * No need to close things down or anything.
 	 */
 	done = FALSE;
+    }
     if (done) {
 	if (WIFEXITED(status)) {
 	    DEBUG2(JOB, "Process %d [%s] exited.\n",
 		   job->pid, job->node->name);
 	    if (WEXITSTATUS(status) != 0) {
 		if (job->node != lastNode) {
 		    MESSAGE(stdout, job->node);
 		    lastNode = job->node;
+		}
 #ifdef USE_META
 		if (useMeta) {
 		    meta_job_error(job, job->node, job->flags, WEXITSTATUS(status));
+		}
 #endif
 		if (!dieQuietly(job->node, -1))
 		    (void)printf("*** [%s] Error code %d%s\n",
 				 job->node->name,
 				 WEXITSTATUS(status),
 				 (job->flags & JOB_IGNERR) ? " (ignored)" : "");
 		if (job->flags & JOB_IGNERR) {
 		    status = 0;
 		} else {
 		    if (deleteOnError) {
 			JobDeleteTarget(job->node);
+		    }
 		    PrintOnError(job->node, NULL);
+		}
 	    } else if (DEBUG(JOB)) {
 		if (job->node != lastNode) {
 		    MESSAGE(stdout, job->node);
 		    lastNode = job->node;
+		}
 		(void)printf("*** [%s] Completed successfully\n",
 				job->node->name);
+	    }
 	} else {
 	    if (job->node != lastNode) {
 		MESSAGE(stdout, job->node);
 		lastNode = job->node;
+	    }
 	    (void)printf("*** [%s] Signal %d\n",
 			job->node->name, WTERMSIG(status));
 	    if (deleteOnError) {
 		JobDeleteTarget(job->node);
+	    }
+	}
 	(void)fflush(stdout);
+    }
 #ifdef USE_META
     if (useMeta) {
 	int x;
 	if ((x = meta_job_finish(job)) != 0 && status == 0) {
 	    status = x;
+	}
+    }
 #endif
     return_job_token = FALSE;
     Trace_Log(JOBEND, job);
     if (!(job->flags & JOB_SPECIAL)) {
 	if ((status != 0) ||
 		(aborting == ABORT_ERROR) ||
 		(aborting == ABORT_INTERRUPT))
 	    return_job_token = TRUE;
+    }
     if ((aborting != ABORT_ERROR) && (aborting != ABORT_INTERRUPT) && (status == 0)) {
 	/*
 	 * As long as we aren't aborting and the job didn't return a non-zero
 	 * status that we shouldn't ignore, we call Make_Update to update
 	 * the parents.
 	 */
 	JobSaveCommands(job);
 	job->node->made = MADE;
 	if (!(job->flags & JOB_SPECIAL))
 	    return_job_token = TRUE;
 	Make_Update(job->node);
 	job->job_state = JOB_ST_FREE;
     } else if (status != 0) {
 	errors++;
 	job->job_state = JOB_ST_FREE;
+    }
     /*
      * Set aborting if any error.
      */
     if (errors && !opts.keepgoing && (aborting != ABORT_INTERRUPT)) {
 	/*
 	 * If we found any errors in this batch of children and the -k flag
 	 * wasn't given, we set the aborting flag so no more jobs get
 	 * started.
 	 */
 	aborting = ABORT_ERROR;
+    }
     if (return_job_token)
 	Job_TokenReturn();
     if (aborting == ABORT_ERROR && jobTokensRunning == 0) {
 	/*
 	 * If we are aborting and the job table is now empty, we finish.
 	 */
 	Finish(errors);
+    }
+}
 /* Touch the given target. Called by JobStart when the -t flag was given.
+ *
  * The modification date of the file is changed.
  * If the file did not exist, it is created. */
 void
 Job_Touch(GNode *gn, Boolean silent)
+{
     int streamID;		/* ID of stream opened to do the touch */
     struct utimbuf times;	/* Times for utime() call */
     if (gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC|OP_OPTIONAL|
 	OP_SPECIAL|OP_PHONY)) {
 	/*
 	 * .JOIN, .USE, .ZEROTIME and .OPTIONAL targets are "virtual" targets
 	 * and, as such, shouldn't really be created.
 	 */
 	return;
+    }
-    if (!silent || NoExecute(gn)) {
+    if (!silent || !GNode_ShouldExecute(gn)) {
 	(void)fprintf(stdout, "touch %s\n", gn->name);
 	(void)fflush(stdout);
+    }
-    if (NoExecute(gn)) {
+    if (!GNode_ShouldExecute(gn)) {
 	return;
+    }
     if (gn->type & OP_ARCHV) {
 	Arch_Touch(gn);
     } else if (gn->type & OP_LIB) {
 	Arch_TouchLib(gn);
     } else {
 	const char *file = GNode_Path(gn);
 	times.actime = times.modtime = now;
 	if (utime(file, &times) < 0){
 	    streamID = open(file, O_RDWR | O_CREAT, 0666);
 	    if (streamID >= 0) {
 		char	c;
 		/*
 		 * Read and write a byte to the file to change the
 		 * modification time, then close the file.
 		 */
 		if (read(streamID, &c, 1) == 1) {
 		    (void)lseek(streamID, (off_t)0, SEEK_SET);
 		    while (write(streamID, &c, 1) == -1 && errno == EAGAIN)
 			continue;
+		}
 		(void)close(streamID);
 	    } else {
 		(void)fprintf(stdout, "*** couldn't touch %s: %s",
 			       file, strerror(errno));
 		(void)fflush(stdout);
+	    }
+	}
+    }
+}
 /* Make sure the given node has all the commands it needs.
+ *
  * The node will have commands from the .DEFAULT rule added to it if it
  * needs them.
+ *
  * Input:
  *	gn		The target whose commands need verifying
  *	abortProc	Function to abort with message
+ *
  * Results:
  *	TRUE if the commands list is/was ok.
  */
 Boolean
 Job_CheckCommands(GNode *gn, void (*abortProc)(const char *, ...))
+{
     if (GNode_IsTarget(gn))
 	return TRUE;
     if (!Lst_IsEmpty(gn->commands))
 	return TRUE;
     if ((gn->type & OP_LIB) && !Lst_IsEmpty(gn->children))
 	return TRUE;
     /*
      * No commands. Look for .DEFAULT rule from which we might infer
      * commands
      */
     if ((DEFAULT != NULL) && !Lst_IsEmpty(DEFAULT->commands) &&
 	(gn->type & OP_SPECIAL) == 0) {
 	/*
 	 * Make only looks for a .DEFAULT if the node was never the
 	 * target of an operator, so that's what we do too. If
 	 * a .DEFAULT was given, we substitute its commands for gn's
 	 * commands and set the IMPSRC variable to be the target's name
 	 * The DEFAULT node acts like a transformation rule, in that
 	 * gn also inherits any attributes or sources attached to
 	 * .DEFAULT itself.
 	 */
 	Make_HandleUse(DEFAULT, gn);
 	Var_Set(IMPSRC, GNode_VarTarget(gn), gn);
 	return TRUE;
+    }
     if (Dir_MTime(gn, 0) != 0 || (gn->type & OP_SPECIAL))
 	return TRUE;
     /*
      * The node wasn't the target of an operator.  We have no .DEFAULT
      * rule to go on and the target doesn't already exist. There's
      * nothing more we can do for this branch. If the -k flag wasn't
      * given, we stop in our tracks, otherwise we just don't update
      * this node's parents so they never get examined.
      */
     if (gn->flags & FROM_DEPEND) {
 	if (!Job_RunTarget(".STALE", gn->fname))
 	    fprintf(stdout, "%s: %s, %d: ignoring stale %s for %s\n",
 		    progname, gn->fname, gn->lineno, makeDependfile,
 		    gn->name);
 	return TRUE;
+    }
     if (gn->type & OP_OPTIONAL) {
 	(void)fprintf(stdout, "%s: don't know how to make %s (%s)\n",
 		      progname, gn->name, "ignored");
 	(void)fflush(stdout);
 	return TRUE;
+    }
     if (opts.keepgoing) {
 	(void)fprintf(stdout, "%s: don't know how to make %s (%s)\n",
 		      progname, gn->name, "continuing");
 	(void)fflush(stdout);
 	return FALSE;
+    }
     abortProc("%s: don't know how to make %s. Stop", progname, gn->name);
     return FALSE;
+}
 /* Execute the shell for the given job.
+ *
  * A shell is executed, its output is altered and the Job structure added
  * to the job table.
  */
 static void
 JobExec(Job *job, char **argv)
+{
     int cpid;			/* ID of new child */
     sigset_t	  mask;
     job->flags &= ~JOB_TRACED;
     if (DEBUG(JOB)) {
 	int i;
 	debug_printf("Running %s %sly\n", job->node->name, "local");
 	debug_printf("\tCommand: ");
 	for (i = 0; argv[i] != NULL; i++) {
 	    debug_printf("%s ", argv[i]);
+	}
 	debug_printf("\n");
+    }
     /*
      * Some jobs produce no output and it's disconcerting to have
      * no feedback of their running (since they produce no output, the
      * banner with their name in it never appears). This is an attempt to
      * provide that feedback, even if nothing follows it.
      */
     if ((lastNode != job->node) && !(job->flags & JOB_SILENT)) {
 	MESSAGE(stdout, job->node);
 	lastNode = job->node;
+    }
     /* No interruptions until this job is on the `jobs' list */
     JobSigLock(&mask);
     /* Pre-emptively mark job running, pid still zero though */
     job->job_state = JOB_ST_RUNNING;
     cpid = vFork();
     if (cpid == -1)
 	Punt("Cannot vfork: %s", strerror(errno));
     if (cpid == 0) {
 	/* Child */
 	sigset_t tmask;
 #ifdef USE_META
 	if (useMeta) {
 	    meta_job_child(job);
+	}
 #endif
 	/*
 	 * Reset all signal handlers; this is necessary because we also
 	 * need to unblock signals before we exec(2).
 	 */
 	JobSigReset();
 	/* Now unblock signals */
 	sigemptyset(&tmask);
 	JobSigUnlock(&tmask);
 	/*
 	 * Must duplicate the input stream down to the child's input and
 	 * reset it to the beginning (again). Since the stream was marked
 	 * close-on-exec, we must clear that bit in the new input.
 	 */
 	if (dup2(fileno(job->cmdFILE), 0) == -1)
 	    execDie("dup2", "job->cmdFILE");
 	if (fcntl(0, F_SETFD, 0) == -1)
 	    execDie("fcntl clear close-on-exec", "stdin");
 	if (lseek(0, (off_t)0, SEEK_SET) == -1)
 	    execDie("lseek to 0", "stdin");
 	if (job->node->type & (OP_MAKE | OP_SUBMAKE)) {
 		/*
 		 * Pass job token pipe to submakes.
 		 */
 		if (fcntl(tokenWaitJob.inPipe, F_SETFD, 0) == -1)
 		    execDie("clear close-on-exec", "tokenWaitJob.inPipe");
 		if (fcntl(tokenWaitJob.outPipe, F_SETFD, 0) == -1)
 		    execDie("clear close-on-exec", "tokenWaitJob.outPipe");
+	}
 	/*
 	 * Set up the child's output to be routed through the pipe
 	 * we've created for it.
 	 */
 	if (dup2(job->outPipe, 1) == -1)
 	    execDie("dup2", "job->outPipe");
 	/*
 	 * The output channels are marked close on exec. This bit was
 	 * duplicated by the dup2(on some systems), so we have to clear
 	 * it before routing the shell's error output to the same place as
 	 * its standard output.
 	 */
 	if (fcntl(1, F_SETFD, 0) == -1)
 	    execDie("clear close-on-exec", "stdout");
 	if (dup2(1, 2) == -1)
 	    execDie("dup2", "1, 2");
 	/*
 	 * We want to switch the child into a different process family so
 	 * we can kill it and all its descendants in one fell swoop,
 	 * by killing its process family, but not commit suicide.
 	 */
 #if defined(MAKE_NATIVE) || defined(HAVE_SETPGID)
 #if defined(SYSV)
 	/* XXX: dsl - I'm sure this should be setpgrp()... */
 	(void)setsid();
 #else
 	(void)setpgid(0, getpid());
 #endif
 #endif
 	Var_ExportVars();
 	(void)execv(shellPath, argv);
 	execDie("exec", shellPath);
+    }
     /* Parent, continuing after the child exec */
     job->pid = cpid;
     Trace_Log(JOBSTART, job);
 #ifdef USE_META
     if (useMeta) {
 	meta_job_parent(job, cpid);
+    }
 #endif
     /*
      * Set the current position in the buffer to the beginning
      * and mark another stream to watch in the outputs mask
      */
     job->curPos = 0;
     watchfd(job);
     if (job->cmdFILE != NULL && job->cmdFILE != stdout) {
 	(void)fclose(job->cmdFILE);
 	job->cmdFILE = NULL;
+    }
     /*
      * Now the job is actually running, add it to the table.
      */
     if (DEBUG(JOB)) {
 	debug_printf("JobExec(%s): pid %d added to jobs table\n",
 		     job->node->name, job->pid);
 	job_table_dump("job started");
+    }
     JobSigUnlock(&mask);
+}
 /* Create the argv needed to execute the shell for a given job. */
 static void
 JobMakeArgv(Job *job, char **argv)
+{
     int argc;
     static char args[10];	/* For merged arguments */
     argv[0] = UNCONST(shellName);
     argc = 1;
     if ((commandShell->exit && commandShell->exit[0] != '-') ||
 	(commandShell->echo && commandShell->echo[0] != '-'))
+    {
 	/*
 	 * At least one of the flags doesn't have a minus before it, so
 	 * merge them together. Have to do this because the *(&(@*#*&#$#
 	 * Bourne shell thinks its second argument is a file to source.
 	 * Grrrr. Note the ten-character limitation on the combined arguments.
 	 */
 	(void)snprintf(args, sizeof(args), "-%s%s",
 		      ((job->flags & JOB_IGNERR) ? "" :
 		       (commandShell->exit ? commandShell->exit : "")),
 		      ((job->flags & JOB_SILENT) ? "" :
 		       (commandShell->echo ? commandShell->echo : "")));
 	if (args[1]) {
 	    argv[argc] = args;
 	    argc++;
+	}
     } else {
 	if (!(job->flags & JOB_IGNERR) && commandShell->exit) {
 	    argv[argc] = UNCONST(commandShell->exit);
 	    argc++;
+	}
 	if (!(job->flags & JOB_SILENT) && commandShell->echo) {
 	    argv[argc] = UNCONST(commandShell->echo);
 	    argc++;
+	}
+    }
     argv[argc] = NULL;
+}
 /*-
  *-----------------------------------------------------------------------
  * JobStart  --
  *	Start a target-creation process going for the target described
  *	by the graph node gn.
+ *
  * Input:
  *	gn		target to create
  *	flags		flags for the job to override normal ones.
  *			e.g. JOB_SPECIAL or JOB_IGNDOTS
  *	previous	The previous Job structure for this node, if any.
+ *
  * Results:
  *	JOB_ERROR if there was an error in the commands, JOB_FINISHED
  *	if there isn't actually anything left to do for the job and
  *	JOB_RUNNING if the job has been started.
+ *
  * Side Effects:
  *	A new Job node is created and added to the list of running
  *	jobs. PMake is forked and a child shell created.
+ *
  * NB: I'm fairly sure that this code is never called with JOB_SPECIAL set
  *     JOB_IGNDOTS is never set (dsl)
  *     Also the return value is ignored by everyone.
  *-----------------------------------------------------------------------
  */
 static JobStartResult
 JobStart(GNode *gn, int flags)
+{
     Job *job;			/* new job descriptor */
     char *argv[10];		/* Argument vector to shell */
     Boolean cmdsOK;		/* true if the nodes commands were all right */
     Boolean noExec;		/* Set true if we decide not to run the job */
     int tfd;			/* File descriptor to the temp file */
     for (job = job_table; job < job_table_end; job++) {
 	if (job->job_state == JOB_ST_FREE)
 	    break;
+    }
     if (job >= job_table_end)
 	Punt("JobStart no job slots vacant");
     memset(job, 0, sizeof *job);
     job->job_state = JOB_ST_SETUP;
     if (gn->type & OP_SPECIAL)
 	flags |= JOB_SPECIAL;
     job->node = gn;
     job->tailCmds = NULL;
     /*
      * Set the initial value of the flags for this job based on the global
      * ones and the node's attributes... Any flags supplied by the caller
      * are also added to the field.
      */
     job->flags = 0;
     if (Targ_Ignore(gn)) {
 	job->flags |= JOB_IGNERR;
+    }
     if (Targ_Silent(gn)) {
 	job->flags |= JOB_SILENT;
+    }
     job->flags |= flags;
     /*
      * Check the commands now so any attributes from .DEFAULT have a chance
      * to migrate to the node
      */
     cmdsOK = Job_CheckCommands(gn, Error);
     job->inPollfd = NULL;
     /*
      * If the -n flag wasn't given, we open up OUR (not the child's)
      * temporary file to stuff commands in it. The thing is rd/wr so we don't
      * need to reopen it to feed it to the shell. If the -n flag *was* given,
      * we just set the file to be stdout. Cute, huh?
      */
     if (((gn->type & OP_MAKE) && !opts.noRecursiveExecute) ||
 	    (!opts.noExecute && !opts.touchFlag)) {
 	/*
 	 * tfile is the name of a file into which all shell commands are
 	 * put. It is removed before the child shell is executed, unless
 	 * DEBUG(SCRIPT) is set.
 	 */
 	char *tfile;
 	sigset_t mask;
 	/*
 	 * We're serious here, but if the commands were bogus, we're
 	 * also dead...
 	 */
 	if (!cmdsOK) {
 	    PrintOnError(gn, NULL);	/* provide some clue */
 	    DieHorribly();
+	}
 	JobSigLock(&mask);
 	tfd = mkTempFile(TMPPAT, &tfile);
 	if (!DEBUG(SCRIPT))
 		(void)eunlink(tfile);
 	JobSigUnlock(&mask);
 	job->cmdFILE = fdopen(tfd, "w+");
 	if (job->cmdFILE == NULL) {
 	    Punt("Could not fdopen %s", tfile);
+	}
 	(void)fcntl(fileno(job->cmdFILE), F_SETFD, FD_CLOEXEC);
 	/*
 	 * Send the commands to the command file, flush all its buffers then
 	 * rewind and remove the thing.
 	 */
 	noExec = FALSE;
 #ifdef USE_META
 	if (useMeta) {
 	    meta_job_start(job, gn);
 	    if (Targ_Silent(gn)) {	/* might have changed */
 		job->flags |= JOB_SILENT;
+	    }
+	}
 #endif
 	/*
 	 * We can do all the commands at once. hooray for sanity
 	 */
 	numCommands = 0;
 	JobPrintCommands(job);
 	/*
 	 * If we didn't print out any commands to the shell script,
 	 * there's not much point in executing the shell, is there?
 	 */
 	if (numCommands == 0) {
 	    noExec = TRUE;
+	}
 	free(tfile);
-    } else if (NoExecute(gn)) {
+    } else if (!GNode_ShouldExecute(gn)) {
 	/*
 	 * Not executing anything -- just print all the commands to stdout
 	 * in one fell swoop. This will still set up job->tailCmds correctly.
 	 */
 	if (lastNode != gn) {
 	    MESSAGE(stdout, gn);
 	    lastNode = gn;
+	}
 	job->cmdFILE = stdout;
 	/*
 	 * Only print the commands if they're ok, but don't die if they're
 	 * not -- just let the user know they're bad and keep going. It
 	 * doesn't do any harm in this case and may do some good.
 	 */
 	if (cmdsOK)
 	    JobPrintCommands(job);
 	/*
 	 * Don't execute the shell, thank you.
 	 */
 	noExec = TRUE;
     } else {
 	/*
 	 * Just touch the target and note that no shell should be executed.
 	 * Set cmdFILE to stdout to make life easier. Check the commands, too,
 	 * but don't die if they're no good -- it does no harm to keep working
 	 * up the graph.
 	 */
 	job->cmdFILE = stdout;
 	Job_Touch(gn, job->flags&JOB_SILENT);
 	noExec = TRUE;
+    }
     /* Just in case it isn't already... */
     (void)fflush(job->cmdFILE);
     /*
      * If we're not supposed to execute a shell, don't.
      */
     if (noExec) {
 	if (!(job->flags & JOB_SPECIAL))
 	    Job_TokenReturn();
 	/*
 	 * Unlink and close the command file if we opened one
 	 */
 	if (job->cmdFILE != stdout) {
 	    if (job->cmdFILE != NULL) {
 		(void)fclose(job->cmdFILE);
 		job->cmdFILE = NULL;
+	    }
+	}
 	/*
 	 * We only want to work our way up the graph if we aren't here because
 	 * the commands for the job were no good.
 	 */
 	if (cmdsOK && aborting == ABORT_NONE) {
 	    JobSaveCommands(job);
 	    job->node->made = MADE;
 	    Make_Update(job->node);
+	}
 	job->job_state = JOB_ST_FREE;
 	return cmdsOK ? JOB_FINISHED : JOB_ERROR;
+    }
     /*
      * Set up the control arguments to the shell. This is based on the flags
      * set earlier for this job.
      */
     JobMakeArgv(job, argv);
     /* Create the pipe by which we'll get the shell's output.  */
     JobCreatePipe(job, 3);
     JobExec(job, argv);
     return JOB_RUNNING;
+}
 static char *
 JobOutput(Job *job, char *cp, char *endp)
+{
     char *ecp;
     if (commandShell->noPrint && commandShell->noPrint[0] != '\0') {
 	while ((ecp = strstr(cp, commandShell->noPrint)) != NULL) {
 	    if (cp != ecp) {
 		*ecp = '\0';
 		/*
 		 * The only way there wouldn't be a newline after
 		 * this line is if it were the last in the buffer.
 		 * however, since the non-printable comes after it,
 		 * there must be a newline, so we don't print one.
 		 */
 		(void)fprintf(stdout, "%s", cp);
 		(void)fflush(stdout);
+	    }
 	    cp = ecp + commandShell->noPrintLen;
 	    if (cp != endp) {
 		/*
 		 * Still more to print, look again after skipping
 		 * the whitespace following the non-printable
 		 * command....
 		 */
 		cp++;
 		while (*cp == ' ' || *cp == '\t' || *cp == '\n') {
 		    cp++;
+		}
 	    } else {
 		return cp;
+	    }
+	}
+    }
     return cp;
+}
 /*-
  *-----------------------------------------------------------------------
  * JobDoOutput  --
  *	This function is called at different times depending on
  *	whether the user has specified that output is to be collected
  *	via pipes or temporary files. In the former case, we are called
  *	whenever there is something to read on the pipe. We collect more
  *	output from the given job and store it in the job's outBuf. If
  *	this makes up a line, we print it tagged by the job's identifier,
  *	as necessary.
  *	If output has been collected in a temporary file, we open the
  *	file and read it line by line, transferring it to our own
  *	output channel until the file is empty. At which point we
  *	remove the temporary file.
  *	In both cases, however, we keep our figurative eye out for the
  *	'noPrint' line for the shell from which the output came. If
  *	we recognize a line, we don't print it. If the command is not
  *	alone on the line (the character after it is not \0 or \n), we
  *	do print whatever follows it.
+ *
  * Input:
  *	job		the job whose output needs printing
  *	finish		TRUE if this is the last time we'll be called
  *			for this job
+ *
  * Side Effects:
  *	curPos may be shifted as may the contents of outBuf.
  *-----------------------------------------------------------------------
  */
 static void
 JobDoOutput(Job *job, Boolean finish)
+{
     Boolean gotNL = FALSE;	/* true if got a newline */
     Boolean fbuf;		/* true if our buffer filled up */
     size_t nr;			/* number of bytes read */
     size_t i;			/* auxiliary index into outBuf */
     size_t max;			/* limit for i (end of current data) */
     ssize_t nRead;		/* (Temporary) number of bytes read */
     /*
      * Read as many bytes as will fit in the buffer.
      */
 end_loop:
     gotNL = FALSE;
     fbuf = FALSE;
     nRead = read(job->inPipe, &job->outBuf[job->curPos],
 		     JOB_BUFSIZE - job->curPos);
     if (nRead < 0) {
 	if (errno == EAGAIN)
 	    return;
 	if (DEBUG(JOB)) {
 	    perror("JobDoOutput(piperead)");
+	}
 	nr = 0;
     } else {
 	nr = (size_t)nRead;
+    }
     /*
      * If we hit the end-of-file (the job is dead), we must flush its
      * remaining output, so pretend we read a newline if there's any
      * output remaining in the buffer.
      * Also clear the 'finish' flag so we stop looping.
      */
     if ((nr == 0) && (job->curPos != 0)) {
 	job->outBuf[job->curPos] = '\n';
 	nr = 1;
 	finish = FALSE;
     } else if (nr == 0) {
 	finish = FALSE;
+    }
     /*
      * Look for the last newline in the bytes we just got. If there is
      * one, break out of the loop with 'i' as its index and gotNL set
      * TRUE.
      */
     max = job->curPos + nr;
     for (i = job->curPos + nr - 1; i >= job->curPos && i != (size_t)-1; i--) {
 	if (job->outBuf[i] == '\n') {
 	    gotNL = TRUE;
 	    break;
 	} else if (job->outBuf[i] == '\0') {
 	    /*
 	     * Why?
 	     */
 	    job->outBuf[i] = ' ';
+	}
+    }
     if (!gotNL) {
 	job->curPos += nr;
 	if (job->curPos == JOB_BUFSIZE) {
 	    /*
 	     * If we've run out of buffer space, we have no choice
 	     * but to print the stuff. sigh.
 	     */
 	    fbuf = TRUE;
 	    i = job->curPos;
+	}
+    }
     if (gotNL || fbuf) {
 	/*
 	 * Need to send the output to the screen. Null terminate it
 	 * first, overwriting the newline character if there was one.
 	 * So long as the line isn't one we should filter (according
 	 * to the shell description), we print the line, preceded
 	 * by a target banner if this target isn't the same as the
 	 * one for which we last printed something.
 	 * The rest of the data in the buffer are then shifted down
 	 * to the start of the buffer and curPos is set accordingly.
 	 */
 	job->outBuf[i] = '\0';
 	if (i >= job->curPos) {
 	    char *cp;
 	    cp = JobOutput(job, job->outBuf, &job->outBuf[i]);
 	    /*
 	     * There's still more in that thar buffer. This time, though,
 	     * we know there's no newline at the end, so we add one of
 	     * our own free will.
 	     */
 	    if (*cp != '\0') {
 		if (!opts.beSilent && job->node != lastNode) {
 		    MESSAGE(stdout, job->node);
 		    lastNode = job->node;
+		}
 #ifdef USE_META
 		if (useMeta) {
 		    meta_job_output(job, cp, gotNL ? "\n" : "");
+		}
 #endif
 		(void)fprintf(stdout, "%s%s", cp, gotNL ? "\n" : "");
 		(void)fflush(stdout);
+	    }
+	}
 	/*
 	 * max is the last offset still in the buffer. Move any remaining
 	 * characters to the start of the buffer and update the end marker
 	 * curPos.
 	 */
 	if (i < max) {
 	    (void)memmove(job->outBuf, &job->outBuf[i + 1], max - (i + 1));
 	    job->curPos = max - (i + 1);
 	} else {
 	    assert(i == max);
 	    job->curPos = 0;
+	}
+    }
     if (finish) {
 	/*
 	 * If the finish flag is true, we must loop until we hit
 	 * end-of-file on the pipe. This is guaranteed to happen
 	 * eventually since the other end of the pipe is now closed
 	 * (we closed it explicitly and the child has exited). When
 	 * we do get an EOF, finish will be set FALSE and we'll fall
 	 * through and out.
 	 */
 	goto end_loop;
+    }
+}
 static void
 JobRun(GNode *targ)
+{
 #if 0
     /*
      * Unfortunately it is too complicated to run .BEGIN, .END, and
      * .INTERRUPT job in the parallel job module.  As of 2020-09-25,
      * unit-tests/deptgt-end-jobs.mk hangs in an endless loop.
+     *
      * Running these jobs in compat mode also guarantees that these
      * jobs do not overlap with other unrelated jobs.
      */
     List *lst = Lst_New();
     Lst_Append(lst, targ);
     (void)Make_Run(lst);
     Lst_Destroy(lst, NULL);
     JobStart(targ, JOB_SPECIAL);
     while (jobTokensRunning) {
 	Job_CatchOutput();
+    }
 #else
     Compat_Make(targ, targ);
     if (targ->made == ERROR) {
 	PrintOnError(targ, "\n\nStop.");
 	exit(1);
+    }
 #endif
+}
 /* Handle the exit of a child. Called from Make_Make.
+ *
  * The job descriptor is removed from the list of children.
+ *
  * Notes:
  *	We do waits, blocking or not, according to the wisdom of our
  *	caller, until there are no more children to report. For each
  *	job, call JobFinish to finish things off.
  */
 void
 Job_CatchChildren(void)
+{
     int pid;			/* pid of dead child */
     int status;			/* Exit/termination status */
     /*
      * Don't even bother if we know there's no one around.
      */
     if (jobTokensRunning == 0)
 	return;
     while ((pid = waitpid((pid_t) -1, &status, WNOHANG | WUNTRACED)) > 0) {
 	DEBUG2(JOB, "Process %d exited/stopped status %x.\n", pid, status);
 	JobReapChild(pid, status, TRUE);
+    }
+}
 /*
  * It is possible that wait[pid]() was called from elsewhere,
  * this lets us reap jobs regardless.
  */
 void
 JobReapChild(pid_t pid, int status, Boolean isJobs)
+{
     Job *job;			/* job descriptor for dead child */
     /*
      * Don't even bother if we know there's no one around.
      */
     if (jobTokensRunning == 0)
 	return;
     job = JobFindPid(pid, JOB_ST_RUNNING, isJobs);
     if (job == NULL) {
 	if (isJobs) {
 	    if (!lurking_children)
 		Error("Child (%d) status %x not in table?", pid, status);
+	}
 	return;				/* not ours */
+    }
     if (WIFSTOPPED(status)) {
 	DEBUG2(JOB, "Process %d (%s) stopped.\n", job->pid, job->node->name);
 	if (!make_suspended) {
 	    switch (WSTOPSIG(status)) {
 	    case SIGTSTP:
 		(void)printf("*** [%s] Suspended\n", job->node->name);
 		break;
 	    case SIGSTOP:
 		(void)printf("*** [%s] Stopped\n", job->node->name);
 		break;
 	    default:
 		(void)printf("*** [%s] Stopped -- signal %d\n",
 			     job->node->name, WSTOPSIG(status));
+	    }
 	    job->job_suspended = 1;
+	}
 	(void)fflush(stdout);
 	return;
+    }
     job->job_state = JOB_ST_FINISHED;
     job->exit_status = status;
     JobFinish(job, status);
+}
 /* Catch the output from our children, if we're using pipes do so. Otherwise
  * just block time until we get a signal(most likely a SIGCHLD) since there's
  * no point in just spinning when there's nothing to do and the reaping of a
  * child can wait for a while. */
 void
 Job_CatchOutput(void)
+{
     int nready;
     Job *job;
     unsigned int i;
     (void)fflush(stdout);
     /* The first fd in the list is the job token pipe */
     do {
 	nready = poll(fds + 1 - wantToken, nfds - 1 + wantToken, 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");
 	case -1:
 	    Punt("token pipe read: %s", strerror(errno));
 	case 1:
 	    if (token == DO_JOB_RESUME[0])
 		/* Complete relay requested from our SIGCONT handler */
 		JobRestartJobs();
 	    break;
 	default:
 	    abort();
+	}
 	--nready;
+    }
     Job_CatchChildren();
     if (nready == 0)
 	return;
     for (i = npseudojobs * nfds_per_job(); i < nfds; i++) {
 	if (!fds[i].revents)
 	    continue;
 	job = jobfds[i];
 	if (job->job_state == JOB_ST_RUNNING)
 	    JobDoOutput(job, FALSE);
 #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV)
 	/*
 	 * With meta mode, we may have activity on the job's filemon
 	 * descriptor too, which at the moment is any pollfd other than
 	 * job->inPollfd.
 	 */
 	if (useMeta && job->inPollfd != &fds[i]) {
 	    if (meta_job_event(job) <= 0) {
 		fds[i].events = 0; /* never mind */
+	    }
+	}
 #endif
 	if (--nready == 0)
 	    return;
+    }
+}
 /* Start the creation of a target. Basically a front-end for JobStart used by
  * the Make module. */
 void
 Job_Make(GNode *gn)
+{
     (void)JobStart(gn, 0);
+}
 void
 Shell_Init(void)
+{
     if (shellPath == NULL) {
 	/*
 	 * We are using the default shell, which may be an absolute
 	 * path if DEFSHELL_CUSTOM is defined.
 	 */
 	shellName = commandShell->name;
 #ifdef DEFSHELL_CUSTOM
 	if (*shellName == '/') {
 	    shellPath = shellName;
 	    shellName = strrchr(shellPath, '/');
 	    shellName++;
 	} else
 #endif
 	shellPath = str_concat3(_PATH_DEFSHELLDIR, "/", shellName);
+    }
     Var_Set_with_flags(".SHELL", shellPath, VAR_CMDLINE, VAR_SET_READONLY);
     if (commandShell->exit == NULL) {
 	commandShell->exit = "";
+    }
     if (commandShell->echo == NULL) {
 	commandShell->echo = "";
+    }
     if (commandShell->hasErrCtl && commandShell->exit[0] != '\0') {
 	if (shellErrFlag &&
 	    strcmp(commandShell->exit, &shellErrFlag[1]) != 0) {
 	    free(shellErrFlag);
 	    shellErrFlag = NULL;
+	}
 	if (!shellErrFlag) {
 	    size_t n = strlen(commandShell->exit) + 2;
 	    shellErrFlag = bmake_malloc(n);
 	    if (shellErrFlag) {
 		snprintf(shellErrFlag, n, "-%s", commandShell->exit);
+	    }
+	}
     } else if (shellErrFlag) {
 	free(shellErrFlag);
 	shellErrFlag = NULL;
+    }
+}
 /* Return the string literal that is used in the current command shell
  * to produce a newline character. */
 const char *
 Shell_GetNewline(void)
+{
     return commandShell->newline;
+}
 void
 Job_SetPrefix(void)
+{
     if (targPrefix) {
 	free(targPrefix);
     } else if (!Var_Exists(MAKE_JOB_PREFIX, VAR_GLOBAL)) {
 	Var_Set(MAKE_JOB_PREFIX, "---", VAR_GLOBAL);
+    }
     (void)Var_Subst("${" MAKE_JOB_PREFIX "}",
 		    VAR_GLOBAL, VARE_WANTRES, &targPrefix);
     /* TODO: handle errors */
+}
 /* Initialize the process module. */
 void
 Job_Init(void)
+{
     Job_SetPrefix();
     /* Allocate space for all the job info */
     job_table = bmake_malloc((size_t)opts.maxJobs * sizeof *job_table);
     memset(job_table, 0, (size_t)opts.maxJobs * sizeof *job_table);
     job_table_end = job_table + opts.maxJobs;
     wantToken =	0;
     aborting = ABORT_NONE;
     errors = 0;
     lastNode = NULL;
     /*
      * There is a non-zero chance that we already have children.
      * eg after 'make -f- <<EOF'
      * Since their termination causes a 'Child (pid) not in table' message,
      * Collect the status of any that are already dead, and suppress the
      * error message if there are any undead ones.
      */
     for (;;) {
 	int rval, status;
 	rval = waitpid((pid_t) -1, &status, WNOHANG);
 	if (rval > 0)
 	    continue;
 	if (rval == 0)
 	    lurking_children = 1;
 	break;
+    }
     Shell_Init();
     JobCreatePipe(&childExitJob, 3);
     /* Preallocate enough for the maximum number of jobs.  */
     fds = bmake_malloc(sizeof(*fds) *
 	(npseudojobs + (size_t)opts.maxJobs) * nfds_per_job());
     jobfds = bmake_malloc(sizeof(*jobfds) *
 	(npseudojobs + (size_t)opts.maxJobs) * nfds_per_job());
     /* These are permanent entries and take slots 0 and 1 */
     watchfd(&tokenWaitJob);
     watchfd(&childExitJob);
     sigemptyset(&caught_signals);
     /*
      * Install a SIGCHLD handler.
      */
     (void)bmake_signal(SIGCHLD, JobChildSig);
     sigaddset(&caught_signals, SIGCHLD);
 #define ADDSIG(s,h)				\
     if (bmake_signal(s, SIG_IGN) != SIG_IGN) {	\
 	sigaddset(&caught_signals, s);		\
 	(void)bmake_signal(s, h);		\
+    }
     /*
      * Catch the four signals that POSIX specifies if they aren't ignored.
      * JobPassSig will take care of calling JobInterrupt if appropriate.
      */
     ADDSIG(SIGINT, JobPassSig_int)
     ADDSIG(SIGHUP, JobPassSig_term)
     ADDSIG(SIGTERM, JobPassSig_term)
     ADDSIG(SIGQUIT, JobPassSig_term)
     /*
      * There are additional signals that need to be caught and passed if
      * either the export system wants to be told directly of signals or if
      * we're giving each job its own process group (since then it won't get
      * signals from the terminal driver as we own the terminal)
      */
     ADDSIG(SIGTSTP, JobPassSig_suspend)
     ADDSIG(SIGTTOU, JobPassSig_suspend)
     ADDSIG(SIGTTIN, JobPassSig_suspend)
     ADDSIG(SIGWINCH, JobCondPassSig)
     ADDSIG(SIGCONT, JobContinueSig)
 #undef ADDSIG
     (void)Job_RunTarget(".BEGIN", NULL);
     /* Create the .END node now, even though no code in the unit tests
      * depends on it.  See also Targ_GetEndNode in Compat_Run. */
     (void)Targ_GetEndNode();
+}
 static void JobSigReset(void)
+{
 #define DELSIG(s)					\
     if (sigismember(&caught_signals, s)) {		\
 	(void)bmake_signal(s, SIG_DFL);			\
+    }
     DELSIG(SIGINT)
     DELSIG(SIGHUP)
     DELSIG(SIGQUIT)
     DELSIG(SIGTERM)
     DELSIG(SIGTSTP)
     DELSIG(SIGTTOU)
     DELSIG(SIGTTIN)
     DELSIG(SIGWINCH)
     DELSIG(SIGCONT)
 #undef DELSIG
     (void)bmake_signal(SIGCHLD, SIG_DFL);
+}
 /* Find a shell in 'shells' given its name, or return NULL. */
 static Shell *
 JobMatchShell(const char *name)
+{
     Shell *sh = shells;
     const Shell *shellsEnd = sh + sizeof shells / sizeof shells[0];
     for (sh = shells; sh < shellsEnd; sh++) {
 	if (strcmp(name, sh->name) == 0)
 		return sh;
+    }
     return NULL;
+}
 /*-
  *-----------------------------------------------------------------------
  * Job_ParseShell --
  *	Parse a shell specification and set up commandShell, shellPath
  *	and shellName appropriately.
+ *
  * Input:
  *	line		The shell spec
+ *
  * Results:
  *	FALSE if the specification was incorrect.
+ *
  * Side Effects:
  *	commandShell points to a Shell structure (either predefined or
  *	created from the shell spec), shellPath is the full path of the
  *	shell described by commandShell, while shellName is just the
  *	final component of shellPath.
+ *
  * Notes:
  *	A shell specification consists of a .SHELL target, with dependency
  *	operator, followed by a series of blank-separated words. Double
  *	quotes can be used to use blanks in words. A backslash escapes
  *	anything (most notably a double-quote and a space) and
  *	provides the functionality it does in C. Each word consists of
  *	keyword and value separated by an equal sign. There should be no
  *	unnecessary spaces in the word. The keywords are as follows:
  *	    name	Name of shell.
  *	    path	Location of shell.
  *	    quiet	Command to turn off echoing.
  *	    echo	Command to turn echoing on
  *	    filter	Result of turning off echoing that shouldn't be
  *			printed.
  *	    echoFlag	Flag to turn echoing on at the start
  *	    errFlag	Flag to turn error checking on at the start
  *	    hasErrCtl	True if shell has error checking control
  *	    newline	String literal to represent a newline char
  *	    check	Command to turn on error checking if hasErrCtl
  *			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;
     pp_skip_whitespace(&line);
     free(shellArgv);
     memset(&newShell, 0, sizeof(newShell));
     /*
      * Parse the specification by keyword
      */
     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++) {
 	char *arg = *argv;
 	if (strncmp(arg, "path=", 5) == 0) {
 	    path = arg + 5;
 	} else if (strncmp(arg, "name=", 5) == 0) {
 	    newShell.name = arg + 5;
 	} else {
 	    if (strncmp(arg, "quiet=", 6) == 0) {
 		newShell.echoOff = arg + 6;
 	    } else if (strncmp(arg, "echo=", 5) == 0) {
 		newShell.echoOn = arg + 5;
 	    } else if (strncmp(arg, "filter=", 7) == 0) {
 		newShell.noPrint = arg + 7;
 		newShell.noPrintLen = strlen(newShell.noPrint);
 	    } else if (strncmp(arg, "echoFlag=", 9) == 0) {
 		newShell.echo = arg + 9;
 	    } else if (strncmp(arg, "errFlag=", 8) == 0) {
 		newShell.exit = arg + 8;
 	    } else if (strncmp(arg, "hasErrCtl=", 10) == 0) {
 		char c = arg[10];
 		newShell.hasErrCtl = c == 'Y' || c == 'y' ||
 				     c == 'T' || c == 't';
 	    } else if (strncmp(arg, "newline=", 8) == 0) {
 		newShell.newline = arg + 8;
 	    } else if (strncmp(arg, "check=", 6) == 0) {
 		newShell.errOnOrEcho = arg + 6;
 	    } else if (strncmp(arg, "ignore=", 7) == 0) {
 		newShell.errOffOrExecIgnore = arg + 7;
 	    } else if (strncmp(arg, "errout=", 7) == 0) {
 		newShell.errExit = arg + 7;
 	    } else if (strncmp(arg, "comment=", 8) == 0) {
 		newShell.commentChar = arg[8];
 	    } else {
 		Parse_Error(PARSE_FATAL, "Unknown keyword \"%s\"", arg);
 		free(words);
 		return FALSE;
+	    }
 	    fullSpec = TRUE;
+	}
+    }
     if (path == NULL) {
 	/*
 	 * If no path was given, the user wants one of the pre-defined shells,
 	 * yes? So we find the one s/he wants with the help of JobMatchShell
 	 * and set things up the right way. shellPath will be set up by
 	 * Shell_Init.
 	 */
 	if (newShell.name == NULL) {
 	    Parse_Error(PARSE_FATAL, "Neither path nor name specified");
 	    free(words);
 	    return FALSE;
 	} else {
 	    if ((sh = JobMatchShell(newShell.name)) == NULL) {
 		    Parse_Error(PARSE_WARNING, "%s: No matching shell",
 				newShell.name);
 		    free(words);
 		    return FALSE;
+	    }
 	    commandShell = sh;
 	    shellName = newShell.name;
 	    if (shellPath) {
 		/* Shell_Init has already been called!  Do it again. */
 		free(UNCONST(shellPath));
 		shellPath = NULL;
 		Shell_Init();
+	    }
+	}
     } else {
 	/*
 	 * The user provided a path. If s/he gave nothing else (fullSpec is
 	 * FALSE), try and find a matching shell in the ones we know of.
 	 * Else we just take the specification at its word and copy it
 	 * to a new location. In either case, we need to record the
 	 * path the user gave for the shell.
 	 */
 	shellPath = path;
 	path = strrchr(path, '/');
 	if (path == NULL) {
 	    path = UNCONST(shellPath);
 	} else {
 	    path++;
+	}
 	if (newShell.name != NULL) {
 	    shellName = newShell.name;
 	} else {
 	    shellName = path;
+	}
 	if (!fullSpec) {
 	    if ((sh = JobMatchShell(shellName)) == NULL) {
 		    Parse_Error(PARSE_WARNING, "%s: No matching shell",
 				shellName);
 		    free(words);
 		    return FALSE;
+	    }
 	    commandShell = sh;
 	} else {
 	    commandShell = bmake_malloc(sizeof(Shell));
 	    *commandShell = newShell;
+	}
 	/* this will take care of shellErrFlag */
 	Shell_Init();
+    }
     if (commandShell->echoOn && commandShell->echoOff) {
 	commandShell->hasEchoCtl = TRUE;
+    }
     if (!commandShell->hasErrCtl) {
 	if (commandShell->errOnOrEcho == NULL) {
 	    commandShell->errOnOrEcho = "";
+	}
 	if (commandShell->errOffOrExecIgnore == NULL) {
 	    commandShell->errOffOrExecIgnore = "%s\n";
+	}
+    }
     /*
      * Do not free up the words themselves, since they might be in use by the
      * shell specification.
      */
     free(words);
     return TRUE;
+}
 /* Handle the receipt of an interrupt.
+ *
  * All children are killed. Another job will be started if the .INTERRUPT
  * target is defined.
+ *
  * Input:
  *	runINTERRUPT	Non-zero if commands for the .INTERRUPT target
  *			should be executed
  *	signo		signal received
  */
 static void
 JobInterrupt(int runINTERRUPT, int signo)
+{
     Job		*job;		/* job descriptor in that element */
     GNode	*interrupt;	/* the node describing the .INTERRUPT target */
     sigset_t	mask;
     GNode	*gn;
     aborting = ABORT_INTERRUPT;
     JobSigLock(&mask);
     for (job = job_table; job < job_table_end; job++) {
 	if (job->job_state != JOB_ST_RUNNING)
 	    continue;
 	gn = job->node;
 	JobDeleteTarget(gn);
 	if (job->pid) {
 	    DEBUG2(JOB, "JobInterrupt passing signal %d to child %d.\n",
 		   signo, job->pid);
 	    KILLPG(job->pid, signo);
+	}
+    }
     JobSigUnlock(&mask);
     if (runINTERRUPT && !opts.touchFlag) {
 	interrupt = Targ_FindNode(".INTERRUPT");
 	if (interrupt != NULL) {
 	    opts.ignoreErrors = FALSE;
 	    JobRun(interrupt);
+	}
+    }
     Trace_Log(MAKEINTR, 0);
     exit(signo);
+}
 /* Do the final processing, i.e. run the commands attached to the .END target.
+ *
  * Return the number of errors reported. */
 int
 Job_Finish(void)
+{
     GNode *endNode = Targ_GetEndNode();
     if (!Lst_IsEmpty(endNode->commands) || !Lst_IsEmpty(endNode->children)) {
 	if (errors) {
 	    Error("Errors reported so .END ignored");
 	} else {
 	    JobRun(endNode);
+	}
+    }
     return errors;
+}
 /* Clean up any memory used by the jobs module. */
 void
 Job_End(void)
+{
 #ifdef CLEANUP
     free(shellArgv);
 #endif
+}
 /* Waits for all running jobs to finish and returns.
  * Sets 'aborting' to ABORT_WAIT to prevent other jobs from starting. */
 void
 Job_Wait(void)
+{
     aborting = ABORT_WAIT;
     while (jobTokensRunning != 0) {
 	Job_CatchOutput();
+    }
     aborting = ABORT_NONE;
+}
 /* Abort all currently running jobs without handling output or anything.
  * This function is to be called only in the event of a major error.
  * Most definitely NOT to be called from JobInterrupt.
+ *
  * All children are killed, not just the firstborn. */
 void
 Job_AbortAll(void)
+{
     Job		*job;	/* the job descriptor in that element */
     int		foo;
     aborting = ABORT_ERROR;
     if (jobTokensRunning) {
 	for (job = job_table; job < job_table_end; job++) {
 	    if (job->job_state != JOB_ST_RUNNING)
 		continue;
 	    /*
 	     * kill the child process with increasingly drastic signals to make
 	     * darn sure it's dead.
 	     */
 	    KILLPG(job->pid, SIGINT);
 	    KILLPG(job->pid, SIGKILL);
+	}
+    }
     /*
      * Catch as many children as want to report in at first, then give up
      */
     while (waitpid((pid_t) -1, &foo, WNOHANG) > 0)
 	continue;
+}
 /* Tries to restart stopped jobs if there are slots available.
  * Called in process context in response to a SIGCONT. */
 static void
 JobRestartJobs(void)
+{
     Job *job;
     for (job = job_table; job < job_table_end; job++) {
 	if (job->job_state == JOB_ST_RUNNING &&
 		(make_suspended || job->job_suspended)) {
 	    DEBUG1(JOB, "Restarting stopped job pid %d.\n", job->pid);
 	    if (job->job_suspended) {
 		    (void)printf("*** [%s] Continued\n", job->node->name);
 		    (void)fflush(stdout);
+	    }
 	    job->job_suspended = 0;
 	    if (KILLPG(job->pid, SIGCONT) != 0 && DEBUG(JOB)) {
 		debug_printf("Failed to send SIGCONT to %d\n", job->pid);
+	    }
+	}
 	if (job->job_state == JOB_ST_FINISHED)
 	    /* Job exit deferred after calling waitpid() in a signal handler */
 	    JobFinish(job, job->exit_status);
+    }
     make_suspended = 0;
+}
 static void
 watchfd(Job *job)

 @@ -1,1361 +1,1361 @@
-/*	$NetBSD: make.c,v 1.185 2020/10/31 18:41:07 rillig Exp $	*/
+/*	$NetBSD: make.c,v 1.186 2020/11/01 17:47:26 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.
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
  */
 /*
  * Copyright (c) 1989 by Berkeley Softworks
  * 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.
  * 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
  */
 /*-
  * make.c --
  *	The functions which perform the examination of targets and
  *	their suitability for creation
+ *
  * Interface:
  *	Make_Run	Initialize things for the module and recreate
  *			whatever needs recreating. Returns TRUE if
  *			work was (or would have been) done and FALSE
  *			otherwise.
+ *
  *	Make_Update	Update all parents of a given child. Performs
  *			various bookkeeping chores like the updating
  *			of the youngestChild field of the parent, filling
  *			of the IMPSRC context variable, etc. It will
  *			place the parent on the toBeMade queue if it
  *			should be.
+ *
  *	Make_TimeStamp	Function to set the parent's youngestChild field
  *			based on a child's modification time.
+ *
  *	Make_DoAllVar	Set up the various local variables for a
  *			target, including the .ALLSRC variable, making
  *			sure that any variable that needs to exist
  *			at the very least has the empty value.
+ *
  *	Make_OODate	Determine if a target is out-of-date.
+ *
  *	Make_HandleUse	See if a child is a .USE node for a parent
  *			and perform the .USE actions if so.
+ *
  *	Make_ExpandUse	Expand .USE nodes
  */
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 /*	"@(#)make.c	8.1 (Berkeley) 6/6/93"	*/
-MAKE_RCSID("$NetBSD: make.c,v 1.185 2020/10/31 18:41:07 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.186 2020/11/01 17:47:26 rillig Exp $");
 /* Sequence # to detect recursion. */
 static unsigned int checked = 1;
 /* The current fringe of the graph.
  * These are nodes which await examination by MakeOODate.
  * It is added to by Make_Update and subtracted from by MakeStartJobs */
 static GNodeList *toBeMade;
 static int MakeCheckOrder(void *, void *);
 static int MakeBuildParent(void *, void *);
 void
 debug_printf(const char *fmt, ...)
+{
     va_list args;
     va_start(args, fmt);
     vfprintf(opts.debug_file, fmt, args);
     va_end(args);
+}
 MAKE_ATTR_DEAD static void
 make_abort(GNode *gn, int line)
+{
     debug_printf("make_abort from line %d\n", line);
     Targ_PrintNode(gn, 2);
     Targ_PrintNodes(toBeMade, 2);
     Targ_PrintGraph(3);
     abort();
+}
 ENUM_VALUE_RTTI_8(GNodeMade,
 		  UNMADE, DEFERRED, REQUESTED, BEINGMADE,
 		  MADE, UPTODATE, ERROR, ABORTED);
 ENUM_FLAGS_RTTI_31(GNodeType,
 		   OP_DEPENDS, OP_FORCE, OP_DOUBLEDEP,
 		   /* OP_OPMASK is omitted since it combines other flags */
 		   OP_OPTIONAL, OP_USE, OP_EXEC, OP_IGNORE,
 		   OP_PRECIOUS, OP_SILENT, OP_MAKE, OP_JOIN,
 		   OP_MADE, OP_SPECIAL, OP_USEBEFORE, OP_INVISIBLE,
 		   OP_NOTMAIN, OP_PHONY, OP_NOPATH, OP_WAIT,
 		   OP_NOMETA, OP_META, OP_NOMETA_CMP, OP_SUBMAKE,
 		   OP_TRANSFORM, OP_MEMBER, OP_LIB, OP_ARCHV,
 		   OP_HAS_COMMANDS, OP_SAVE_CMDS, OP_DEPS_FOUND, OP_MARK);
 ENUM_FLAGS_RTTI_10(GNodeFlags,
 		   REMAKE, CHILDMADE, FORCE, DONE_WAIT,
 		   DONE_ORDER, FROM_DEPEND, DONE_ALLSRC, CYCLE,
 		   DONECYCLE, INTERNAL);
 void
 GNode_FprintDetails(FILE *f, const char *prefix, const GNode *gn,
 		    const char *suffix)
+{
     char type_buf[GNodeType_ToStringSize];
     char flags_buf[GNodeFlags_ToStringSize];
     fprintf(f, "%smade %s, type %s, flags %s%s",
 	    prefix,
 	    Enum_ValueToString(gn->made, GNodeMade_ToStringSpecs),
 	    Enum_FlagsToString(type_buf, sizeof type_buf,
 			       gn->type, GNodeType_ToStringSpecs),
 	    Enum_FlagsToString(flags_buf, sizeof flags_buf,
 			       gn->flags, GNodeFlags_ToStringSpecs),
 	    suffix);
+}
 Boolean
-NoExecute(GNode *gn)
+GNode_ShouldExecute(GNode *gn)
+{
-    return (gn->type & OP_MAKE) ? opts.noRecursiveExecute : opts.noExecute;
+    return !((gn->type & OP_MAKE) ? opts.noRecursiveExecute : opts.noExecute);
+}
 /* Update the youngest child of the node, according to the given child. */
 void
 Make_TimeStamp(GNode *pgn, GNode *cgn)
+{
     if (pgn->youngestChild == NULL || cgn->mtime > pgn->youngestChild->mtime) {
 	pgn->youngestChild = cgn;
+    }
+}
 /* See if the node is out of date with respect to its sources.
+ *
  * Used by Make_Run when deciding which nodes to place on the
  * toBeMade queue initially and by Make_Update to screen out .USE and
  * .EXEC nodes. In the latter case, however, any other sort of node
  * must be considered out-of-date since at least one of its children
  * will have been recreated.
+ *
  * The mtime field of the node and the youngestChild field of its parents
  * may be changed.
  */
 Boolean
 Make_OODate(GNode *gn)
+{
     Boolean         oodate;
     /*
      * Certain types of targets needn't even be sought as their datedness
      * doesn't depend on their modification time...
      */
     if ((gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC)) == 0) {
 	(void)Dir_MTime(gn, 1);
 	if (DEBUG(MAKE)) {
 	    if (gn->mtime != 0) {
 		debug_printf("modified %s...", Targ_FmtTime(gn->mtime));
 	    } else {
 		debug_printf("non-existent...");
+	    }
+	}
+    }
     /*
      * A target is remade in one of the following circumstances:
      *	its modification time is smaller than that of its youngest child and
      *	    it would actually be run (has commands or is not GNode_IsTarget)
      *	it's the object of a force operator
      *	it has no children, was on the lhs of an operator and doesn't exist
      *	    already.
+     *
      * Libraries are only considered out-of-date if the archive module says
      * they are.
+     *
      * These weird rules are brought to you by Backward-Compatibility and
      * the strange people who wrote 'Make'.
      */
     if (gn->type & (OP_USE|OP_USEBEFORE)) {
 	/*
 	 * If the node is a USE node it is *never* out of date
 	 * no matter *what*.
 	 */
 	DEBUG0(MAKE, ".USE node...");
 	oodate = FALSE;
     } else if ((gn->type & OP_LIB) &&
 	       ((gn->mtime==0) || Arch_IsLib(gn))) {
 	DEBUG0(MAKE, "library...");
 	/*
 	 * always out of date if no children and :: target
 	 * or non-existent.
 	 */
 	oodate = (gn->mtime == 0 || Arch_LibOODate(gn) ||
 		  (gn->youngestChild == NULL && (gn->type & OP_DOUBLEDEP)));
     } else if (gn->type & OP_JOIN) {
 	/*
 	 * A target with the .JOIN attribute is only considered
 	 * out-of-date if any of its children was out-of-date.
 	 */
 	DEBUG0(MAKE, ".JOIN node...");
 	DEBUG1(MAKE, "source %smade...", gn->flags & CHILDMADE ? "" : "not ");
 	oodate = (gn->flags & CHILDMADE) ? TRUE : FALSE;
     } else if (gn->type & (OP_FORCE|OP_EXEC|OP_PHONY)) {
 	/*
 	 * A node which is the object of the force (!) operator or which has
 	 * the .EXEC attribute is always considered out-of-date.
 	 */
 	if (DEBUG(MAKE)) {
 	    if (gn->type & OP_FORCE) {
 		debug_printf("! operator...");
 	    } else if (gn->type & OP_PHONY) {
 		debug_printf(".PHONY node...");
 	    } else {
 		debug_printf(".EXEC node...");
+	    }
+	}
 	oodate = TRUE;
     } else if ((gn->youngestChild != NULL &&
 		gn->mtime < gn->youngestChild->mtime) ||
 	       (gn->youngestChild == NULL &&
 		((gn->mtime == 0 && !(gn->type & OP_OPTIONAL))
 		 || gn->type & OP_DOUBLEDEP)))
+    {
 	/*
 	 * A node whose modification time is less than that of its
 	 * youngest child or that has no children (youngestChild == NULL) and
 	 * either doesn't exist (mtime == 0) and it isn't optional
 	 * or was the object of a * :: operator is out-of-date.
 	 * Why? Because that's the way Make does it.
 	 */
 	if (DEBUG(MAKE)) {
 	    if (gn->youngestChild != NULL &&
 		gn->mtime < gn->youngestChild->mtime) {
 		debug_printf("modified before source %s...",
 			     GNode_Path(gn->youngestChild));
 	    } else if (gn->mtime == 0) {
 		debug_printf("non-existent and no sources...");
 	    } else {
 		debug_printf(":: operator and no sources...");
+	    }
+	}
 	oodate = TRUE;
     } else {
 	/*
 	 * When a non-existing child with no sources
 	 * (such as a typically used FORCE source) has been made and
 	 * the target of the child (usually a directory) has the same
 	 * timestamp as the timestamp just given to the non-existing child
 	 * after it was considered made.
 	 */
 	if (DEBUG(MAKE)) {
 	    if (gn->flags & FORCE)
 		debug_printf("non existing child...");
+	}
 	oodate = (gn->flags & FORCE) ? TRUE : FALSE;
+    }
 #ifdef USE_META
     if (useMeta) {
 	oodate = meta_oodate(gn, oodate);
+    }
 #endif
     /*
      * If the target isn't out-of-date, the parents need to know its
      * modification time. Note that targets that appear to be out-of-date
      * but aren't, because they have no commands and are GNode_IsTarget,
      * have their mtime stay below their children's mtime to keep parents from
      * thinking they're out-of-date.
      */
     if (!oodate) {
 	GNodeListNode *ln;
 	for (ln = gn->parents->first; ln != NULL; ln = ln->next)
 	    Make_TimeStamp(ln->datum, gn);
+    }
     return oodate;
+}
 /* Add the node to the list if it needs to be examined. */
 static int
 MakeAddChild(void *gnp, void *lp)
+{
     GNode *gn = gnp;
     GNodeList *l = lp;
     if ((gn->flags & REMAKE) == 0 && !(gn->type & (OP_USE|OP_USEBEFORE))) {
 	DEBUG2(MAKE, "MakeAddChild: need to examine %s%s\n",
 	       gn->name, gn->cohort_num);
 	Lst_Enqueue(l, gn);
+    }
     return 0;
+}
 /* Find the pathname of a child that was already made.
+ *
  * The path and mtime of the node and the youngestChild of the parent are
  * updated; the unmade children count of the parent is decremented.
+ *
  * Input:
  *	gnp		the node to find
  */
 static int
 MakeFindChild(void *gnp, void *pgnp)
+{
     GNode *gn = gnp;
     GNode *pgn = pgnp;
     (void)Dir_MTime(gn, 0);
     Make_TimeStamp(pgn, gn);
     pgn->unmade--;
     return 0;
+}
 /* Called by Make_Run and SuffApplyTransform on the downward pass to handle
  * .USE and transformation nodes, by copying the child node's commands, type
  * flags and children to the parent node.
+ *
  * A .USE node is much like an explicit transformation rule, except its
  * commands are always added to the target node, even if the target already
  * has commands.
+ *
  * Input:
  *	cgn		The source node, which is either a .USE/.USEBEFORE
  *			node or a transformation node (OP_TRANSFORM).
  *	pgn		The target node
  */
 void
 Make_HandleUse(GNode *cgn, GNode *pgn)
+{
     GNodeListNode *ln;	/* An element in the children list */
 #ifdef DEBUG_SRC
     if ((cgn->type & (OP_USE|OP_USEBEFORE|OP_TRANSFORM)) == 0) {
 	debug_printf("Make_HandleUse: called for plain node %s\n", cgn->name);
 	return;
+    }
 #endif
     if ((cgn->type & (OP_USE|OP_USEBEFORE)) || Lst_IsEmpty(pgn->commands)) {
 	    if (cgn->type & OP_USEBEFORE) {
 		/* .USEBEFORE */
 		Lst_PrependAll(pgn->commands, cgn->commands);
 	    } else {
 		/* .USE, or target has no commands */
 		Lst_AppendAll(pgn->commands, cgn->commands);
+	    }
+    }
     for (ln = cgn->children->first; ln != NULL; ln = ln->next) {
 	GNode *gn = ln->datum;
 	/*
 	 * Expand variables in the .USE node's name
 	 * and save the unexpanded form.
 	 * We don't need to do this for commands.
 	 * They get expanded properly when we execute.
 	 */
 	if (gn->uname == NULL) {
 	    gn->uname = gn->name;
 	} else {
 	    free(gn->name);
+	}
 	(void)Var_Subst(gn->uname, pgn, VARE_WANTRES, &gn->name);
 	/* TODO: handle errors */
 	if (gn->uname && strcmp(gn->name, gn->uname) != 0) {
 	    /* See if we have a target for this node. */
 	    GNode *tgn = Targ_FindNode(gn->name);
 	    if (tgn != NULL)
 		gn = tgn;
+	}
 	Lst_Append(pgn->children, gn);
 	Lst_Append(gn->parents, pgn);
 	pgn->unmade++;
+    }
     pgn->type |= cgn->type & ~(OP_OPMASK|OP_USE|OP_USEBEFORE|OP_TRANSFORM);
+}
 /* Used by Make_Run on the downward pass to handle .USE nodes. Should be
  * called before the children are enqueued to be looked at by MakeAddChild.
+ *
  * For a .USE child, the commands, type flags and children are copied to the
  * parent node, and since the relation to the .USE node is then no longer
  * needed, that relation is removed.
+ *
  * Input:
  *	cgn		the child, which may be a .USE node
  *	pgn		the current parent
  */
 static void
 MakeHandleUse(GNode *cgn, GNode *pgn, GNodeListNode *ln)
+{
     Boolean unmarked;
     unmarked = ((cgn->type & OP_MARK) == 0);
     cgn->type |= OP_MARK;
     if ((cgn->type & (OP_USE|OP_USEBEFORE)) == 0)
 	return;
     if (unmarked)
 	Make_HandleUse(cgn, pgn);
     /*
      * This child node is now "made", so we decrement the count of
      * unmade children in the parent... We also remove the child
      * from the parent's list to accurately reflect the number of decent
      * children the parent has. This is used by Make_Run to decide
      * whether to queue the parent or examine its children...
      */
     Lst_Remove(pgn->children, ln);
     pgn->unmade--;
+}
 static void
 HandleUseNodes(GNode *gn)
+{
     GNodeListNode *ln, *nln;
     for (ln = gn->children->first; ln != NULL; ln = nln) {
 	nln = ln->next;
 	MakeHandleUse(ln->datum, gn, ln);
+    }
+}
 /* Check the modification time of a gnode, and update it if necessary.
  * Return 0 if the gnode does not exist, or its filesystem time if it does. */
 time_t
 Make_Recheck(GNode *gn)
+{
     time_t mtime = Dir_MTime(gn, 1);
 #ifndef RECHECK
     /*
      * We can't re-stat the thing, but we can at least take care of rules
      * where a target depends on a source that actually creates the
      * target, but only if it has changed, e.g.
+     *
      * parse.h : parse.o
+     *
      * parse.o : parse.y
      *		yacc -d parse.y
      *		cc -c y.tab.c
      *		mv y.tab.o parse.o
      *		cmp -s y.tab.h parse.h || mv y.tab.h parse.h
+     *
      * In this case, if the definitions produced by yacc haven't changed
      * from before, parse.h won't have been updated and gn->mtime will
      * reflect the current modification time for parse.h. This is
      * something of a kludge, I admit, but it's a useful one..
      * XXX: People like to use a rule like
+     *
      * FRC:
+     *
      * To force things that depend on FRC to be made, so we have to
      * check for gn->children being empty as well...
      */
     if (!Lst_IsEmpty(gn->commands) || Lst_IsEmpty(gn->children)) {
 	gn->mtime = now;
+    }
 #else
     /*
      * This is what Make does and it's actually a good thing, as it
      * allows rules like
+     *
      *	cmp -s y.tab.h parse.h || cp y.tab.h parse.h
+     *
      * to function as intended. Unfortunately, thanks to the stateless
      * nature of NFS (by which I mean the loose coupling of two clients
      * using the same file from a common server), there are times
      * when the modification time of a file created on a remote
      * machine will not be modified before the local stat() implied by
      * the Dir_MTime occurs, thus leading us to believe that the file
      * is unchanged, wreaking havoc with files that depend on this one.
+     *
      * I have decided it is better to make too much than to make too
      * little, so this stuff is commented out unless you're sure it's ok.
      * -- ardeb 1/12/88
      */
     /*
      * Christos, 4/9/92: If we are  saving commands pretend that
      * the target is made now. Otherwise archives with ... rules
      * don't work!
      */
-    if (NoExecute(gn) || (gn->type & OP_SAVE_CMDS) ||
+    if (!GNode_ShouldExecute(gn) || (gn->type & OP_SAVE_CMDS) ||
 	    (mtime == 0 && !(gn->type & OP_WAIT))) {
 	DEBUG2(MAKE, " recheck(%s): update time from %s to now\n",
 	       gn->name, Targ_FmtTime(gn->mtime));
 	gn->mtime = now;
+    }
     else {
 	DEBUG2(MAKE, " recheck(%s): current update time: %s\n",
 	       gn->name, Targ_FmtTime(gn->mtime));
+    }
 #endif
     return mtime;
+}
 /*
  * Set the .PREFIX and .IMPSRC variables for all the implied parents
  * of this node.
  */
 static void
 UpdateImplicitParentsVars(GNode *cgn, const char *cname)
+{
     GNodeListNode *ln;
     const char *cpref = GNode_VarPrefix(cgn);
     for (ln = cgn->implicitParents->first; ln != NULL; ln = ln->next) {
 	GNode *pgn = ln->datum;
 	if (pgn->flags & REMAKE) {
 	    Var_Set(IMPSRC, cname, pgn);
 	    if (cpref != NULL)
 		Var_Set(PREFIX, cpref, pgn);
+	}
+    }
+}
 /* Perform update on the parents of a node. Used by JobFinish once
  * a node has been dealt with and by MakeStartJobs if it finds an
  * up-to-date node.
+ *
  * The unmade field of pgn is decremented and pgn may be placed on
  * the toBeMade queue if this field becomes 0.
+ *
  * If the child was made, the parent's flag CHILDMADE field will be
  * set true.
+ *
  * If the child is not up-to-date and still does not exist,
  * set the FORCE flag on the parents.
+ *
  * If the child wasn't made, the youngestChild field of the parent will be
  * altered if the child's mtime is big enough.
+ *
  * Finally, if the child is the implied source for the parent, the
  * parent's IMPSRC variable is set appropriately.
  */
 void
 Make_Update(GNode *cgn)
+{
     const char *cname;		/* the child's name */
     time_t	mtime = -1;
     GNodeList *parents;
     GNodeListNode *ln;
     GNode	*centurion;
     /* It is save to re-examine any nodes again */
     checked++;
     cname = GNode_VarTarget(cgn);
     DEBUG2(MAKE, "Make_Update: %s%s\n", cgn->name, cgn->cohort_num);
     /*
      * If the child was actually made, see what its modification time is
      * now -- some rules won't actually update the file. If the file still
      * doesn't exist, make its mtime now.
      */
     if (cgn->made != UPTODATE) {
 	mtime = Make_Recheck(cgn);
+    }
     /*
      * If this is a `::' node, we must consult its first instance
      * which is where all parents are linked.
      */
     if ((centurion = cgn->centurion) != NULL) {
 	if (!Lst_IsEmpty(cgn->parents))
 		Punt("%s%s: cohort has parents", cgn->name, cgn->cohort_num);
 	centurion->unmade_cohorts--;
 	if (centurion->unmade_cohorts < 0)
 	    Error("Graph cycles through centurion %s", centurion->name);
     } else {
 	centurion = cgn;
+    }
     parents = centurion->parents;
     /* If this was a .ORDER node, schedule the RHS */
     Lst_ForEachUntil(centurion->order_succ, MakeBuildParent, toBeMade->first);
     /* Now mark all the parents as having one less unmade child */
     for (ln = parents->first; ln != NULL; ln = ln->next) {
 	GNode *pgn = ln->datum;
 	if (DEBUG(MAKE))
 	    debug_printf("inspect parent %s%s: flags %x, "
 			 "type %x, made %d, unmade %d ",
 			 pgn->name, pgn->cohort_num, pgn->flags,
 			 pgn->type, pgn->made, pgn->unmade - 1);
 	if (!(pgn->flags & REMAKE)) {
 	    /* This parent isn't needed */
 	    DEBUG0(MAKE, "- not needed\n");
 	    continue;
+	}
 	if (mtime == 0 && !(cgn->type & OP_WAIT))
 	    pgn->flags |= FORCE;
 	/*
 	 * If the parent has the .MADE attribute, its timestamp got
 	 * updated to that of its newest child, and its unmade
 	 * child count got set to zero in Make_ExpandUse().
 	 * However other things might cause us to build one of its
 	 * children - and so we mustn't do any processing here when
 	 * the child build finishes.
 	 */
 	if (pgn->type & OP_MADE) {
 	    DEBUG0(MAKE, "- .MADE\n");
 	    continue;
+	}
 	if ( ! (cgn->type & (OP_EXEC|OP_USE|OP_USEBEFORE))) {
 	    if (cgn->made == MADE)
 		pgn->flags |= CHILDMADE;
 	    (void)Make_TimeStamp(pgn, cgn);
+	}
 	/*
 	 * A parent must wait for the completion of all instances
 	 * of a `::' dependency.
 	 */
 	if (centurion->unmade_cohorts != 0 || centurion->made < MADE) {
 	    DEBUG2(MAKE, "- centurion made %d, %d unmade cohorts\n",
 		   centurion->made, centurion->unmade_cohorts);
 	    continue;
+	}
 	/* One more child of this parent is now made */
 	pgn->unmade--;
 	if (pgn->unmade < 0) {
 	    if (DEBUG(MAKE)) {
 		debug_printf("Graph cycles through %s%s\n",
 			     pgn->name, pgn->cohort_num);
 		Targ_PrintGraph(2);
+	    }
 	    Error("Graph cycles through %s%s", pgn->name, pgn->cohort_num);
+	}
 	/* We must always rescan the parents of .WAIT and .ORDER nodes. */
 	if (pgn->unmade != 0 && !(centurion->type & OP_WAIT)
 		&& !(centurion->flags & DONE_ORDER)) {
 	    DEBUG0(MAKE, "- unmade children\n");
 	    continue;
+	}
 	if (pgn->made != DEFERRED) {
 	    /*
 	     * Either this parent is on a different branch of the tree,
 	     * or it on the RHS of a .WAIT directive
 	     * or it is already on the toBeMade list.
 	     */
 	    DEBUG0(MAKE, "- not deferred\n");
 	    continue;
+	}
 	assert(pgn->order_pred != NULL);
 	if (Lst_ForEachUntil(pgn->order_pred, MakeCheckOrder, 0)) {
 	    /* A .ORDER rule stops us building this */
 	    continue;
+	}
 	if (DEBUG(MAKE)) {
 	    debug_printf("- %s%s made, schedule %s%s (made %d)\n",
 			 cgn->name, cgn->cohort_num,
 			 pgn->name, pgn->cohort_num, pgn->made);
 	    Targ_PrintNode(pgn, 2);
+	}
 	/* Ok, we can schedule the parent again */
 	pgn->made = REQUESTED;
 	Lst_Enqueue(toBeMade, pgn);
+    }
     UpdateImplicitParentsVars(cgn, cname);
+}
 static void
 UnmarkChildren(GNode *gn)
+{
     GNodeListNode *ln;
     for (ln = gn->children->first; ln != NULL; ln = ln->next) {
 	GNode *child = ln->datum;
 	child->type &= ~OP_MARK;
+    }
+}
 /* Add a child's name to the ALLSRC and OODATE variables of the given
  * node, but only if it has not been given the .EXEC, .USE or .INVISIBLE
  * attributes. .EXEC and .USE children are very rarely going to be files,
  * so...
+ *
  * If the child is a .JOIN node, its ALLSRC is propagated to the parent.
+ *
  * A child is added to the OODATE variable if its modification time is
  * later than that of its parent, as defined by Make, except if the
  * parent is a .JOIN node. In that case, it is only added to the OODATE
  * variable if it was actually made (since .JOIN nodes don't have
  * modification times, the comparison is rather unfair...)..
+ *
  * Input:
  *	cgn		The child to add
  *	pgn		The parent to whose ALLSRC variable it should
  *			be added
  */
 static void
 MakeAddAllSrc(GNode *cgn, GNode *pgn)
+{
     if (cgn->type & OP_MARK)
 	return;
     cgn->type |= OP_MARK;
     if ((cgn->type & (OP_EXEC|OP_USE|OP_USEBEFORE|OP_INVISIBLE)) == 0) {
 	const char *child, *allsrc;
 	if (cgn->type & OP_ARCHV)
 	    child = GNode_VarMember(cgn);
 	else
 	    child = GNode_Path(cgn);
 	if (cgn->type & OP_JOIN) {
 	    allsrc = GNode_VarAllsrc(cgn);
 	} else {
 	    allsrc = child;
+	}
 	if (allsrc != NULL)
 		Var_Append(ALLSRC, allsrc, pgn);
 	if (pgn->type & OP_JOIN) {
 	    if (cgn->made == MADE) {
 		Var_Append(OODATE, child, pgn);
+	    }
 	} else if ((pgn->mtime < cgn->mtime) ||
 		   (cgn->mtime >= now && cgn->made == MADE))
+	{
 	    /*
 	     * It goes in the OODATE variable if the parent is younger than the
 	     * child or if the child has been modified more recently than
 	     * the start of the make. This is to keep pmake from getting
 	     * confused if something else updates the parent after the
 	     * make starts (shouldn't happen, I know, but sometimes it
 	     * does). In such a case, if we've updated the kid, the parent
 	     * is likely to have a modification time later than that of
 	     * the kid and anything that relies on the OODATE variable will
 	     * be hosed.
+	     *
 	     * XXX: This will cause all made children to go in the OODATE
 	     * variable, even if they're not touched, if RECHECK isn't defined,
 	     * since cgn->mtime is set to now in Make_Update. According to
 	     * some people, this is good...
 	     */
 	    Var_Append(OODATE, child, pgn);
+	}
+    }
+}
 /* Set up the ALLSRC and OODATE variables. Sad to say, it must be
  * done separately, rather than while traversing the graph. This is
  * because Make defined OODATE to contain all sources whose modification
  * times were later than that of the target, *not* those sources that
  * were out-of-date. Since in both compatibility and native modes,
  * the modification time of the parent isn't found until the child
  * has been dealt with, we have to wait until now to fill in the
  * variable. As for ALLSRC, the ordering is important and not
  * guaranteed when in native mode, so it must be set here, too.
+ *
  * If the node is a .JOIN node, its TARGET variable will be set to
  * match its ALLSRC variable.
  */
 void
 Make_DoAllVar(GNode *gn)
+{
     GNodeListNode *ln;
     if (gn->flags & DONE_ALLSRC)
 	return;
     UnmarkChildren(gn);
     for (ln = gn->children->first; ln != NULL; ln = ln->next)
 	MakeAddAllSrc(ln->datum, gn);
     if (!Var_Exists(OODATE, gn)) {
 	Var_Set(OODATE, "", gn);
+    }
     if (!Var_Exists(ALLSRC, gn)) {
 	Var_Set(ALLSRC, "", gn);
+    }
     if (gn->type & OP_JOIN)
 	Var_Set(TARGET, GNode_VarAllsrc(gn), gn);
     gn->flags |= DONE_ALLSRC;
+}
 static int
 MakeCheckOrder(void *v_bn, void *ignore MAKE_ATTR_UNUSED)
+{
     GNode *bn = v_bn;
     if (bn->made >= MADE || !(bn->flags & REMAKE))
 	return 0;
     DEBUG2(MAKE, "MakeCheckOrder: Waiting for .ORDER node %s%s\n",
 	   bn->name, bn->cohort_num);
     return 1;
+}
 static int
 MakeBuildChild(void *v_cn, void *toBeMade_next)
+{
     GNode *cn = v_cn;
     DEBUG4(MAKE, "MakeBuildChild: inspect %s%s, made %d, type %x\n",
 	   cn->name, cn->cohort_num, cn->made, cn->type);
     if (cn->made > DEFERRED)
 	return 0;
     /* If this node is on the RHS of a .ORDER, check LHSs. */
     assert(cn->order_pred);
     if (Lst_ForEachUntil(cn->order_pred, MakeCheckOrder, 0)) {
 	/* Can't build this (or anything else in this child list) yet */
 	cn->made = DEFERRED;
 	return 0;			/* but keep looking */
+    }
     DEBUG2(MAKE, "MakeBuildChild: schedule %s%s\n", cn->name, cn->cohort_num);
     cn->made = REQUESTED;
     if (toBeMade_next == NULL)
 	Lst_Append(toBeMade, cn);
     else
 	Lst_InsertBefore(toBeMade, toBeMade_next, cn);
     if (cn->unmade_cohorts != 0)
 	Lst_ForEachUntil(cn->cohorts, MakeBuildChild, toBeMade_next);
     /*
      * If this node is a .WAIT node with unmade children
      * then don't add the next sibling.
      */
     return cn->type & OP_WAIT && cn->unmade > 0;
+}
 /* When a .ORDER LHS node completes we do this on each RHS */
 static int
 MakeBuildParent(void *v_pn, void *toBeMade_next)
+{
     GNode *pn = v_pn;
     if (pn->made != DEFERRED)
 	return 0;
     if (MakeBuildChild(pn, toBeMade_next) == 0) {
 	/* Mark so that when this node is built we reschedule its parents */
 	pn->flags |= DONE_ORDER;
+    }
     return 0;
+}
 /* Start as many jobs as possible, taking them from the toBeMade queue.
+ *
  * If the query flag was given to pmake, no job will be started,
  * but as soon as an out-of-date target is found, this function
  * returns TRUE. At all other times, this function returns FALSE.
  */
 static Boolean
 MakeStartJobs(void)
+{
     GNode	*gn;
     int		have_token = 0;
     while (!Lst_IsEmpty(toBeMade)) {
 	/* Get token now to avoid cycling job-list when we only have 1 token */
 	if (!have_token && !Job_TokenWithdraw())
 	    break;
 	have_token = 1;
 	gn = Lst_Dequeue(toBeMade);
 	DEBUG2(MAKE, "Examining %s%s...\n", gn->name, gn->cohort_num);
 	if (gn->made != REQUESTED) {
 	    DEBUG1(MAKE, "state %d\n", gn->made);
 	    make_abort(gn, __LINE__);
+	}
 	if (gn->checked_seqno == checked) {
 	    /* We've already looked at this node since a job finished... */
 	    DEBUG2(MAKE, "already checked %s%s\n", gn->name, gn->cohort_num);
 	    gn->made = DEFERRED;
 	    continue;
+	}
 	gn->checked_seqno = checked;
 	if (gn->unmade != 0) {
 	    /*
 	     * We can't build this yet, add all unmade children to toBeMade,
 	     * just before the current first element.
 	     */
 	    gn->made = DEFERRED;
 	    Lst_ForEachUntil(gn->children, MakeBuildChild, toBeMade->first);
 	    /* and drop this node on the floor */
 	    DEBUG2(MAKE, "dropped %s%s\n", gn->name, gn->cohort_num);
 	    continue;
+	}
 	gn->made = BEINGMADE;
 	if (Make_OODate(gn)) {
 	    DEBUG0(MAKE, "out-of-date\n");
 	    if (opts.queryFlag) {
 		return TRUE;
+	    }
 	    Make_DoAllVar(gn);
 	    Job_Make(gn);
 	    have_token = 0;
 	} else {
 	    DEBUG0(MAKE, "up-to-date\n");
 	    gn->made = UPTODATE;
 	    if (gn->type & OP_JOIN) {
 		/*
 		 * Even for an up-to-date .JOIN node, we need it to have its
 		 * context variables so references to it get the correct
 		 * value for .TARGET when building up the context variables
 		 * of its parent(s)...
 		 */
 		Make_DoAllVar(gn);
+	    }
 	    Make_Update(gn);
+	}
+    }
     if (have_token)
 	Job_TokenReturn();
     return FALSE;
+}
 static void
 MakePrintStatusOrderNode(GNode *ogn, GNode *gn)
+{
     if (!(ogn->flags & REMAKE) || ogn->made > REQUESTED)
 	/* not waiting for this one */
 	return;
     printf("    `%s%s' has .ORDER dependency against %s%s ",
 	   gn->name, gn->cohort_num, ogn->name, ogn->cohort_num);
     GNode_FprintDetails(stdout, "(", ogn, ")\n");
     if (DEBUG(MAKE) && opts.debug_file != stdout) {
 	debug_printf("    `%s%s' has .ORDER dependency against %s%s ",
 		     gn->name, gn->cohort_num, ogn->name, ogn->cohort_num);
 	GNode_FprintDetails(opts.debug_file, "(", ogn, ")\n");
+    }
+}
 static void
 MakePrintStatusOrder(GNode *gn)
+{
     GNodeListNode *ln;
     for (ln = gn->order_pred->first; ln != NULL; ln = ln->next)
 	MakePrintStatusOrderNode(ln->datum, gn);
+}
 static void MakePrintStatusList(GNodeList *, int *);
 /* Print the status of a top-level node, viz. it being up-to-date already
  * or not created due to an error in a lower level.
  * Callback function for Make_Run via Lst_ForEachUntil.
  */
 static Boolean
 MakePrintStatus(GNode *gn, int *errors)
+{
     if (gn->flags & DONECYCLE)
 	/* We've completely processed this node before, don't do it again. */
 	return FALSE;
     if (gn->unmade == 0) {
 	gn->flags |= DONECYCLE;
 	switch (gn->made) {
 	case UPTODATE:
 	    printf("`%s%s' is up to date.\n", gn->name, gn->cohort_num);
 	    break;
 	case MADE:
 	    break;
 	case UNMADE:
 	case DEFERRED:
 	case REQUESTED:
 	case BEINGMADE:
 	    (*errors)++;
 	    printf("`%s%s' was not built", gn->name, gn->cohort_num);
 	    GNode_FprintDetails(stdout, " (", gn, ")!\n");
 	    if (DEBUG(MAKE) && opts.debug_file != stdout) {
 		debug_printf("`%s%s' was not built", gn->name, gn->cohort_num);
 		GNode_FprintDetails(opts.debug_file, " (", gn, ")!\n");
+	    }
 	    /* Most likely problem is actually caused by .ORDER */
 	    MakePrintStatusOrder(gn);
 	    break;
 	default:
 	    /* Errors - already counted */
 	    printf("`%s%s' not remade because of errors.\n",
 		    gn->name, gn->cohort_num);
 	    if (DEBUG(MAKE) && opts.debug_file != stdout)
 		debug_printf("`%s%s' not remade because of errors.\n",
 			     gn->name, gn->cohort_num);
 	    break;
+	}
 	return FALSE;
+    }
     DEBUG3(MAKE, "MakePrintStatus: %s%s has %d unmade children\n",
 	   gn->name, gn->cohort_num, gn->unmade);
     /*
      * If printing cycles and came to one that has unmade children,
      * print out the cycle by recursing on its children.
      */
     if (!(gn->flags & CYCLE)) {
 	/* Fist time we've seen this node, check all children */
 	gn->flags |= CYCLE;
 	MakePrintStatusList(gn->children, errors);
 	/* Mark that this node needn't be processed again */
 	gn->flags |= DONECYCLE;
 	return FALSE;
+    }
     /* Only output the error once per node */
     gn->flags |= DONECYCLE;
     Error("Graph cycles through `%s%s'", gn->name, gn->cohort_num);
     if ((*errors)++ > 100)
 	/* Abandon the whole error report */
 	return TRUE;
     /* Reporting for our children will give the rest of the loop */
     MakePrintStatusList(gn->children, errors);
     return FALSE;
+}
 static void
 MakePrintStatusList(GNodeList *gnodes, int *errors)
+{
     GNodeListNode *ln;
     for (ln = gnodes->first; ln != NULL; ln = ln->next)
 	if (MakePrintStatus(ln->datum, errors))
 	    break;
+}
 /* Expand .USE nodes and create a new targets list.
+ *
  * Input:
  *	targs		the initial list of targets
  */
 void
 Make_ExpandUse(GNodeList *targs)
+{
     GNodeList *examine;		/* List of targets to examine */
+    {
 	/* XXX: Why is it necessary to copy the list? There shouldn't be
 	 * any modifications to the list, at least the function name
 	 * ExpandUse doesn't suggest that. */
 	GNodeListNode *ln;
 	examine = Lst_New();
 	for (ln = targs->first; ln != NULL; ln = ln->next)
 	    Lst_Append(examine, ln->datum);
+    }
     /*
      * Make an initial downward pass over the graph, marking nodes to be made
      * as we go down. We call Suff_FindDeps to find where a node is and
      * to get some children for it if it has none and also has no commands.
      * If the node is a leaf, we stick it on the toBeMade queue to
      * be looked at in a minute, otherwise we add its children to our queue
      * and go on about our business.
      */
     while (!Lst_IsEmpty(examine)) {
 	GNode *gn = Lst_Dequeue(examine);
 	if (gn->flags & REMAKE)
 	    /* We've looked at this one already */
 	    continue;
 	gn->flags |= REMAKE;
 	DEBUG2(MAKE, "Make_ExpandUse: examine %s%s\n",
 	       gn->name, gn->cohort_num);
 	if (gn->type & OP_DOUBLEDEP)
 	    Lst_PrependAll(examine, gn->cohorts);
 	/*
 	 * Apply any .USE rules before looking for implicit dependencies
 	 * to make sure everything has commands that should...
 	 * Make sure that the TARGET is set, so that we can make
 	 * expansions.
 	 */
 	if (gn->type & OP_ARCHV) {
 	    char *eoa, *eon;
 	    eoa = strchr(gn->name, '(');
 	    eon = strchr(gn->name, ')');
 	    if (eoa == NULL || eon == NULL)
 		continue;
 	    *eoa = '\0';
 	    *eon = '\0';
 	    Var_Set(MEMBER, eoa + 1, gn);
 	    Var_Set(ARCHIVE, gn->name, gn);
 	    *eoa = '(';
 	    *eon = ')';
+	}
 	(void)Dir_MTime(gn, 0);
 	Var_Set(TARGET, GNode_Path(gn), gn);
 	UnmarkChildren(gn);
 	HandleUseNodes(gn);
 	if ((gn->type & OP_MADE) == 0)
 	    Suff_FindDeps(gn);
 	else {
 	    /* Pretend we made all this node's children */
 	    Lst_ForEachUntil(gn->children, MakeFindChild, gn);
 	    if (gn->unmade != 0)
 		    printf("Warning: %s%s still has %d unmade children\n",
 			    gn->name, gn->cohort_num, gn->unmade);
+	}
 	if (gn->unmade != 0)
 	    Lst_ForEachUntil(gn->children, MakeAddChild, examine);
+    }
     Lst_Free(examine);
+}
 /* Make the .WAIT node depend on the previous children */
 static void
 add_wait_dependency(GNodeListNode *owln, GNode *wn)
+{
     GNodeListNode *cln;
     GNode *cn;
     for (cln = owln; (cn = cln->datum) != wn; cln = cln->next) {
 	DEBUG3(MAKE, ".WAIT: add dependency %s%s -> %s\n",
 	       cn->name, cn->cohort_num, wn->name);
 	/* XXX: This pattern should be factored out, it repeats often */
 	Lst_Append(wn->children, cn);
 	wn->unmade++;
 	Lst_Append(cn->parents, wn);
+    }
+}
 /* Convert .WAIT nodes into dependencies. */
 static void
 Make_ProcessWait(GNodeList *targs)
+{
     GNode  *pgn;		/* 'parent' node we are examining */
     GNodeListNode *owln;	/* Previous .WAIT node */
     GNodeList *examine;		/* List of targets to examine */
     /*
      * We need all the nodes to have a common parent in order for the
      * .WAIT and .ORDER scheduling to work.
      * Perhaps this should be done earlier...
      */
     pgn = Targ_NewGN(".MAIN");
     pgn->flags = REMAKE;
     pgn->type = OP_PHONY | OP_DEPENDS;
     /* Get it displayed in the diag dumps */
     Lst_Prepend(Targ_List(), pgn);
+    {
 	GNodeListNode *ln;
 	for (ln = targs->first; ln != NULL; ln = ln->next) {
 	    GNode *cgn = ln->datum;
 	    Lst_Append(pgn->children, cgn);
 	    Lst_Append(cgn->parents, pgn);
 	    pgn->unmade++;
+	}
+    }
     /* Start building with the 'dummy' .MAIN' node */
     MakeBuildChild(pgn, NULL);
     examine = Lst_New();
     Lst_Append(examine, pgn);
     while (!Lst_IsEmpty(examine)) {
 	GNodeListNode *ln;
 	pgn = Lst_Dequeue(examine);
 	/* We only want to process each child-list once */
 	if (pgn->flags & DONE_WAIT)
 	    continue;
 	pgn->flags |= DONE_WAIT;
 	DEBUG1(MAKE, "Make_ProcessWait: examine %s\n", pgn->name);
 	if (pgn->type & OP_DOUBLEDEP)
 	    Lst_PrependAll(examine, pgn->cohorts);
 	owln = pgn->children->first;
 	for (ln = pgn->children->first; ln != NULL; ln = ln->next) {
 	    GNode *cgn = ln->datum;
 	    if (cgn->type & OP_WAIT) {
 		add_wait_dependency(owln, cgn);
 		owln = ln;
 	    } else {
 		Lst_Append(examine, cgn);
+	    }
+	}
+    }
     Lst_Free(examine);
+}
 /*-
  *-----------------------------------------------------------------------
  * Make_Run --
  *	Initialize the nodes to remake and the list of nodes which are
  *	ready to be made by doing a breadth-first traversal of the graph
  *	starting from the nodes in the given list. Once this traversal
  *	is finished, all the 'leaves' of the graph are in the toBeMade
  *	queue.
  *	Using this queue and the Job module, work back up the graph,
  *	calling on MakeStartJobs to keep the job table as full as
  *	possible.
+ *
  * Input:
  *	targs		the initial list of targets
+ *
  * Results:
  *	TRUE if work was done. FALSE otherwise.
+ *
  * Side Effects:
  *	The make field of all nodes involved in the creation of the given
  *	targets is set to 1. The toBeMade list is set to contain all the
  *	'leaves' of these subgraphs.
  *-----------------------------------------------------------------------
  */
 Boolean
 Make_Run(GNodeList *targs)
+{
     int errors;			/* Number of errors the Job module reports */
     /* Start trying to make the current targets... */
     toBeMade = Lst_New();
     Make_ExpandUse(targs);
     Make_ProcessWait(targs);
     if (DEBUG(MAKE)) {
 	 debug_printf("#***# full graph\n");
 	 Targ_PrintGraph(1);
+    }
     if (opts.queryFlag) {
 	/*
 	 * We wouldn't do any work unless we could start some jobs in the
 	 * next loop... (we won't actually start any, of course, this is just
 	 * to see if any of the targets was out of date)
 	 */
 	return MakeStartJobs();
+    }
     /*
      * Initialization. At the moment, no jobs are running and until some
      * get started, nothing will happen since the remaining upward
      * traversal of the graph is performed by the routines in job.c upon
      * the finishing of a job. So we fill the Job table as much as we can
      * before going into our loop.
      */
     (void)MakeStartJobs();
     /*
      * Main Loop: The idea here is that the ending of jobs will take
      * care of the maintenance of data structures and the waiting for output
      * will cause us to be idle most of the time while our children run as
      * much as possible. Because the job table is kept as full as possible,
      * the only time when it will be empty is when all the jobs which need
      * running have been run, so that is the end condition of this loop.
      * Note that the Job module will exit if there were any errors unless the
      * keepgoing flag was given.
      */
     while (!Lst_IsEmpty(toBeMade) || jobTokensRunning > 0) {
 	Job_CatchOutput();
 	(void)MakeStartJobs();
+    }
     errors = Job_Finish();
     /*
      * Print the final status of each target. E.g. if it wasn't made
      * because some inferior reported an error.
      */
     DEBUG1(MAKE, "done: errors %d\n", errors);
     if (errors == 0) {
 	MakePrintStatusList(targs, &errors);
 	if (DEBUG(MAKE)) {
 	    debug_printf("done: errors %d\n", errors);
 	    if (errors)
 		Targ_PrintGraph(4);
+	}
+    }
     return errors != 0;
+}

 @@ -1,726 +1,726 @@
-/*	$NetBSD: make.h,v 1.178 2020/10/31 11:54:33 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.179 2020/11/01 17:47:26 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.
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
+ *
  *	from: @(#)make.h	8.3 (Berkeley) 6/13/95
  */
 /*
  * Copyright (c) 1989 by Berkeley Softworks
  * 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.
  * 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
+ *
  *	from: @(#)make.h	8.3 (Berkeley) 6/13/95
  */
 /*-
  * make.h --
  *	The global definitions for pmake
  */
 #ifndef MAKE_MAKE_H
 #define MAKE_MAKE_H
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <assert.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #ifdef BSD4_4
 # include <sys/cdefs.h>
 #endif
 #ifndef FD_CLOEXEC
 #define FD_CLOEXEC 1
 #endif
 #if defined(__GNUC__)
 #define	MAKE_GNUC_PREREQ(x, y)						\
 	((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) ||			\
 	 (__GNUC__ > (x)))
 #else /* defined(__GNUC__) */
 #define	MAKE_GNUC_PREREQ(x, y)	0
 #endif /* defined(__GNUC__) */
 #if MAKE_GNUC_PREREQ(2, 7)
 #define	MAKE_ATTR_UNUSED	__attribute__((__unused__))
 #else
 #define	MAKE_ATTR_UNUSED	/* delete */
 #endif
 #if MAKE_GNUC_PREREQ(2, 5)
 #define	MAKE_ATTR_DEAD		__attribute__((__noreturn__))
 #elif defined(__GNUC__)
 #define	MAKE_ATTR_DEAD		__volatile
 #else
 #define	MAKE_ATTR_DEAD		/* delete */
 #endif
 #if MAKE_GNUC_PREREQ(2, 7)
 #define MAKE_ATTR_PRINTFLIKE(fmtarg, firstvararg)	\
 	    __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
 #else
 #define MAKE_ATTR_PRINTFLIKE(fmtarg, firstvararg)	/* delete */
 #endif
 /*
  * A boolean type is defined as an integer, not an enum, for historic reasons.
  * The only allowed values are the constants TRUE and FALSE (1 and 0).
  */
 #ifdef USE_DOUBLE_BOOLEAN
 /* During development, to find type mismatches in function declarations. */
 typedef double Boolean;
 #define TRUE 1.0
 #define FALSE 0.0
 #elif defined(USE_UCHAR_BOOLEAN)
 /* During development, to find code that depends on the exact value of TRUE or
  * that stores other values in Boolean variables. */
 typedef unsigned char Boolean;
 #define TRUE ((unsigned char)0xFF)
 #define FALSE ((unsigned char)0x00)
 #elif defined(USE_CHAR_BOOLEAN)
 /* During development, to find code that uses a boolean as array index, via
  * -Wchar-subscripts. */
 typedef char Boolean;
 #define TRUE ((char)-1)
 #define FALSE ((char)0x00)
 #elif defined(USE_ENUM_BOOLEAN)
 typedef enum Boolean { FALSE, TRUE } Boolean;
 #else
 typedef int Boolean;
 #ifndef TRUE
 #define TRUE	1
 #endif
 #ifndef FALSE
 #define FALSE	0
 #endif
 #endif
 #include "lst.h"
 #include "enum.h"
 #include "hash.h"
 #include "config.h"
 #include "buf.h"
 #include "make_malloc.h"
 typedef enum  {
     UNMADE,			/* Not examined yet */
     DEFERRED,			/* Examined once (building child) */
     REQUESTED,			/* on toBeMade list */
     BEINGMADE,			/* Target is already being made.
 				 * Indicates a cycle in the graph. */
     MADE,			/* Was out-of-date and has been made */
     UPTODATE,			/* Was already up-to-date */
     ERROR,			/* An error occurred while it was being
 				 * made (used only in compat mode) */
     ABORTED			/* The target was aborted due to an error
 				 * making an inferior (compat). */
 } GNodeMade;
 /* The OP_ constants are used when parsing a dependency line as a way of
  * communicating to other parts of the program the way in which a target
  * should be made.
+ *
  * Some of the OP_ constants can be combined, others cannot. */
 typedef enum GNodeType {
     /* The dependency operator ':' is the most common one.  The commands of
      * this node are executed if any child is out-of-date. */
     OP_DEPENDS		= 1 << 0,
     /* The dependency operator '!' always executes its commands, even if
      * its children are up-to-date. */
     OP_FORCE		= 1 << 1,
     /* The dependency operator '::' behaves like ':', except that it allows
      * multiple dependency groups to be defined.  Each of these groups is
      * executed on its own, independently from the others. */
     OP_DOUBLEDEP	= 1 << 2,
     /* Matches the dependency operators ':', '!' and '::'. */
     OP_OPMASK		= OP_DEPENDS|OP_FORCE|OP_DOUBLEDEP,
     /* Don't care if the target doesn't exist and can't be created */
     OP_OPTIONAL		= 1 << 3,
     /* Use associated commands for parents */
     OP_USE		= 1 << 4,
     /* Target is never out of date, but always execute commands anyway.
      * Its time doesn't matter, so it has none...sort of */
     OP_EXEC		= 1 << 5,
     /* Ignore non-zero exit status from shell commands when creating the node */
     OP_IGNORE		= 1 << 6,
     /* Don't remove the target when interrupted */
     OP_PRECIOUS		= 1 << 7,
     /* Don't echo commands when executed */
     OP_SILENT		= 1 << 8,
     /* Target is a recursive make so its commands should always be executed
      * when it is out of date, regardless of the state of the -n or -t flags */
     OP_MAKE		= 1 << 9,
     /* Target is out-of-date only if any of its children was out-of-date */
     OP_JOIN		= 1 << 10,
     /* Assume the children of the node have been already made */
     OP_MADE		= 1 << 11,
     /* Special .BEGIN, .END, .INTERRUPT */
     OP_SPECIAL		= 1 << 12,
     /* Like .USE, only prepend commands */
     OP_USEBEFORE	= 1 << 13,
     /* The node is invisible to its parents. I.e. it doesn't show up in the
      * parents' local variables. */
     OP_INVISIBLE	= 1 << 14,
     /* The node is exempt from normal 'main target' processing in parse.c */
     OP_NOTMAIN		= 1 << 15,
     /* Not a file target; run always */
     OP_PHONY		= 1 << 16,
     /* Don't search for file in the path */
     OP_NOPATH		= 1 << 17,
     /* .WAIT phony node */
     OP_WAIT		= 1 << 18,
     /* .NOMETA do not create a .meta file */
     OP_NOMETA		= 1 << 19,
     /* .META we _do_ want a .meta file */
     OP_META		= 1 << 20,
     /* Do not compare commands in .meta file */
     OP_NOMETA_CMP	= 1 << 21,
     /* Possibly a submake node */
     OP_SUBMAKE		= 1 << 22,
     /* Attributes applied by PMake */
     /* The node is a transformation rule */
     OP_TRANSFORM	= 1 << 31,
     /* Target is a member of an archive */
     /* XXX: How does this differ from OP_ARCHV? */
     OP_MEMBER		= 1 << 30,
     /* The node is a library,
      * its name has the form "-l<libname>" */
     OP_LIB		= 1 << 29,
     /* The node is an archive member,
      * its name has the form "archive(member)" */
     /* XXX: How does this differ from OP_MEMBER? */
     OP_ARCHV		= 1 << 28,
     /* Target has all the commands it should. Used when parsing to catch
      * multiple command groups for a target.  Only applies to the dependency
      * operators ':' and '!', but not to '::'. */
     OP_HAS_COMMANDS	= 1 << 27,
     /* The special command "..." has been seen. All further commands from
      * this node will be saved on the .END node instead, to be executed at
      * the very end. */
     OP_SAVE_CMDS	= 1 << 26,
     /* Already processed by Suff_FindDeps */
     OP_DEPS_FOUND	= 1 << 25,
     /* Node found while expanding .ALLSRC */
     OP_MARK		= 1 << 24,
     OP_NOTARGET		= OP_NOTMAIN | OP_USE | OP_EXEC | OP_TRANSFORM
 } GNodeType;
 typedef enum GNodeFlags {
     REMAKE	= 0x0001,	/* this target needs to be (re)made */
     CHILDMADE	= 0x0002,	/* children of this target were made */
     FORCE	= 0x0004,	/* children don't exist, and we pretend made */
     DONE_WAIT	= 0x0008,	/* Set by Make_ProcessWait() */
     DONE_ORDER	= 0x0010,	/* Build requested by .ORDER processing */
     FROM_DEPEND	= 0x0020,	/* Node created from .depend */
     DONE_ALLSRC	= 0x0040,	/* We do it once only */
     CYCLE	= 0x1000,	/* Used by MakePrintStatus */
     DONECYCLE	= 0x2000,	/* Used by MakePrintStatus */
     INTERNAL	= 0x4000	/* Internal use only */
 } GNodeFlags;
 typedef struct List StringList;
 typedef struct ListNode StringListNode;
 typedef struct List GNodeList;
 typedef struct ListNode GNodeListNode;
 typedef struct List /* of CachedDir */ SearchPath;
 /* A graph node represents a target that can possibly be made, including its
  * relation to other targets and a lot of other details. */
 typedef struct GNode {
     /* The target's name, such as "clean" or "make.c" */
     char *name;
     /* The unexpanded name of a .USE node */
     char *uname;
     /* The full pathname of the file belonging to the target.
      * XXX: What about .PHONY targets? These don't have an associated path. */
     char *path;
     /* The type of operator used to define the sources (see the OP flags below).
      * XXX: This looks like a wild mixture of type and flags. */
     GNodeType type;
     GNodeFlags flags;
     /* The state of processing on this node */
     GNodeMade made;
     int unmade;			/* The number of unmade children */
     /* The modification time; 0 means the node does not have a corresponding
      * file; see Make_OODate. */
     time_t mtime;
     struct GNode *youngestChild;
     /* The GNodes for which this node is an implied source. May be empty.
      * For example, when there is an inference rule for .c.o, the node for
      * file.c has the node for file.o in this list. */
     GNodeList *implicitParents;
     /* Other nodes of the same name, for the '::' operator. */
     GNodeList *cohorts;
     /* The nodes that depend on this one, or in other words, the nodes for
      * which this is a source. */
     GNodeList *parents;
     /* The nodes on which this one depends. */
     GNodeList *children;
     /* .ORDER nodes we need made. The nodes that must be made (if they're
      * made) before this node can be made, but that do not enter into the
      * datedness of this node. */
     GNodeList *order_pred;
     /* .ORDER nodes who need us. The nodes that must be made (if they're made
      * at all) after this node is made, but that do not depend on this node,
      * in the normal sense. */
     GNodeList *order_succ;
     /* The "#n" suffix for this cohort, or "" for other nodes */
     char cohort_num[8];
     /* The number of unmade instances on the cohorts list */
     int unmade_cohorts;
     /* Pointer to the first instance of a '::' node; only set when on a
      * cohorts list */
     struct GNode *centurion;
     /* Last time (sequence number) we tried to make this node */
     unsigned int checked_seqno;
     /* The "local" variables that are specific to this target and this target
      * only, such as $@, $<, $?.
+     *
      * Also used for the global variable scopes VAR_GLOBAL, VAR_CMDLINE,
      * VAR_INTERNAL, which contain variables with arbitrary names. */
     HashTable /* of Var pointer */ context;
     /* The commands to be given to a shell to create this target. */
     StringList *commands;
     /* Suffix for the node (determined by Suff_FindDeps and opaque to everyone
      * but the Suff module) */
     struct Suff *suffix;
     /* filename where the GNode got defined */
     const char *fname;
     /* line number where the GNode got defined */
     int lineno;
 } GNode;
 /*
  * Error levels for parsing. PARSE_FATAL means the process cannot continue
  * once the top-level makefile has been parsed. PARSE_WARNING and PARSE_INFO
  * mean it can.
  */
 typedef enum ParseErrorLevel {
     PARSE_FATAL = 1,
     PARSE_WARNING,
     PARSE_INFO
 } ParseErrorLevel;
 /*
  * Values returned by Cond_EvalLine and Cond_EvalCondition.
  */
 typedef enum CondEvalResult {
     COND_PARSE,			/* Parse the next lines */
     COND_SKIP,			/* Skip the next lines */
     COND_INVALID		/* Not a conditional statement */
 } CondEvalResult;
 /*
  * Definitions for the "local" variables. Used only for clarity.
  */
 #define TARGET		"@"	/* Target of dependency */
 #define OODATE		"?"	/* All out-of-date sources */
 #define ALLSRC		">"	/* All sources */
 #define IMPSRC		"<"	/* Source implied by transformation */
 #define PREFIX		"*"	/* Common prefix */
 #define ARCHIVE		"!"	/* Archive in "archive(member)" syntax */
 #define MEMBER		"%"	/* Member in "archive(member)" syntax */
 #define FTARGET		"@F"	/* file part of TARGET */
 #define DTARGET		"@D"	/* directory part of TARGET */
 #define FIMPSRC		"<F"	/* file part of IMPSRC */
 #define DIMPSRC		"<D"	/* directory part of IMPSRC */
 #define FPREFIX		"*F"	/* file part of PREFIX */
 #define DPREFIX		"*D"	/* directory part of PREFIX */
 /*
  * Global Variables
  */
 extern SearchPath *dirSearchPath;
 				/* The list of directories to search when
 				 * looking for targets */
 extern Boolean  allPrecious;	/* True if every target is precious */
 extern Boolean  deleteOnError;	/* True if failed targets should be deleted */
 extern Boolean	doing_depend;	/* TRUE if processing .depend */
 extern GNode    *DEFAULT;	/* .DEFAULT rule */
 extern GNode	*VAR_INTERNAL;	/* Variables defined internally by make
 				 * which should not override those set by
 				 * makefiles.
 				 */
 extern GNode    *VAR_GLOBAL;	/* Variables defined in a global context, e.g
 				 * in the Makefile itself */
 extern GNode    *VAR_CMDLINE;	/* Variables defined on the command line */
 extern char	var_Error[];	/* Value returned by Var_Parse when an error
 				 * is encountered. It actually points to
 				 * an empty string, so naive callers needn't
 				 * worry about it. */
 extern time_t	now;		/* The time at the start of this whole
 				 * process */
 extern Boolean	oldVars;	/* Do old-style variable substitution */
 extern SearchPath *sysIncPath;	/* The system include path. */
 extern SearchPath *defSysIncPath; /* The default system include path. */
 extern char	curdir[];	/* Startup directory */
 extern char	*progname;	/* The program name */
 extern char	*makeDependfile; /* .depend */
 extern char	**savedEnv;	 /* if we replaced environ this will be non-NULL */
 extern int	makelevel;
 /*
  * We cannot vfork() in a child of vfork().
  * Most systems do not enforce this but some do.
  */
 #define vFork() ((getpid() == myPid) ? vfork() : fork())
 extern pid_t	myPid;
 #define	MAKEFLAGS	".MAKEFLAGS"
 #define	MAKEOVERRIDES	".MAKEOVERRIDES"
 #define	MAKE_JOB_PREFIX	".MAKE.JOB.PREFIX" /* prefix for job target output */
 #define	MAKE_EXPORTED	".MAKE.EXPORTED"   /* variables we export */
 #define	MAKE_MAKEFILES	".MAKE.MAKEFILES"  /* all makefiles already loaded */
 #define	MAKE_LEVEL	".MAKE.LEVEL"	   /* recursion level */
 #define MAKEFILE_PREFERENCE ".MAKE.MAKEFILE_PREFERENCE"
 #define MAKE_DEPENDFILE	".MAKE.DEPENDFILE" /* .depend */
 #define MAKE_MODE	".MAKE.MODE"
 #ifndef MAKE_LEVEL_ENV
 # define MAKE_LEVEL_ENV	"MAKELEVEL"
 #endif
 typedef enum DebugFlags {
     DEBUG_ARCH		= 1 << 0,
     DEBUG_COND		= 1 << 1,
     DEBUG_DIR		= 1 << 2,
     DEBUG_GRAPH1	= 1 << 3,
     DEBUG_GRAPH2	= 1 << 4,
     DEBUG_JOB		= 1 << 5,
     DEBUG_MAKE		= 1 << 6,
     DEBUG_SUFF		= 1 << 7,
     DEBUG_TARG		= 1 << 8,
     DEBUG_VAR		= 1 << 9,
     DEBUG_FOR		= 1 << 10,
     DEBUG_SHELL		= 1 << 11,
     DEBUG_ERROR		= 1 << 12,
     DEBUG_LOUD		= 1 << 13,
     DEBUG_META		= 1 << 14,
     DEBUG_HASH		= 1 << 15,
     DEBUG_GRAPH3	= 1 << 16,
     DEBUG_SCRIPT	= 1 << 17,
     DEBUG_PARSE		= 1 << 18,
     DEBUG_CWD		= 1 << 19,
     DEBUG_LINT		= 1 << 20
 } DebugFlags;
 #define CONCAT(a,b)	a##b
 #define	DEBUG(module)	(opts.debug & CONCAT(DEBUG_,module))
 void debug_printf(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2);
 #define DEBUG0(module, text) \
     if (!DEBUG(module)) (void)0; \
     else debug_printf("%s", text)
 #define DEBUG1(module, fmt, arg1) \
     if (!DEBUG(module)) (void)0; \
     else debug_printf(fmt, arg1)
 #define DEBUG2(module, fmt, arg1, arg2) \
     if (!DEBUG(module)) (void)0; \
     else debug_printf(fmt, arg1, arg2)
 #define DEBUG3(module, fmt, arg1, arg2, arg3) \
     if (!DEBUG(module)) (void)0; \
     else debug_printf(fmt, arg1, arg2, arg3)
 #define DEBUG4(module, fmt, arg1, arg2, arg3, arg4) \
     if (!DEBUG(module)) (void)0; \
     else debug_printf(fmt, arg1, arg2, arg3, arg4)
 #define DEBUG5(module, fmt, arg1, arg2, arg3, arg4, arg5) \
     if (!DEBUG(module)) (void)0; \
     else debug_printf(fmt, arg1, arg2, arg3, arg4, arg5)
 typedef enum PrintVarsMode {
     COMPAT_VARS = 1,
     EXPAND_VARS
 } PrintVarsMode;
 /* Command line options */
 typedef struct CmdOpts {
     /* -B: whether we are make compatible */
     Boolean compatMake;
     /* -d: debug control: There is one bit per module.  It is up to the
      * module what debug information to print. */
     DebugFlags debug;
     /* -df: debug output is written here - default stderr */
     FILE *debug_file;
     /* -dV: for the -V option, print unexpanded variable values */
     Boolean debugVflag;
     /* -e: check environment variables before global variables */
     Boolean checkEnvFirst;
     /* -f: the makefiles to read */
     StringList *makefiles;
     /* -i: if true, ignore all errors from shell commands */
     Boolean ignoreErrors;
     /* -j: the maximum number of jobs that can run in parallel;
      * this is coordinated with the submakes */
     int maxJobs;
     /* -k: if true, continue on unaffected portions of the graph when an
      * error occurs in one portion */
     Boolean keepgoing;
     /* -N: execute no commands from the targets */
     Boolean noRecursiveExecute;
     /* -n: execute almost no commands from the targets */
     Boolean noExecute;
     /* -q: if true, we aren't supposed to really make anything, just see if
      * the targets are out-of-date */
     Boolean queryFlag;
     /* -r: raw mode, without loading the builtin rules. */
     Boolean noBuiltins;
     /* -s: don't echo the shell commands before executing them */
     Boolean beSilent;
     /* -t: touch the targets if they are out-of-date, but don't actually
      * make them */
     Boolean touchFlag;
     /* -[Vv]: print expanded or unexpanded selected variables */
     PrintVarsMode printVars;
     /* -[Vv]: the variables to print */
     StringList *variables;
     /* -W: if true, makefile parsing warnings are treated as errors */
     Boolean parseWarnFatal;
     /* -w: print Entering and Leaving for submakes */
     Boolean enterFlag;
     /* -X: if true, do not export variables set on the command line to the
      * environment. */
     Boolean varNoExportEnv;
     /* The target names specified on the command line.
      * Used to resolve .if make(...) statements. */
     StringList *create;
 } CmdOpts;
 extern CmdOpts opts;
 #include "nonints.h"
 void Make_TimeStamp(GNode *, GNode *);
 Boolean Make_OODate(GNode *);
 void Make_ExpandUse(GNodeList *);
 time_t Make_Recheck(GNode *);
 void Make_HandleUse(GNode *, GNode *);
 void Make_Update(GNode *);
 void Make_DoAllVar(GNode *);
 Boolean Make_Run(GNodeList *);
 int dieQuietly(GNode *, int);
 void PrintOnError(GNode *, const char *);
 void Main_ExportMAKEFLAGS(Boolean);
 Boolean Main_SetObjdir(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2);
 int mkTempFile(const char *, char **);
 int str2Lst_Append(StringList *, char *, const char *);
 void GNode_FprintDetails(FILE *, const char *, const GNode *, const char *);
-Boolean NoExecute(GNode *gn);
+Boolean GNode_ShouldExecute(GNode *gn);
 /* See if the node was seen on the left-hand side of a dependency operator. */
 static MAKE_ATTR_UNUSED Boolean
 GNode_IsTarget(const GNode *gn)
+{
     return (gn->type & OP_OPMASK) != 0;
+}
 static MAKE_ATTR_UNUSED const char *
 GNode_Path(const GNode *gn)
+{
     return gn->path != NULL ? gn->path : gn->name;
+}
 static MAKE_ATTR_UNUSED const char *
 GNode_VarTarget(GNode *gn) { return Var_ValueDirect(TARGET, gn); }
 static MAKE_ATTR_UNUSED const char *
 GNode_VarOodate(GNode *gn) { return Var_ValueDirect(OODATE, gn); }
 static MAKE_ATTR_UNUSED const char *
 GNode_VarAllsrc(GNode *gn) { return Var_ValueDirect(ALLSRC, gn); }
 static MAKE_ATTR_UNUSED const char *
 GNode_VarImpsrc(GNode *gn) { return Var_ValueDirect(IMPSRC, gn); }
 static MAKE_ATTR_UNUSED const char *
 GNode_VarPrefix(GNode *gn) { return Var_ValueDirect(PREFIX, gn); }
 static MAKE_ATTR_UNUSED const char *
 GNode_VarArchive(GNode *gn) { return Var_ValueDirect(ARCHIVE, gn); }
 static MAKE_ATTR_UNUSED const char *
 GNode_VarMember(GNode *gn) { return Var_ValueDirect(MEMBER, gn); }
 #ifdef __GNUC__
 #define UNCONST(ptr)	({		\
     union __unconst {			\
 	const void *__cp;		\
 	void *__p;			\
     } __d;				\
     __d.__cp = ptr, __d.__p; })
 #else
 #define UNCONST(ptr)	(void *)(ptr)
 #endif
 /* At least GNU/Hurd systems lack hardcoded MAXPATHLEN/PATH_MAX */
 #include <limits.h>
 #ifndef MAXPATHLEN
 #define MAXPATHLEN	4096
 #endif
 #ifndef PATH_MAX
 #define PATH_MAX	MAXPATHLEN
 #endif
 #if defined(SYSV)
 #define KILLPG(pid, sig)	kill(-(pid), (sig))
 #else
 #define KILLPG(pid, sig)	killpg((pid), (sig))
 #endif
 static inline MAKE_ATTR_UNUSED Boolean ch_isalnum(char ch)
 { return isalnum((unsigned char)ch) != 0; }
 static inline MAKE_ATTR_UNUSED Boolean ch_isalpha(char ch)
 { return isalpha((unsigned char)ch) != 0; }
 static inline MAKE_ATTR_UNUSED Boolean ch_isdigit(char ch)
 { return isdigit((unsigned char)ch) != 0; }
 static inline MAKE_ATTR_UNUSED Boolean ch_isspace(char ch)
 { return isspace((unsigned char)ch) != 0; }
 static inline MAKE_ATTR_UNUSED Boolean ch_isupper(char ch)
 { return isupper((unsigned char)ch) != 0; }
 static inline MAKE_ATTR_UNUSED char ch_tolower(char ch)
 { return (char)tolower((unsigned char)ch); }
 static inline MAKE_ATTR_UNUSED char ch_toupper(char ch)
 { return (char)toupper((unsigned char)ch); }
 static inline MAKE_ATTR_UNUSED void
 cpp_skip_whitespace(const char **pp)
+{
     while (ch_isspace(**pp))
 	(*pp)++;
+}
 static inline MAKE_ATTR_UNUSED void
 pp_skip_whitespace(char **pp)
+{
     while (ch_isspace(**pp))
 	(*pp)++;
+}
 #ifdef MAKE_NATIVE
 #  include <sys/cdefs.h>
 #  ifndef lint
 #    define MAKE_RCSID(id) __RCSID(id)
 #  endif
 #else
 #  define MAKE_RCSID(id) static volatile char rcsid[] = id
 #endif
 #endif /* MAKE_MAKE_H */