 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.93 2020/08/25 16:39:19 rillig Exp $
+#	$NetBSD: Makefile,v 1.94 2020/08/26 23:00:47 rillig Exp $
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 PROG=	make
 SRCS=	arch.c
 SRCS+=  buf.c
 SRCS+=  compat.c
 SRCS+=  cond.c
 SRCS+=  dir.c
 SRCS+=  enum.c
 SRCS+=  for.c
 SRCS+=  hash.c
 SRCS+=  job.c
 SRCS+=  lst.c
 @@ -27,27 +27,26 @@ SRCS+=  util.c
 HDRS=   buf.h
 HDRS+=  config.h
 HDRS+=  dir.h
 HDRS+=  enum.h
 HDRS+=  hash.h
 HDRS+=  job.h
 HDRS+=  lst.h
 HDRS+=  make.h
 HDRS+=  make_malloc.h
 HDRS+=  meta.h
 HDRS+=  metachar.h
 HDRS+=  nonints.h
 HDRS+=  pathnames.h
 HDRS+=  sprite.h
 HDRS+=  strlist.h
 HDRS+=  trace.h
 # Whether to generate a coverage report after running the tests.
 USE_COVERAGE?=	no		# works only with gcc; clang9 fails to link
 .if ${USE_COVERAGE} == "yes"
 GCOV?=		gcov
 COPTS+=		--coverage -O0 -ggdb
 LDADD+=		--coverage
 .endif
 CLEANFILES+=	*.gcda *.gcno *.gcov
 # Whether to compile using the Undefined Behavior Sanitizer (GCC, Clang).

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hash.c,v 1.26 2020/08/01 14:47:49 rillig Exp $	*/
+/*	$NetBSD: hash.c,v 1.27 2020/08/26 23:00:47 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,48 +60,46 @@
  * 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: hash.c,v 1.26 2020/08/01 14:47:49 rillig Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.27 2020/08/26 23:00:47 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)hash.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: hash.c,v 1.26 2020/08/01 14:47:49 rillig Exp $");
+__RCSID("$NetBSD: hash.c,v 1.27 2020/08/26 23:00:47 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /* hash.c --
+ *
  * 	This module contains routines to manipulate a hash table.
  * 	See hash.h for a definition of the structure of the hash
  * 	table.  Hash tables grow automatically as the amount of
  * 	information increases.
  */
 #include "sprite.h"
 #include "make.h"
 #include "hash.h"
 /*
  * Forward references to local procedures that are used before they're
  * defined:
  */
 static void RebuildTable(Hash_Table *);
 /*
  * The following defines the ratio of # entries to # buckets
  * at which we rebuild the table to make it larger.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lst.h,v 1.44 2020/08/26 22:55:46 rillig Exp $	*/
+/*	$NetBSD: lst.h,v 1.45 2020/08/26 23:00:47 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.
 @@ -73,28 +73,26 @@
  *	from: @(#)lst.h	8.1 (Berkeley) 6/6/93
  */
 /*-
  * lst.h --
  *	Header for using the list library
  */
 #ifndef MAKE_LST_H
 #define MAKE_LST_H
 #include	<sys/param.h>
 #include	<stdlib.h>
 #include	"sprite.h"
 /*
  * basic typedef. This is what the Lst_ functions handle
  */
 typedef	struct List	*Lst;
 typedef	struct ListNode	*LstNode;
 typedef void *LstCopyProc(void *);
 typedef void LstFreeProc(void *);
 typedef int LstFindProc(const void *, const void *);
 typedef int LstActionProc(void *, void *);
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.h,v 1.126 2020/08/24 20:15:51 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.127 2020/08/26 23:00:47 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.
 @@ -118,27 +118,57 @@
 #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
-#include "sprite.h"
+/*
  * A boolean type is defined as an integer, not an enum. This allows a
  * boolean argument to be an expression that isn't strictly 0 or 1 valued.
  */
 typedef int Boolean;
 #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 "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 */