 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -86,27 +86,27 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <errno.h>
 #include <signal.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 #include "pathnames.h"
 /*	"@(#)compat.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: compat.c,v 1.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)) {
 @@ -264,36 +264,36 @@ Compat_RunCommand(const char *cmdp, GNod
+     *
      * 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;
 @@ -538,40 +538,40 @@ Compat_Make(GNode *gn, GNode *pgn)
 	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;

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -133,27 +133,27 @@
 #ifndef USE_SELECT
 #include <poll.h>
 #endif
 #include <signal.h>
 #include <utime.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 #include "trace.h"
 /*	"@(#)job.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: job.c,v 1.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
 @@ -721,27 +721,27 @@ JobPrintCommand(Job *job, char *cmd)
 				 * 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;
 @@ -1132,32 +1132,32 @@ 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);
 @@ -1590,27 +1590,27 @@ JobStart(GNode *gn, int flags)
 	 */
 	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.

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -97,27 +97,27 @@
  *	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
 @@ -168,29 +168,29 @@ GNode_FprintDetails(FILE *f, const char
     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.
+ *
 @@ -537,27 +537,27 @@ Make_Recheck(GNode *gn)
      * 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;
+}

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -619,27 +619,27 @@ 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;
+}