 @@ -1,14 +1,14 @@
-/*	$NetBSD: arch.c,v 1.150 2020/10/31 11:54:33 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.151 2020/10/31 18:41:07 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.
 @@ -107,40 +107,40 @@
+ *
  *	Arch_FindLib	Search for a library along a path. The
  *			library name in the GNode should be in
  *			-l<name> format.
+ *
  *	Arch_LibOODate	Special function to decide if a library node
  *			is out-of-date.
+ *
  *	Arch_Init	Initialize this module.
+ *
  *	Arch_End	Clean up this module.
  */
-#include    <sys/types.h>
+#include <sys/types.h>
-#include    <sys/stat.h>
+#include <sys/stat.h>
-#include    <sys/time.h>
+#include <sys/time.h>
-#include    <sys/param.h>
+#include <sys/param.h>
-#include    <ar.h>
+#include <ar.h>
-#include    <utime.h>
+#include <utime.h>
-#include    "make.h"
+#include "make.h"
-#include    "dir.h"
+#include "dir.h"
-#include    "config.h"
+#include "config.h"
 /*	"@(#)arch.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: arch.c,v 1.150 2020/10/31 11:54:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.151 2020/10/31 18:41:07 rillig Exp $");
 #ifdef TARGET_MACHINE
 #undef MAKE_MACHINE
 #define MAKE_MACHINE TARGET_MACHINE
 #endif
 #ifdef TARGET_MACHINE_ARCH
 #undef MAKE_MACHINE_ARCH
 #define MAKE_MACHINE_ARCH TARGET_MACHINE_ARCH
 #endif
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: for.c,v 1.111 2020/10/26 07:37:52 rillig Exp $	*/
+/*	$NetBSD: for.c,v 1.112 2020/10/31 18:41:07 rillig Exp $	*/
 /*
  * Copyright (c) 1992, 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.
 @@ -47,30 +47,30 @@
  * handled recursively in For_Eval when the enclosing .for loop is evaluated
  * in For_Run.
+ *
  * When the .for loop has been parsed completely, the variable expressions
  * for the iteration variables are replaced with expressions of the form
  * ${:Uvalue}, and then this modified body is "included" as a special file.
+ *
  * Interface:
  *	For_Eval	Evaluate the loop in the passed line.
+ *
  *	For_Run		Run accumulated loop
  */
-#include    "make.h"
+#include "make.h"
 /*	"@(#)for.c	8.1 (Berkeley) 6/6/93"	*/
-MAKE_RCSID("$NetBSD: for.c,v 1.111 2020/10/26 07:37:52 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.112 2020/10/31 18:41:07 rillig Exp $");
 /* The .for loop substitutes the items as ${:U<value>...}, which means
  * that characters that break this syntax must be backslash-escaped. */
 typedef enum ForEscapes {
     FOR_SUB_ESCAPE_CHAR = 0x0001,
     FOR_SUB_ESCAPE_BRACE = 0x0002,
     FOR_SUB_ESCAPE_PAREN = 0x0004
 } ForEscapes;
 static int forLevel = 0;	/* Nesting level */
 /* One of the variables to the left of the "in" in a .for loop. */
 typedef struct ForVar {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.c,v 1.184 2020/10/31 11:54:33 rillig Exp $	*/
+/*	$NetBSD: make.c,v 1.185 2020/10/31 18:41:07 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.
 @@ -92,32 +92,32 @@
  *	Make_DoAllVar	Set up the various local variables for a
  *			target, including the .ALLSRC variable, making
  *			sure that any variable that needs to exist
  *			at the very least has the empty value.
+ *
  *	Make_OODate	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 "make.h"
-#include    "dir.h"
+#include "dir.h"
-#include    "job.h"
+#include "job.h"
 /*	"@(#)make.c	8.1 (Berkeley) 6/6/93"	*/
-MAKE_RCSID("$NetBSD: make.c,v 1.184 2020/10/31 11:54:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.185 2020/10/31 18:41:07 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

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.629 2020/10/31 18:17:08 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.630 2020/10/31 18:41:07 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.
 @@ -104,42 +104,42 @@
  *	Var_Export	Export the variable to the environment of this process
  *			and its child processes.
+ *
  *	Var_UnExport	Don't export the variable anymore.
+ *
  * Debugging:
  *	Var_Stats	Print out hashing statistics if in -dh mode.
+ *
  *	Var_Dump	Print out all variables defined in the given context.
+ *
  * XXX: There's a lot of duplication in these functions.
  */
-#include    <sys/stat.h>
+#include <sys/stat.h>
 #ifndef NO_REGEX
-#include    <sys/types.h>
+#include <sys/types.h>
-#include    <regex.h>
+#include <regex.h>
 #endif
-#include    <inttypes.h>
+#include <inttypes.h>
-#include    <limits.h>
+#include <limits.h>
-#include    <time.h>
+#include <time.h>
-#include    "make.h"
+#include "make.h"
-#include    "dir.h"
+#include "dir.h"
-#include    "job.h"
+#include "job.h"
-#include    "metachar.h"
+#include "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.629 2020/10/31 18:17:08 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.630 2020/10/31 18:41:07 rillig Exp $");
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
 #define VAR_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(VAR, fmt, arg1, arg2, arg3)
 #define VAR_DEBUG4(fmt, arg1, arg2, arg3, arg4) DEBUG4(VAR, fmt, arg1, arg2, arg3, arg4)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */