 @@ -1,14 +1,14 @@
-/*	$NetBSD: hash.c,v 1.22 2020/07/03 17:03:09 rillig Exp $	*/
+/*	$NetBSD: hash.c,v 1.23 2020/07/18 21:37:38 sjg 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: hash.c,v 1.22 2020/07/03 17:03:09 rillig Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.23 2020/07/18 21:37:38 sjg 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.22 2020/07/03 17:03:09 rillig Exp $");
+__RCSID("$NetBSD: hash.c,v 1.23 2020/07/18 21:37:38 sjg 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"
 @@ -97,26 +97,34 @@ __RCSID("$NetBSD: hash.c,v 1.22 2020/07/
  * 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.
  */
 #define rebuildLimit 3
 /* The hash function(s) */
 /* This one matches Gosling's emacs */
 #define HASH(h, key, p) do { \
 	for (h = 0, p = key; *p;) \
 		h = (h << 5) - h + *p++; \
 	} while (0)
 /*
  *---------------------------------------------------------
+ *
  * Hash_InitTable --
+ *
  *	This routine just sets up the hash table.
+ *
  * Input:
  *	t		Structure to to hold table.
  *	numBuckets	How many buckets to create for starters. This
  *			number is rounded up to a power of two.   If
  *			<= 0, a reasonable default is chosen. The
  *			table will grow in size later as needed.
 @@ -136,26 +144,27 @@ Hash_InitTable(Hash_Table *t, int numBuc
 	int i;
 	struct Hash_Entry **hp;
 	/*
 	 * Round up the size to a power of two.
 	 */
 	if (numBuckets <= 0)
 		i = 16;
 	else {
 		for (i = 2; i < numBuckets; i <<= 1)
 			 continue;
+	}
 	t->numEntries = 0;
 	t->maxlen = 0;
 	t->size = i;
 	t->mask = i - 1;
 	t->bucketPtr = hp = bmake_malloc(sizeof(*hp) * i);
 	while (--i >= 0)
 		*hp++ = NULL;
+}
 /*
  *---------------------------------------------------------
+ *
  * Hash_DeleteTable --
+ *
  *	This routine removes everything from a hash table
 @@ -210,37 +219,45 @@ Hash_DeleteTable(Hash_Table *t)
+ *
  * Side Effects:
  *	None.
+ *
  *---------------------------------------------------------
  */
 Hash_Entry *
 Hash_FindEntry(Hash_Table *t, const char *key)
+{
 	Hash_Entry *e;
 	unsigned h;
 	const char *p;
 	int chainlen;
 	if (t == NULL || t->bucketPtr == NULL) {
 	    return NULL;
+	}
-	for (h = 0, p = key; *p;)
+	HASH(h, key, p);
 		h = (h << 5) - h + *p++;
 	p = key;
-	for (e = t->bucketPtr[h & t->mask]; e != NULL; e = e->next)
+	if (DEBUG(HASH))
-		if (e->namehash == h && strcmp(e->name, p) == 0)
+		fprintf(debug_file, "%s: %p h=%x key=%s\n", __func__,
-			return e;
+		    t, h, key);
-	return NULL;
+	chainlen = 0;
 	for (e = t->bucketPtr[h & t->mask]; e != NULL; e = e->next) {
 		chainlen++;
 		if (e->namehash == h && strcmp(e->name, p) == 0)
 			break;
+	}
 	if (chainlen > t->maxlen)
 		t->maxlen = chainlen;
 	return e;
+}
 /*
  *---------------------------------------------------------
+ *
  * Hash_CreateEntry --
+ *
  *	Searches a hash table for an entry corresponding to
  *	key.  If no entry is found, then one is created.
+ *
  * Input:
  *	t		Hash table to search.
  *	key		A hash key.
 @@ -255,43 +272,52 @@ Hash_FindEntry(Hash_Table *t, const char
+ *
  * Side Effects:
  *	Memory may be allocated, and the hash buckets may be modified.
  *---------------------------------------------------------
  */
 Hash_Entry *
 Hash_CreateEntry(Hash_Table *t, const char *key, Boolean *newPtr)
