 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.443 2020/11/08 02:56:43 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.444 2020/11/08 08:53:22 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.
 @@ -99,27 +99,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.443 2020/11/08 02:56:43 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.444 2020/11/08 08:53:22 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 */
 @@ -248,32 +248,30 @@ parse_debug_options(const char *argvalue
 		case 'd':
 			opts.debug |= DEBUG_DIR;
 			break;
 		case 'e':
 			opts.debug |= DEBUG_ERROR;
 			break;
 		case 'f':
 			opts.debug |= DEBUG_FOR;
 			break;
 		case 'g':
 			if (modules[1] == '1') {
 				opts.debug |= DEBUG_GRAPH1;
 				++modules;
 			} else if (modules[1] == '2') {
 			else if (modules[1] == '2') {
 				opts.debug |= DEBUG_GRAPH2;
 				++modules;
 			} else if (modules[1] == '3') {
 			else if (modules[1] == '3') {
 				opts.debug |= DEBUG_GRAPH3;
 				++modules;
+			}
 			break;
 		case 'h':
 			opts.debug |= DEBUG_HASH;
 			break;
 		case 'j':
 			opts.debug |= DEBUG_JOB;
 			break;
 		case 'L':
 			opts.debug |= DEBUG_LINT;
 			break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.c,v 1.190 2020/11/08 08:33:07 rillig Exp $	*/
+/*	$NetBSD: make.c,v 1.191 2020/11/08 08:53:22 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.
 @@ -98,27 +98,27 @@
  *	GNode_IsOODate	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.190 2020/11/08 08:33:07 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.191 2020/11/08 08:53:22 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
 @@ -540,28 +540,27 @@ Make_Recheck(GNode *gn)
      * 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 (!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 {
     else {
 	DEBUG2(MAKE, " recheck(%s): current update time: %s\n",
 	       gn->name, Targ_FmtTime(gn->mtime));
+    }
 #endif
     return mtime;
+}
 /*
  * Set the .PREFIX and .IMPSRC variables for all the implied parents
  * of this node.
  */
 static void
 UpdateImplicitParentsVars(GNode *cgn, const char *cname)

 @@ -1,45 +1,44 @@
-/*	$NetBSD: util.c,v 1.66 2020/11/07 22:29:58 rillig Exp $	*/
+/*	$NetBSD: util.c,v 1.67 2020/11/08 08:53:22 rillig Exp $	*/
 /*
  * Missing stuff from OS's
  */
 #if defined(__MINT__) || defined(__linux__)
 #include <signal.h>
 #endif
 #include <sys/param.h>
 #include <errno.h>
 #include <time.h>
 #include <signal.h>
 #include "make.h"
-MAKE_RCSID("$NetBSD: util.c,v 1.66 2020/11/07 22:29:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: util.c,v 1.67 2020/11/08 08:53:22 rillig Exp $");
 #if !defined(MAKE_NATIVE) && !defined(HAVE_STRERROR)
 extern int errno, sys_nerr;
 extern char *sys_errlist[];
 char *
 strerror(int e)
+{
     static char buf[100];
     if (e < 0 || e >= sys_nerr) {
 	snprintf(buf, sizeof buf, "Unknown error %d", e);
 	return buf;
     } else
     else
 	return sys_errlist[e];
+}
 #endif
 #if !defined(MAKE_NATIVE) && !defined(HAVE_SETENV)
 extern char **environ;
 static char *
 findenv(const char *name, int *offset)
+{
 	size_t i, len;
 	char *p, *q;
 @@ -281,28 +280,27 @@ getwd(char *pathname)
 	if ((dp = opendir(nextpathptr)) == NULL) {
 	    (void)sprintf(pathname,
 			    "getwd: Cannot open directory \"%s\" (%s)",
 			    nextpathptr, strerror(errno));
 	    return NULL;
+	}
 	/* look in the parent for the entry with the same inode */
 	if (DEV_DEV_COMPARE(st_dotdot.st_dev, st_cur.st_dev)) {
 	    /* Parent has same device. No need to stat every member */
 	    for (d = readdir(dp); d != NULL; d = readdir(dp))
 		if (d->d_fileno == st_cur.st_ino)
 		    break;
 	} else {
 	else {
 	    /*
 	     * Parent has a different device. This is a mount point so we
 	     * need to stat every member
 	     */
 	    for (d = readdir(dp); d != NULL; d = readdir(dp)) {
 		if (ISDOT(d->d_name) || ISDOTDOT(d->d_name))
 		    continue;
 		(void)strcpy(cur_name_add, d->d_name);
 		if (lstat(nextpathptr, &st_next) == -1) {
 		    (void)sprintf(pathname,
 			"getwd: Cannot stat \"%s\" (%s)",
 			d->d_name, strerror(errno));
 		    (void)closedir(dp);