 @@ -1,14 +1,14 @@
-/*	$NetBSD: arch.c,v 1.104 2020/08/29 10:12:06 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.105 2020/08/29 12:20:17 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,52 +59,52 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.104 2020/08/29 10:12:06 rillig Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.105 2020/08/29 12:20:17 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: arch.c,v 1.104 2020/08/29 10:12:06 rillig Exp $");
+__RCSID("$NetBSD: arch.c,v 1.105 2020/08/29 12:20:17 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * arch.c --
  *	Functions to manipulate libraries, archives and their members.
+ *
  *	Once again, cacheing/hashing comes into play in the manipulation
  * of archives. The first time an archive is referenced, all of its members'
  * headers are read and hashed and the archive closed again. All hashed
  * archives are kept on a list which is searched each time an archive member
  * is referenced.
+ *
  * The interface to this module is:
  *	Arch_ParseArchive   	Given an archive specification, return a list
  *	    	  	    	of GNode's, one for each member in the spec.
- *	    	  	    	FAILURE is returned if the specification is
+ *	    	  	    	FALSE is returned if the specification is
  *	    	  	    	invalid for some reason.
+ *
  *	Arch_Touch	    	Alter the modification time of the archive
  *	    	  	    	member described by the given node to be
  *	    	  	    	the current time.
+ *
  *	Arch_TouchLib	    	Update the modification time of the library
  *	    	  	    	described by the given node. This is special
  *	    	  	    	because it also updates the modification time
  *	    	  	    	of the library's table of contents.
+ *
  *	Arch_MTime	    	Find the modification time of a member of
  *	    	  	    	an archive *in the archive*. The time is also
 @@ -348,27 +348,27 @@ Arch_ParseArchive(char **linePtr, Lst no
 		 * SuffExpandChildren handle it...
 		 */
 		gn = Targ_FindNode(buf, TARG_CREATE);
 		if (gn == NULL) {
 		    free(buf);
 		    return FALSE;
 		} else {
 		    gn->type |= OP_ARCHV;
 		    Lst_Append(nodeLst, gn);
+		}
 	    } else if (!Arch_ParseArchive(&sacrifice, nodeLst, ctxt)) {
 		/*
-		 * Error in nested call -- free buffer and return FAILURE
+		 * Error in nested call -- free buffer and return FALSE
 		 * ourselves.
 		 */
 		free(buf);
 		return FALSE;
+	    }
 	    /*
 	     * Free buffer and continue with our work.
 	     */
 	    free(buf);
 	} else if (Dir_HasWildcards(memName)) {
 	    Lst members = Lst_Init();
 	    Buffer nameBuf;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.c,v 1.223 2020/08/29 10:41:12 rillig Exp $	*/
+/*	$NetBSD: job.c,v 1.224 2020/08/29 12:20:17 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,34 +60,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.223 2020/08/29 10:41:12 rillig Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.224 2020/08/29 12:20:17 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: job.c,v 1.223 2020/08/29 10:41:12 rillig Exp $");
+__RCSID("$NetBSD: job.c,v 1.224 2020/08/29 12:20:17 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * job.c --
  *	handle the creation etc. of our child processes.
+ *
  * Interface:
  *	Job_Make  	    	Start the creation of the given target.
+ *
  *	Job_CatchChildren   	Check for and handle the termination of any
  *	    	  	    	children. This must be called reasonably
 @@ -102,27 +102,27 @@ __RCSID("$NetBSD: job.c,v 1.223 2020/08/
  *	    	  	    	a time given by the SEL_* constants, below,
  *	    	  	    	or until output is ready.
+ *
  *	Job_Init  	    	Called to initialize this module. in addition,
  *	    	  	    	any commands attached to the .BEGIN target
  *	    	  	    	are executed before this function returns.
  *	    	  	    	Hence, the makefile must have been parsed
  *	    	  	    	before this function is called.
+ *
  *	Job_End  	    	Cleanup any memory used.
+ *
  *	Job_ParseShell	    	Given the line following a .SHELL target, parse
  *	    	  	    	the line as a shell specification. Returns
- *	    	  	    	FAILURE if the spec was incorrect.
+ *	    	  	    	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, as it were.
+ *
  *	Job_CheckCommands   	Verify that the commands for a target are
 @@ -2366,27 +2366,27 @@ JobMatchShell(const char *name)
     return NULL;
+}
 /*-
  *-----------------------------------------------------------------------
  * Job_ParseShell --
  *	Parse a shell specification and set up commandShell, shellPath
  *	and shellName appropriately.
+ *
  * Input:
  *	line		The shell spec
+ *
  * Results:
- *	FAILURE if the specification was incorrect.
+ *	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
 @@ -2403,52 +2403,52 @@ JobMatchShell(const char *name)
  *	    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.
+ *
  *-----------------------------------------------------------------------
  */
-ReturnStatus
+Boolean
 Job_ParseShell(char *line)
+{
     char	**words;
     char	**argv;
     size_t	argc;
     char	*path;
     Shell	newShell;
     Boolean	fullSpec = FALSE;
     Shell	*sh;
     while (isspace((unsigned char)*line)) {
 	line++;
+    }
     free(shellArgv);
     memset(&newShell, 0, sizeof(newShell));
     /*
      * Parse the specification by keyword
      */
     words = brk_string(line, TRUE, &argc, &path);
     if (words == NULL) {
 	Error("Unterminated quoted string [%s]", line);
-	return FAILURE;
+	return FALSE;
+    }
     shellArgv = path;
     for (path = NULL, argv = words; argc != 0; argc--, argv++) {
 	    if (strncmp(*argv, "path=", 5) == 0) {
 		path = &argv[0][5];
 	    } else if (strncmp(*argv, "name=", 5) == 0) {
 		newShell.name = &argv[0][5];
 	    } else {
 		if (strncmp(*argv, "quiet=", 6) == 0) {
 		    newShell.echoOff = &argv[0][6];
 		} else if (strncmp(*argv, "echo=", 5) == 0) {
 		    newShell.echoOn = &argv[0][5];
 @@ -2467,49 +2467,49 @@ Job_ParseShell(char *line)
 		    newShell.newline = &argv[0][8];
 		} else if (strncmp(*argv, "check=", 6) == 0) {
 		    newShell.errCheck = &argv[0][6];
 		} else if (strncmp(*argv, "ignore=", 7) == 0) {
 		    newShell.ignErr = &argv[0][7];
 		} else if (strncmp(*argv, "errout=", 7) == 0) {
 		    newShell.errOut = &argv[0][7];
 		} else if (strncmp(*argv, "comment=", 8) == 0) {
 		    newShell.commentChar = argv[0][8];
 		} else {
 		    Parse_Error(PARSE_FATAL, "Unknown keyword \"%s\"",
 				*argv);
 		    free(words);
-		    return FAILURE;
+		    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 FAILURE;
+	    return FALSE;
 	} else {
 	    if ((sh = JobMatchShell(newShell.name)) == NULL) {
 		    Parse_Error(PARSE_WARNING, "%s: No matching shell",
 				newShell.name);
 		    free(words);
-		    return FAILURE;
+		    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
 @@ -2525,27 +2525,27 @@ Job_ParseShell(char *line)
 	} else {
 	    path += 1;
+	}
 	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 FAILURE;
+		    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;
+    }
 @@ -2554,27 +2554,27 @@ Job_ParseShell(char *line)
 	if (commandShell->errCheck == NULL) {
 	    commandShell->errCheck = "";
+	}
 	if (commandShell->ignErr == NULL) {
 	    commandShell->ignErr = "%s\n";
+	}
+    }
     /*
      * Do not free up the words themselves, since they might be in use by the
      * shell specification.
      */
     free(words);
-    return SUCCESS;
+    return TRUE;
+}
 /*-
  *-----------------------------------------------------------------------
  * JobInterrupt --
  *	Handle the receipt of an interrupt.
+ *
  * Input:
  *	runINTERRUPT	Non-zero if commands for the .INTERRUPT target
  *			should be executed
  *	signo		signal received
+ *
  * Results:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.271 2020/08/29 11:24:54 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.272 2020/08/29 12:20:17 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.271 2020/08/29 11:24:54 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.272 2020/08/29 12:20:17 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.271 2020/08/29 11:24:54 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.272 2020/08/29 12:20:17 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * parse.c --
  *	Functions to parse a makefile.
+ *
  *	One function, Parse_Init, must be called before any functions
  *	in this module are used. After that, the function Parse_File is the
  *	main entry point and controls most of the other functions in this
  *	module.
+ *
 @@ -415,54 +415,54 @@ loadedfile_nextbuf(void *x, size_t *len)
 	struct loadedfile *lf = x;
 	if (lf->used) {
 		return NULL;
+	}
 	lf->used = TRUE;
 	*len = lf->len;
 	return lf->buf;
+}
 /*
  * Try to get the size of a file.
  */
-static ReturnStatus
+static Boolean
 load_getsize(int fd, size_t *ret)
+{
 	struct stat st;
 	if (fstat(fd, &st) < 0) {
-		return FAILURE;
+		return FALSE;
+	}
 	if (!S_ISREG(st.st_mode)) {
-		return FAILURE;
+		return FALSE;
+	}
 	/*
 	 * st_size is an off_t, which is 64 bits signed; *ret is
 	 * size_t, which might be 32 bits unsigned or 64 bits
 	 * unsigned. Rather than being elaborate, just punt on
 	 * files that are more than 2^31 bytes. We should never
 	 * see a makefile that size in practice...
+	 *
 	 * While we're at it reject negative sizes too, just in case.
 	 */
 	if (st.st_size < 0 || st.st_size > 0x7fffffff) {
-		return FAILURE;
+		return FALSE;
+	}
 	*ret = (size_t) st.st_size;
-	return SUCCESS;
+	return TRUE;
+}
 /*
  * Read in a file.
+ *
  * Until the path search logic can be moved under here instead of
  * being in the caller in another source file, we need to have the fd
  * passed in already open. Bleh.
+ *
  * If the path is NULL use stdin and (to insure against fd leaks)
  * assert that the caller passed in -1.
  */
 static struct loadedfile *
 @@ -479,27 +479,27 @@ loadfile(const char *path, int fd)
 		assert(fd == -1);
 		fd = STDIN_FILENO;
 	} else {
 #if 0 /* notyet */
 		fd = open(path, O_RDONLY);
 		if (fd < 0) {
 			...
 			Error("%s: %s", path, strerror(errno));
 			exit(1);
+		}
 #endif
+	}
-	if (load_getsize(fd, &lf->len) == SUCCESS) {
+	if (load_getsize(fd, &lf->len)) {
 		/* found a size, try mmap */
 		if (pagesize == 0)
 			pagesize = sysconf(_SC_PAGESIZE);
 		if (pagesize <= 0) {
 			pagesize = 0x1000;
+		}
 		/* round size up to a page */
 		lf->maplen = pagesize * ((lf->len + pagesize - 1)/pagesize);
 		/*
 		 * XXX hack for dealing with empty files; remove when
 		 * we're no longer limited by interfacing to the old
 		 * logic elsewhere in this file.
 @@ -1243,28 +1243,28 @@ ParseDoDependency(char *line)
+	}
 	/*
 	 * If the word is followed by a left parenthesis, it's the
 	 * name of an object file inside an archive (ar file).
 	 */
 	if (!ParseIsEscaped(lstart, cp) && *cp == LPAREN) {
 	    /*
 	     * Archives must be handled specially to make sure the OP_ARCHV
 	     * flag is set in their 'type' field, for one thing, and because
 	     * things like "archive(file1.o file2.o file3.o)" are permissible.
 	     * Arch_ParseArchive will set 'line' to be the first non-blank
 	     * after the archive-spec. It creates/finds nodes for the members
-	     * and places them on the given list, returning SUCCESS if all
+	     * and places them on the given list, returning TRUE if all
-	     * went well and FAILURE if there was an error in the
+	     * went well and FALSE if there was an error in the
 	     * specification. On error, line should remain untouched.
 	     */
 	    if (!Arch_ParseArchive(&line, targets, VAR_CMD)) {
 		Parse_Error(PARSE_FATAL,
 			     "Error in archive specification: \"%s\"", line);
 		goto out;
 	    } else {
 		/* Done with this word; on to the next. */
 		cp = line;
 		continue;
+	    }
+	}
 @@ -1599,27 +1599,27 @@ ParseDoDependency(char *line)
 #endif
 	    default:
 		break;
+	}
     } else if (specType == MFlags) {
 	/*
 	 * Call on functions in main.c to deal with these arguments and
 	 * set the initial character to a null-character so the loop to
 	 * get sources won't get anything
 	 */
 	Main_ParseArgLine(line);
 	*line = '\0';
     } else if (specType == ExShell) {
-	if (Job_ParseShell(line) != SUCCESS) {
+	if (!Job_ParseShell(line)) {
 	    Parse_Error(PARSE_FATAL, "improper shell specification");
 	    goto out;
+	}
 	*line = '\0';
     } else if (specType == NotParallel || specType == SingleShell ||
 	    specType == DeleteOnError) {
 	*line = '\0';
+    }
     /*
      * NOW GO FOR THE SOURCES
      */
     if (specType == Suffixes || specType == ExPath ||

 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.h,v 1.46 2020/08/27 06:18:22 rillig Exp $	*/
+/*	$NetBSD: job.h,v 1.47 2020/08/29 12:20:17 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.
 @@ -245,25 +245,25 @@ extern char *shellErrFlag;
 extern int	jobTokensRunning; /* tokens currently "out" */
 extern int	maxJobs;	/* Max jobs we can run */
 void Shell_Init(void);
 const char *Shell_GetNewline(void);
 void Job_Touch(GNode *, Boolean);
 Boolean Job_CheckCommands(GNode *, void (*abortProc )(const char *, ...));
 void Job_CatchChildren(void);
 void Job_CatchOutput(void);
 void Job_Make(GNode *);
 void Job_Init(void);
 Boolean Job_Empty(void);
-ReturnStatus Job_ParseShell(char *);
+Boolean Job_ParseShell(char *);
 int Job_Finish(void);
 void Job_End(void);
 void Job_Wait(void);
 void Job_AbortAll(void);
 void Job_TokenReturn(void);
 Boolean Job_TokenWithdraw(void);
 void Job_ServerStart(int, int, int);
 void Job_SetPrefix(void);
 Boolean Job_RunTarget(const char *, const char *);
 #endif /* MAKE_JOB_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.h,v 1.131 2020/08/29 08:09:07 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.132 2020/08/29 12:20:17 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.
 @@ -142,44 +142,26 @@ typedef double Boolean;
 typedef unsigned char Boolean;
 #define TRUE ((unsigned char)0xFF)
 #define FALSE ((unsigned char)0x00)
 #else
 typedef int Boolean;
 #endif
 #ifndef TRUE
 #define TRUE	1
 #endif /* TRUE */
 #ifndef FALSE
 #define FALSE	0
 #endif /* FALSE */
 /*
  * Functions that must return a status can return a ReturnStatus to
  * indicate success or type of failure.
  */
 typedef int  ReturnStatus;
 /*
  * The following statuses overlap with the first 2 generic statuses
  * defined in status.h:
  * SUCCESS			There was no error.
  * FAILURE			There was a general error.
  */
 #define	SUCCESS			0x00000000
 #define	FAILURE			0x00000001
 #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. */