+{
 	Hash_Entry *e;
 	unsigned h;
 	const char *p;
 	int keylen;
 	int chainlen;
 	struct Hash_Entry **hp;
 	/*
 	 * Hash the key.  As a side effect, save the length (strlen) of the
 	 * key in case we need to create the entry.
 	 */
-	for (h = 0, p = key; *p;)
+	HASH(h, key, p);
 		h = (h << 5) - h + *p++;
 	keylen = p - key;
 	p = key;
 	if (DEBUG(HASH))
 		fprintf(debug_file, "%s: %p h=%x key=%s\n", __func__,
 		    t, h, key);
 	chainlen = 0;
 	for (e = t->bucketPtr[h & t->mask]; e != NULL; e = e->next) {
 		chainlen++;
 		if (e->namehash == h && strcmp(e->name, p) == 0) {
 			if (newPtr != NULL)
 				*newPtr = FALSE;
-			return e;
+			break;
+		}
+	}
 	if (chainlen > t->maxlen)
 		t->maxlen = chainlen;
 	if (e)
 		return e;
 	/*
 	 * The desired entry isn't there.  Before allocating a new entry,
 	 * expand the table if necessary (and this changes the resulting
 	 * bucket chain).
 	 */
 	if (t->numEntries >= rebuildLimit * t->size)
 		RebuildTable(t);
 	e = bmake_malloc(sizeof(*e) + keylen);
 	hp = &t->bucketPtr[h & t->mask];
 	e->next = *hp;
 	*hp = e;
 	Hash_SetValue(e, NULL);
 @@ -453,25 +479,29 @@ RebuildTable(Hash_Table *t)
 	t->mask = mask = i - 1;
 	t->bucketPtr = hp = bmake_malloc(sizeof(*hp) * i);
 	while (--i >= 0)
 		*hp++ = NULL;
 	for (hp = oldhp, i = oldsize; --i >= 0;) {
 		for (e = *hp++; e != NULL; e = next) {
 			next = e->next;
 			xp = &t->bucketPtr[e->namehash & mask];
 			e->next = *xp;
 			*xp = e;
+		}
+	}
 	free(oldhp);
 	if (DEBUG(HASH))
 		fprintf(debug_file, "%s: %p size=%d entries=%d maxlen=%d\n",
 		    __func__, t, t->size, t->numEntries, t->maxlen);
 	t->maxlen = 0;
+}
 void Hash_ForEach(Hash_Table *t, void (*action)(void *, void *), void *data)
+{
 	Hash_Search search;
 	Hash_Entry *e;
 	for (e = Hash_EnumFirst(t, &search);
 	     e != NULL;
 	     e = Hash_EnumNext(&search))
 		action(Hash_GetValue(e), data);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hash.h,v 1.13 2020/07/03 17:03:09 rillig Exp $	*/
+/*	$NetBSD: hash.h,v 1.14 2020/07/18 21:37:38 sjg Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ *
  * 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
 @@ -90,26 +90,27 @@ typedef struct Hash_Entry {
     					 * entries associated with the same
 					 * bucket. */
     void	      *clientPtr;	/* Arbitrary pointer */
     unsigned	      namehash;		/* hash value of key */
     char	      name[1];		/* key string */
 } Hash_Entry;
 typedef struct Hash_Table {
     struct Hash_Entry **bucketPtr;/* Pointers to Hash_Entry, one
     				 * for each bucket in the table. */
     int 	size;		/* Actual size of array. */
     int 	numEntries;	/* Number of entries in the table. */
     int 	mask;		/* Used to select bits for hashing. */
     int 	maxlen;		/* max length of chain detected */
 } Hash_Table;
 /*
  * The following structure is used by the searching routines
  * to record where we are in the search.
  */
 typedef struct Hash_Search {
     Hash_Table  *tablePtr;	/* Table being searched. */
     int 	nextIndex;	/* Next bucket to check (after current). */
     Hash_Entry 	*hashEntryPtr;	/* Next entry to check in current bucket. */
 } Hash_Search;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.279 2020/07/03 08:13:23 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.280 2020/07/18 21:37:38 sjg 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,39 +59,39 @@
  * 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: main.c,v 1.279 2020/07/03 08:13:23 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.280 2020/07/18 21:37:38 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.279 2020/07/03 08:13:23 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.280 2020/07/18 21:37:38 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * main.c --
  *	The main file for this entire program. Exit routines etc
  *	reside here.
