 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir.c,v 1.189 2020/10/25 21:51:48 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.190 2020/10/26 23:28:52 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.
 @@ -125,27 +125,27 @@
  */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <errno.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 /*	"@(#)dir.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: dir.c,v 1.189 2020/10/25 21:51:48 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.190 2020/10/26 23:28:52 rillig Exp $");
 #define DIR_DEBUG0(text) DEBUG0(DIR, text)
 #define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
 #define DIR_DEBUG2(fmt, arg1, arg2) DEBUG2(DIR, fmt, arg1, arg2)
 /*
  *	A search path consists of a list of CachedDir structures. A CachedDir
  *	has in it the name of the directory and a hash table of all the files
  *	in the directory. This is used to cut down on the number of system
  *	calls necessary to find implicit dependents and their like. Since
  *	these searches are made before any actions are taken, we need not
  *	worry about the directory changing due to creation commands. If this
  *	hampers the style of some makefiles, they must be changed.
 @@ -1493,114 +1493,71 @@ Dir_MakeFlags(const char *flag, SearchPa
     if (path != NULL) {
 	for (ln = path->first; ln != NULL; ln = ln->next) {
 	    CachedDir *dir = ln->datum;
 	    Buf_AddStr(&buf, " ");
 	    Buf_AddStr(&buf, flag);
 	    Buf_AddStr(&buf, dir->name);
+	}
+    }
     return Buf_Destroy(&buf, FALSE);
+}
-/*-
+/* Nuke a directory descriptor, if possible. Callback procedure for the
- *-----------------------------------------------------------------------
+ * suffixes module when destroying a search path.
  * Dir_Destroy --
  *	Nuke a directory descriptor, if possible. Callback procedure
  *	for the suffixes module when destroying a search path.
+ *
  * Input:
  *	dirp		The directory descriptor to nuke
  * Results:
  *	None.
  * Side Effects:
  *	If no other path references this directory (refCount == 0),
  *	the CachedDir and all its data are freed.
  *-----------------------------------------------------------------------
  */
 void
 Dir_Destroy(void *dirp)
+{
     CachedDir *dir = dirp;
     dir->refCount--;
     if (dir->refCount == 0) {
 	OpenDirs_Remove(&openDirs, dir->name);
 	HashTable_Done(&dir->files);
 	free(dir->name);
 	free(dir);
+    }
+}
-/*-
+/* Clear out all elements from the given search path.
- *-----------------------------------------------------------------------
+ * The path is set to the empty list but is not destroyed. */
  * Dir_ClearPath --
  *	Clear out all elements of the given search path. This is different
  *	from destroying the list, notice.
  * Input:
  *	path		Path to clear
  * Results:
  *	None.
  * Side Effects:
  *	The path is set to the empty list.
  *-----------------------------------------------------------------------
  */
 void
 Dir_ClearPath(SearchPath *path)
+{
     while (!Lst_IsEmpty(path)) {
 	CachedDir *dir = Lst_Dequeue(path);
 	Dir_Destroy(dir);
+    }
+}
-/*-
+/* Concatenate two paths, adding the second to the end of the first,
- *-----------------------------------------------------------------------
+ * skipping duplicates. */
  * Dir_Concat --
  *	Concatenate two paths, adding the second to the end of the first.
  *	Makes sure to avoid duplicates.
  * Input:
  *	path1		Dest
  *	path2		Source
  * Results:
  *	None
  * Side Effects:
  *	Reference counts for added dirs are upped.
  *-----------------------------------------------------------------------
  */
 void