+ *
  * Utility functions defined in this file:
  *	Main_ParseArgLine	Takes a line of arguments, breaks them and
  *				treats them as if they were given when first
  *				invoked. Used by the parse module to implement
 @@ -268,26 +268,29 @@ parse_debug_options(const char *argvalue
 			if (modules[1] == '1') {
 				debug |= DEBUG_GRAPH1;
 				++modules;
+			}
 			else if (modules[1] == '2') {
 				debug |= DEBUG_GRAPH2;
 				++modules;
+			}
 			else if (modules[1] == '3') {
 				debug |= DEBUG_GRAPH3;
 				++modules;
+			}
 			break;
 		case 'h':
 			debug |= DEBUG_HASH;
 			break;
 		case 'j':
 			debug |= DEBUG_JOB;
 			break;
 		case 'l':
 			debug |= DEBUG_LOUD;
 			break;
 		case 'M':
 			debug |= DEBUG_META;
 			break;
 		case 'm':
 			debug |= DEBUG_MAKE;
 			break;
 		case 'n':

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: make.1,v 1.282 2020/06/06 20:28:42 wiz Exp $
+.\"	$NetBSD: make.1,v 1.283 2020/07/18 21:37:38 sjg Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" 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
 @@ -19,27 +19,27 @@
 .\" 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.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd June 5, 2020
+.Dd July 18, 2020
 .Dt MAKE 1
 .Os
 .Sh NAME
 .Nm make
 .Nd maintain program dependencies
 .Sh SYNOPSIS
 .Nm
 .Op Fl BeikNnqrstWwX
 .Op Fl C Ar directory
 .Op Fl D Ar variable
 .Op Fl d Ar flags
 .Op Fl f Ar makefile
 .Op Fl I Ar directory
 @@ -156,26 +156,28 @@ If the file name ends
 .Ql .%d
 then the
 .Ql %d
 is replaced by the pid.
 .It Ar f
 Print debugging information about loop evaluation.
 .It Ar "g1"
 Print the input graph before making anything.
 .It Ar "g2"
 Print the input graph after making everything, or before exiting
 on error.
 .It Ar "g3"
 Print the input graph before exiting on error.
 .It Ar h
 Print debugging information about hash table operations.
 .It Ar j
 Print debugging information about running multiple shells.
 .It Ar l
 Print commands in Makefiles regardless of whether or not they are prefixed by
 .Ql @
 or other "quiet" flags.
 Also known as "loud" behavior.
 .It Ar M
 Print debugging information about "meta" mode decisions about targets.
 .It Ar m
 Print debugging information about making targets, including modification
 dates.
 .It Ar n

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.h,v 1.109 2020/07/02 15:14:38 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.110 2020/07/18 21:37:38 sjg 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.
 @@ -455,26 +455,27 @@ extern int debug;
 #define	DEBUG_DIR	0x00004
 #define	DEBUG_GRAPH1	0x00008
 #define	DEBUG_GRAPH2	0x00010
 #define	DEBUG_JOB	0x00020
 #define	DEBUG_MAKE	0x00040
 #define	DEBUG_SUFF	0x00080
 #define	DEBUG_TARG	0x00100
 #define	DEBUG_VAR	0x00200
 #define DEBUG_FOR	0x00400
 #define DEBUG_SHELL	0x00800
 #define DEBUG_ERROR	0x01000
 #define DEBUG_LOUD	0x02000
 #define DEBUG_META	0x04000
 #define DEBUG_HASH	0x08000
 #define DEBUG_GRAPH3	0x10000
 #define DEBUG_SCRIPT	0x20000
 #define DEBUG_PARSE	0x40000
 #define DEBUG_CWD	0x80000
 #define CONCAT(a,b)	a##b
 #define	DEBUG(module)	(debug & CONCAT(DEBUG_,module))
 #include "nonints.h"
 int Make_TimeStamp(GNode *, GNode *);