-Dir_Concat(SearchPath *path1, SearchPath *path2)
+Dir_Concat(SearchPath *dst, SearchPath *src)
+{
     SearchPathNode *ln;
-    for (ln = path2->first; ln != NULL; ln = ln->next) {
+    for (ln = src->first; ln != NULL; ln = ln->next) {
 	CachedDir *dir = ln->datum;
-	if (Lst_FindDatum(path1, dir) == NULL) {
+	if (Lst_FindDatum(dst, dir) == NULL) {
 	    dir->refCount++;
-	    Lst_Append(path1, dir);
+	    Lst_Append(dst, dir);
+	}
+    }
+}
 static int
 percentage(int num, int den)
+{
     return den != 0 ? num * 100 / den : 0;
+}
 /********** DEBUG INFO **********/
 void
 Dir_PrintDirectories(void)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.c,v 1.292 2020/10/26 23:19:17 rillig Exp $	*/
+/*	$NetBSD: job.c,v 1.293 2020/10/26 23:28:52 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.292 2020/10/26 23:19:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.293 2020/10/26 23:28:52 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
 @@ -1711,29 +1711,26 @@ JobOutput(Job *job, char *cp, char *endp
  *	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
+ *
  * Results:
  *	None
  * 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 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.391 2020/10/26 21:34:10 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.392 2020/10/26 23:28:52 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.
 @@ -108,27 +108,27 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 #include "trace.h"
 /*	"@(#)main.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: main.c,v 1.391 2020/10/26 21:34:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.392 2020/10/26 23:28:52 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
 	    "The Regents of the University of California.  "
 	    "All rights reserved.");
 #endif
 #ifndef	DEFMAXLOCAL
 #define	DEFMAXLOCAL DEFMAXJOBS
 #endif
 CmdOpts opts;
 time_t			now;		/* Time at start of make */
 GNode			*DEFAULT;	/* .DEFAULT node */
 @@ -1773,90 +1773,63 @@ Fatal(const char *fmt, ...)
 	(void)vfprintf(stderr, fmt, ap);
 	va_end(ap);
 	(void)fprintf(stderr, "\n");
 	(void)fflush(stderr);
 	PrintOnError(NULL, NULL);
 	if (DEBUG(GRAPH2) || DEBUG(GRAPH3))
 		Targ_PrintGraph(2);
 	Trace_Log(MAKEERROR, 0);
 	exit(2);		/* Not 1 so -q can distinguish error */
+}
-/*
+/* Major exception once jobs are being created.
- * Punt --
+ * Kills all jobs, prints a message and exits. */
  *	Major exception once jobs are being created. Kills all jobs, prints
  *	a message and exits.
  * Results:
  *	None
  * Side Effects:
  *	All children are killed indiscriminately and the program Lib_Exits
  */
 void
 Punt(const char *fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
 	(void)fflush(stdout);
 	(void)fprintf(stderr, "%s: ", progname);
 	(void)vfprintf(stderr, fmt, ap);
 	va_end(ap);
 	(void)fprintf(stderr, "\n");
 	(void)fflush(stderr);
 	PrintOnError(NULL, NULL);
 	DieHorribly();
+}
-/*-
+/* Exit without giving a message. */
  * DieHorribly --
  *	Exit without giving a message.
  * Results:
  *	None
  * Side Effects:
  *	A big one...
  */
 void
 DieHorribly(void)
+{
 	if (jobsRunning)
 		Job_AbortAll();
 	if (DEBUG(GRAPH2))
 		Targ_PrintGraph(2);
 	Trace_Log(MAKEERROR, 0);
 	exit(2);		/* Not 1, so -q can distinguish error */
+}
-/*
+/* Called when aborting due to errors in child shell to signal abnormal exit.
- * Finish --
+ * The program exits.
- *	Called when aborting due to errors in child shell to signal
+ * Errors is the number of errors encountered in Make_Make. */
  *	abnormal exit.
  * Results:
  *	None
  * Side Effects:
  *	The program exits
  */
 void
 Finish(int errors)
 			/* number of errors encountered in Make_Make */
+{
 	if (dieQuietly(NULL, -1))
 		exit(2);
 	Fatal("%d error%s", errors, errors == 1 ? "" : "s");
+}
 /*
  * eunlink --
  *	Remove a file carefully, avoiding directories.
  */
 int
 eunlink(const char *file)
+{