 @@ -1,581 +1,582 @@
-/*	$NetBSD: make.h,v 1.127 2020/08/26 23:00:47 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.128 2020/08/28 03:35:45 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.
  * 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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.h	8.3 (Berkeley) 6/13/95
  */
 /*
  * Copyright (c) 1989 by Berkeley Softworks
  * 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.
  * 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. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.h	8.3 (Berkeley) 6/13/95
  */
 /*-
  * make.h --
  *	The global definitions for pmake
  */
 #ifndef MAKE_MAKE_H
 #define MAKE_MAKE_H
 #include <sys/types.h>
 #include <sys/param.h>
 #include <assert.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #ifdef BSD4_4
 # include <sys/cdefs.h>
 #endif
 #ifndef FD_CLOEXEC
 #define FD_CLOEXEC 1
 #endif
 #if defined(__GNUC__)
 #define	MAKE_GNUC_PREREQ(x, y)						\
 	((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) ||			\
 	 (__GNUC__ > (x)))
 #else /* defined(__GNUC__) */
 #define	MAKE_GNUC_PREREQ(x, y)	0
 #endif /* defined(__GNUC__) */
 #if MAKE_GNUC_PREREQ(2, 7)
 #define	MAKE_ATTR_UNUSED	__attribute__((__unused__))
 #else
 #define	MAKE_ATTR_UNUSED	/* delete */
 #endif
 #if MAKE_GNUC_PREREQ(2, 5)
 #define	MAKE_ATTR_DEAD		__attribute__((__noreturn__))
 #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
 /*
  * 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 "enum.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 */
     UPTODATE,			/* Was already up-to-date */
     ERROR,			/* An error occurred while it was being
 				 * made (used only in compat mode) */
     ABORTED			/* The target was aborted due to an error
 				 * making an inferior (compat). */
 } GNodeMade;
 /* The OP_ constants are used when parsing a dependency line as a way of
  * communicating to other parts of the program the way in which a target
  * should be made.
+ *
  * These constants are bitwise-OR'ed together and placed in the 'type' field
  * of each node. Any node that has a 'type' field which satisfies the OP_NOP
  * function was never never on the left-hand side of an operator, though it
  * may have been on the right-hand side... */
 typedef enum {
     /* Execution of commands depends on children (:) */
     OP_DEPENDS		= 1 << 0,
     /* Always execute commands (!) */
     OP_FORCE		= 1 << 1,
     /* Execution of commands depends on children per line (::) */
     OP_DOUBLEDEP	= 1 << 2,
     OP_OPMASK		= OP_DEPENDS|OP_FORCE|OP_DOUBLEDEP,
     /* Don't care if the target doesn't exist and can't be created */
     OP_OPTIONAL		= 1 << 3,
     /* Use associated commands for parents */
     OP_USE		= 1 << 4,
     /* Target is never out of date, but always execute commands anyway.
      * Its time doesn't matter, so it has none...sort of */
     OP_EXEC	  	= 1 << 5,
     /* Ignore errors when creating the node */
     OP_IGNORE		= 1 << 6,
     /* Don't remove the target when interrupted */
     OP_PRECIOUS		= 1 << 7,
     /* Don't echo commands when executed */
     OP_SILENT		= 1 << 8,
     /* Target is a recursive make so its commands should always be executed
      * when it is out of date, regardless of the state of the -n or -t flags */
     OP_MAKE		= 1 << 9,
     /* Target is out-of-date only if any of its children was out-of-date */
     OP_JOIN		= 1 << 10,
     /* Assume the children of the node have been already made */
     OP_MADE		= 1 << 11,
     /* Special .BEGIN, .END, .INTERRUPT */
     OP_SPECIAL		= 1 << 12,
     /* Like .USE, only prepend commands */
     OP_USEBEFORE	= 1 << 13,
     /* The node is invisible to its parents. I.e. it doesn't show up in the
      * parents' local variables. */
     OP_INVISIBLE	= 1 << 14,
     /* The node is exempt from normal 'main target' processing in parse.c */
     OP_NOTMAIN		= 1 << 15,
     /* Not a file target; run always */
     OP_PHONY		= 1 << 16,
     /* Don't search for file in the path */
     OP_NOPATH		= 1 << 17,
     /* .WAIT phony node */
     OP_WAIT		= 1 << 18,
     /* .NOMETA do not create a .meta file */
     OP_NOMETA		= 1 << 19,
     /* .META we _do_ want a .meta file */
     OP_META		= 1 << 20,
     /* Do not compare commands in .meta file */
     OP_NOMETA_CMP	= 1 << 21,
     /* Possibly a submake node */
     OP_SUBMAKE		= 1 << 22,
     /* Attributes applied by PMake */
     /* The node is a transformation rule */
     OP_TRANSFORM	= 1 << 31,
     /* Target is a member of an archive */
     OP_MEMBER		= 1 << 30,
     /* Target is a library */
     OP_LIB		= 1 << 29,
     /* Target is an archive construct */
     OP_ARCHV		= 1 << 28,
     /* Target has all the commands it should. Used when parsing to catch
      * multiple commands for a target. */
     OP_HAS_COMMANDS	= 1 << 27,
     /* Saving commands on .END (Compat) */
     OP_SAVE_CMDS	= 1 << 26,
     /* Already processed by Suff_FindDeps */
     OP_DEPS_FOUND	= 1 << 25,
     /* Node found while expanding .ALLSRC */
     OP_MARK		= 1 << 24
 } GNodeType;
 typedef enum {
     REMAKE	= 0x0001,	/* this target needs to be (re)made */
     CHILDMADE	= 0x0002,	/* children of this target were made */
     FORCE	= 0x0004,	/* children don't exist, and we pretend made */
     DONE_WAIT	= 0x0008,	/* Set by Make_ProcessWait() */
     DONE_ORDER	= 0x0010,	/* Build requested by .ORDER processing */
     FROM_DEPEND	= 0x0020,	/* Node created from .depend */
     DONE_ALLSRC	= 0x0040,	/* We do it once only */
     CYCLE	= 0x1000,	/* Used by MakePrintStatus */
     DONECYCLE	= 0x2000,	/* Used by MakePrintStatus */
     INTERNAL	= 0x4000	/* Internal use only */
 } GNodeFlags;
 /* A graph node represents a target that can possibly be made, including its
  * relation to other targets and a lot of other details. */
 typedef struct GNode {
     /* The target's name, such as "clean" or "make.c" */
     char *name;
     /* The unexpanded name of a .USE node */
     char *uname;
     /* The full pathname of the file belonging to the target.
      * XXX: What about .PHONY targets? These don't have an associated path. */
     char *path;
     /* The type of operator used to define the sources (see the OP flags below).
      * XXX: This looks like a wild mixture of type and flags. */
     GNodeType type;
     /* whether it is involved in this invocation of make */
     GNodeFlags flags;
     /* The state of processing on this node */
     GNodeMade made;
     int unmade;			/* The number of unmade children */
     time_t mtime;		/* Its modification time */
     struct GNode *cmgn;		/* The youngest child */
     /* Links to parents for which this is an implied source. May be empty.
      * Nodes that depend on this, as gleaned from the transformation rules. */
     Lst iParents;
     /* Other nodes of the same name for the :: operator. */
     Lst cohorts;
     /* The nodes that depend on this one, or in other words, the nodes for
      * which this is a source. */
     Lst parents;
     /* The nodes on which this one depends. */
     Lst children;
     /* .ORDER nodes we need made. The nodes that must be made (if they're
      * made) before this node can be made, but that do not enter into the
      * datedness of this node. */
     Lst order_pred;
     /* .ORDER nodes who need us. The nodes that must be made (if they're made
      * at all) after this node is made, but that do not depend on this node,
      * in the normal sense. */
     Lst order_succ;
     /* #n for this cohort */
     char cohort_num[8];
     /* The number of unmade instances on the cohorts list */
     int unmade_cohorts;
     /* Pointer to the first instance of a :: node; only set when on a cohorts
      * list */
     struct GNode *centurion;
     /* Last time (sequence number) we tried to make this node */
     unsigned int checked;
     /* The "local" variables that are specific to this target and this target
      * only, such as $@, $<, $?. */
     Hash_Table context;
     /* The commands to be given to a shell to create this target. */
     Lst commands;
     /* Suffix for the node (determined by Suff_FindDeps and opaque to everyone
      * but the Suff module) */
     struct Suff *suffix;
     /* filename where the GNode got defined */
     const char *fname;
     /* line number where the GNode got defined */
     int lineno;
 } GNode;
 #define NoExecute(gn) ((gn->type & OP_MAKE) ? noRecursiveExecute : noExecute)
 /*
  * OP_NOP will return TRUE if the node with the given type was not the
  * object of a dependency operator
  */
 #define OP_NOP(t)	(((t) & OP_OPMASK) == 0x00000000)
 #define OP_NOTARGET (OP_NOTMAIN|OP_USE|OP_EXEC|OP_TRANSFORM)
 /*
  * The TARG_ constants are used when calling the Targ_FindNode and
  * Targ_FindList functions in targ.c. They simply tell the functions what to
  * do if the desired node(s) is (are) not found. If the TARG_CREATE constant
  * is given, a new, empty node will be created for the target, placed in the
  * table of all targets and its address returned. If TARG_NOCREATE is given,
  * a NULL pointer will be returned.
  */
 #define TARG_NOCREATE	0x00	  /* don't create it */
 #define TARG_CREATE	0x01	  /* create node if not found */
 #define TARG_NOHASH	0x02	  /* don't look in/add to hash table */
 /*
  * Error levels for parsing. PARSE_FATAL means the process cannot continue
  * once the makefile has been parsed. PARSE_WARNING means it can. Passed
  * as the first argument to Parse_Error.
  */
 #define PARSE_INFO	3
 #define PARSE_WARNING	2
 #define PARSE_FATAL	1
 /*
  * Values returned by Cond_Eval.
  */
 typedef enum {
     COND_PARSE,			/* Parse the next lines */
     COND_SKIP,			/* Skip the next lines */
     COND_INVALID		/* Not a conditional statement */
 } CondEvalResult;
 /*
  * Definitions for the "local" variables. Used only for clarity.
  */
 #define TARGET	  	  "@" 	/* Target of dependency */
 #define OODATE	  	  "?" 	/* All out-of-date sources */
 #define ALLSRC	  	  ">" 	/* All sources */
 #define IMPSRC	  	  "<" 	/* Source implied by transformation */
 #define PREFIX	  	  "*" 	/* Common prefix */
 #define ARCHIVE	  	  "!" 	/* Archive in "archive(member)" syntax */
 #define MEMBER	  	  "%" 	/* Member in "archive(member)" syntax */
 #define FTARGET           "@F"  /* file part of TARGET */
 #define DTARGET           "@D"  /* directory part of TARGET */
 #define FIMPSRC           "<F"  /* file part of IMPSRC */
 #define DIMPSRC           "<D"  /* directory part of IMPSRC */
 #define FPREFIX           "*F"  /* file part of PREFIX */
 #define DPREFIX           "*D"  /* directory part of PREFIX */
 /*
  * Global Variables
  */
 extern Lst  	create;	    	/* The list of target names specified on the
 				 * command line. used to resolve #if
 				 * make(...) statements */
 extern Lst     	dirSearchPath; 	/* The list of directories to search when
 				 * looking for targets */
 extern Boolean	compatMake;	/* True if we are make compatible */
 extern Boolean	ignoreErrors;  	/* True if should ignore all errors */
 extern Boolean  beSilent;    	/* True if should print no commands */
 extern Boolean  noExecute;    	/* True if should execute nothing */
 extern Boolean  noRecursiveExecute;    	/* True if should execute nothing */
 extern Boolean  allPrecious;   	/* True if every target is precious */
 extern Boolean  deleteOnError;	/* True if failed targets should be deleted */
 extern Boolean  keepgoing;    	/* True if should continue on unaffected
 				 * portions of the graph when have an error
 				 * in one portion */
 extern Boolean 	touchFlag;    	/* TRUE if targets should just be 'touched'
 				 * if out of date. Set by the -t flag */
 extern Boolean 	queryFlag;    	/* TRUE if we aren't supposed to really make
 				 * anything, just see if the targets are out-
 				 * of-date */
 extern Boolean	doing_depend;	/* TRUE if processing .depend */
 extern Boolean	checkEnvFirst;	/* TRUE if environment should be searched for
 				 * variables before the global context */
 extern Boolean	parseWarnFatal;	/* TRUE if makefile parsing warnings are
 				 * treated as errors */
 extern Boolean	varNoExportEnv;	/* TRUE if we should not export variables
 				 * set on the command line to the env. */
 extern GNode    *DEFAULT;    	/* .DEFAULT rule */
 extern GNode	*VAR_INTERNAL;	/* Variables defined internally by make
 				 * which should not override those set by
 				 * makefiles.
 				 */
 extern GNode    *VAR_GLOBAL;   	/* Variables defined in a global context, e.g
 				 * in the Makefile itself */
 extern GNode    *VAR_CMD;    	/* Variables defined on the command line */
 extern char    	var_Error[];   	/* Value returned by Var_Parse when an error
 				 * is encountered. It actually points to
 				 * an empty string, so naive callers needn't
 				 * worry about it. */
 extern time_t 	now;	    	/* The time at the start of this whole
 				 * process */
 extern Boolean	oldVars;    	/* Do old-style variable substitution */
 extern Lst	sysIncPath;	/* The system include path. */
 extern Lst	defIncPath;	/* The default include path. */
 extern char	curdir[];	/* Startup directory */
 extern char	*progname;	/* The program name */
 extern char	*makeDependfile; /* .depend */
 extern char	**savedEnv;	 /* if we replaced environ this will be non-NULL */
 extern int	makelevel;
 /*
  * We cannot vfork() in a child of vfork().
  * Most systems do not enforce this but some do.
  */
 #define vFork() ((getpid() == myPid) ? vfork() : fork())
 extern pid_t	myPid;
 #define	MAKEFLAGS	".MAKEFLAGS"
 #define	MAKEOVERRIDES	".MAKEOVERRIDES"
 #define	MAKE_JOB_PREFIX	".MAKE.JOB.PREFIX" /* prefix for job target output */
 #define	MAKE_EXPORTED	".MAKE.EXPORTED"   /* variables we export */
 #define	MAKE_MAKEFILES	".MAKE.MAKEFILES"  /* all the makefiles we read */
 #define	MAKE_LEVEL	".MAKE.LEVEL"	   /* recursion level */
 #define MAKEFILE_PREFERENCE ".MAKE.MAKEFILE_PREFERENCE"
 #define MAKE_DEPENDFILE	".MAKE.DEPENDFILE" /* .depend */
 #define MAKE_MODE	".MAKE.MODE"
 #ifndef MAKE_LEVEL_ENV
 # define MAKE_LEVEL_ENV	"MAKELEVEL"
 #endif
 /*
  * debug control:
  *	There is one bit per module.  It is up to the module what debug
  *	information to print.
  */
 extern FILE *debug_file;	/* Output is written here - default stderr */
 extern int debug;
 #define	DEBUG_ARCH	0x00001
 #define	DEBUG_COND	0x00002
 #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 DEBUG_LINT	0x100000
 #define CONCAT(a,b)	a##b
 #define	DEBUG(module)	(debug & CONCAT(DEBUG_,module))
 #include "nonints.h"
 int Make_TimeStamp(GNode *, GNode *);
 Boolean Make_OODate(GNode *);
 void Make_ExpandUse(Lst);
 time_t Make_Recheck(GNode *);
 void Make_HandleUse(GNode *, GNode *);
 void Make_Update(GNode *);
 void Make_DoAllVar(GNode *);
 Boolean Make_Run(Lst);
 int dieQuietly(GNode *, int);
 void PrintOnError(GNode *, const char *);
 void Main_ExportMAKEFLAGS(Boolean);
 Boolean Main_SetObjdir(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2);
 int mkTempFile(const char *, char **);
 int str2Lst_Append(Lst, char *, const char *);
 int cached_lstat(const char *, void *);
 int cached_stat(const char *, void *);
 void GNode_FprintDetails(FILE *, const char *, const GNode *, const char *);
 #ifdef __GNUC__
 #define UNCONST(ptr)	({ 		\
     union __unconst {			\
 	const void *__cp;		\
 	void *__p;			\
     } __d;				\
     __d.__cp = ptr, __d.__p; })
 #else
 #define UNCONST(ptr)	(void *)(ptr)
 #endif
 #ifndef MIN
 #define MIN(a, b) ((a < b) ? a : b)
 #endif
 #ifndef MAX
 #define MAX(a, b) ((a > b) ? a : b)
 #endif
 /* At least GNU/Hurd systems lack hardcoded MAXPATHLEN/PATH_MAX */
 #include <limits.h>
 #ifndef MAXPATHLEN
 #define MAXPATHLEN	4096
 #endif
 #ifndef PATH_MAX
 #define PATH_MAX	MAXPATHLEN
 #endif
 #if defined(SYSV)
 #define KILLPG(pid, sig)	kill(-(pid), (sig))
 #else
 #define KILLPG(pid, sig)	killpg((pid), (sig))
 #endif
 #endif /* MAKE_MAKE_H */

 @@ -1,1160 +1,1164 @@
-/*	$NetBSD: suff.c,v 1.121 2020/08/27 19:15:35 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.122 2020/08/28 03:35:45 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.
  * 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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
  */
 /*
  * Copyright (c) 1989 by Berkeley Softworks
  * 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.
  * 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. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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: suff.c,v 1.121 2020/08/27 19:15:35 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.122 2020/08/28 03:35:45 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.121 2020/08/27 19:15:35 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.122 2020/08/28 03:35:45 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * suff.c --
  *	Functions to maintain suffix lists and find implicit dependents
  *	using suffix transformation rules
+ *
  * Interface:
  *	Suff_Init 	    	Initialize all things to do with suffixes.
+ *
  *	Suff_End 	    	Cleanup the module
+ *
  *	Suff_DoPaths	    	This function is used to make life easier
  *	    	  	    	when searching for a file according to its
  *	    	  	    	suffix. It takes the global search path,
  *	    	  	    	as defined using the .PATH: target, and appends
  *	    	  	    	its directories to the path of each of the
  *	    	  	    	defined suffixes, as specified using
  *	    	  	    	.PATH<suffix>: targets. In addition, all
  *	    	  	    	directories given for suffixes labeled as
  *	    	  	    	include files or libraries, using the .INCLUDES
  *	    	  	    	or .LIBS targets, are played with using
  *	    	  	    	Dir_MakeFlags to create the .INCLUDES and
  *	    	  	    	.LIBS global variables.
+ *
  *	Suff_ClearSuffixes  	Clear out all the suffixes and defined
  *	    	  	    	transformations.
+ *
  *	Suff_IsTransform    	Return TRUE if the passed string is the lhs
  *	    	  	    	of a transformation rule.
+ *
  *	Suff_AddSuffix	    	Add the passed string as another known suffix.
+ *
  *	Suff_GetPath	    	Return the search path for the given suffix.
+ *
  *	Suff_AddInclude	    	Mark the given suffix as denoting an include
  *	    	  	    	file.
+ *
  *	Suff_AddLib	    	Mark the given suffix as denoting a library.
+ *
  *	Suff_AddTransform   	Add another transformation to the suffix
  *	    	  	    	graph. Returns  GNode suitable for framing, I
  *	    	  	    	mean, tacking commands, attributes, etc. on.
+ *
  *	Suff_SetNull	    	Define the suffix to consider the suffix of
  *	    	  	    	any file that doesn't have a known one.
+ *
  *	Suff_FindDeps	    	Find implicit sources for and the location of
  *	    	  	    	a target based on its suffix. Returns the
  *	    	  	    	bottom-most node added to the graph or NULL
  *	    	  	    	if the target had no implicit sources.
+ *
  *	Suff_FindPath	    	Return the appropriate path to search in
  *				order to find the node.
  */
 #include	  "make.h"
 #include	  "dir.h"
 static Lst       sufflist;	/* Lst of suffixes */
 #ifdef CLEANUP
 static Lst	 suffClean;	/* Lst of suffixes to be cleaned */
 #endif
 static Lst	 srclist;	/* Lst of sources */
 static Lst       transforms;	/* Lst of transformation rules */
 static int        sNum = 0;	/* Counter for assigning suffix numbers */
 typedef enum {
     SUFF_INCLUDE	= 0x01,	/* One which is #include'd */
     SUFF_LIBRARY	= 0x02,	/* One which contains a library */
     SUFF_NULL		= 0x04	/* The empty suffix */
     /* XXX: Why is SUFF_NULL needed? Wouldn't nameLen == 0 mean the same? */
 } SuffFlags;
 ENUM_FLAGS_RTTI_3(SuffFlags,
 		  SUFF_INCLUDE, SUFF_LIBRARY, SUFF_NULL);
 /*
  * Structure describing an individual suffix.
  */
 typedef struct Suff {
-    char         *name;	    	/* The suffix itself */
+    char         *name;	    	/* The suffix itself, such as ".c" */
-    int		 nameLen;	/* Length of the suffix */
+    int		 nameLen;	/* Length of the name, to avoid strlen calls */
     SuffFlags	 flags;      	/* Type of suffix */
     Lst    	 searchPath;	/* The path along which files of this suffix
 				 * may be found */
     int          sNum;	      	/* The suffix number */
     int		 refCount;	/* Reference count of list membership */
     Lst          parents;	/* Suffixes we have a transformation to */
     Lst          children;	/* Suffixes we have a transformation from */
     Lst		 ref;		/* List of lists this suffix is referenced */
 } Suff;
 /*
  * for SuffSuffIsSuffix
  */
 typedef struct {
     char	*ename;		/* The end of the name */
     int		 len;		/* Length of the name */
 } SuffixCmpData;
 /*
  * Structure used in the search for implied sources.
  */
 typedef struct _Src {
     char            *file;	/* The file to look for */
     char    	    *pref;  	/* Prefix from which file was formed */
     Suff            *suff;	/* The suffix on the file */
     struct _Src     *parent;	/* The Src for which this is a source */
     GNode           *node;	/* The node describing the file */
     int	    	    children;	/* Count of existing children (so we don't free
 				 * this thing too early or never nuke it) */
 #ifdef DEBUG_SRC
     Lst		    cp;		/* Debug; children list */
 #endif
 } Src;
 /*
  * A structure for passing more than one argument to the Lst-library-invoked
  * function...
  */
 typedef struct {
     Lst            l;
     Src            *s;
 } LstSrc;
 typedef struct {
     GNode	  **gn;
     Suff	   *s;
     Boolean	    r;
 } GNodeSuff;
 static Suff 	    *suffNull;	/* The NULL suffix for this run */
 static Suff 	    *emptySuff;	/* The empty suffix required for POSIX
 				 * single-suffix transformation rules */
 static const char *SuffStrIsPrefix(const char *, const char *);
 static char *SuffSuffIsSuffix(const Suff *, const SuffixCmpData *);
 static int SuffSuffIsSuffixP(const void *, const void *);
 static int SuffSuffHasNameP(const void *, const void *);
 static int SuffSuffIsPrefix(const void *, const void *);
 static int SuffGNHasNameP(const void *, const void *);
 static void SuffUnRef(void *, void *);
 static void SuffFree(void *);
 static void SuffInsert(Lst, Suff *);
 static void SuffRemove(Lst, Suff *);
 static Boolean SuffParseTransform(char *, Suff **, Suff **);
 static int SuffRebuildGraph(void *, void *);
 static int SuffScanTargets(void *, void *);
 static int SuffAddSrc(void *, void *);
 static int SuffRemoveSrc(Lst);
 static void SuffAddLevel(Lst, Src *);
 static Src *SuffFindCmds(Src *, Lst);
 static void SuffExpandChildren(LstNode, GNode *);
 static void SuffExpandWildcards(LstNode, GNode *);
 static Boolean SuffApplyTransform(GNode *, GNode *, Suff *, Suff *);
 static void SuffFindDeps(GNode *, Lst);
 static void SuffFindArchiveDeps(GNode *, Lst);
 static void SuffFindNormalDeps(GNode *, Lst);
 static int SuffPrintName(void *, void *);
 static int SuffPrintSuff(void *, void *);
 static int SuffPrintTrans(void *, void *);
 	/*************** Lst Predicates ****************/
 /*-
  *-----------------------------------------------------------------------
  * SuffStrIsPrefix  --
  *	See if pref is a prefix of str.
+ *
  * Input:
  *	pref		possible prefix
  *	str		string to check
+ *
  * Results:
  *	NULL if it ain't, pointer to character in str after prefix if so
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 static const char *
 SuffStrIsPrefix(const char *pref, const char *str)
+{
     while (*str && *pref == *str) {
 	pref++;
 	str++;
+    }
     return *pref ? NULL : str;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffSuffIsSuffix  --
  *	See if suff is a suffix of str. sd->ename should point to THE END
  *	of the string to check. (THE END == the null byte)
+ *
  * Input:
  *	s		possible suffix
  *	sd		string to examine
+ *
  * Results:
  *	NULL if it ain't, pointer to character in str before suffix if
  *	it is.
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 static char *
 SuffSuffIsSuffix(const Suff *s, const SuffixCmpData *sd)
+{
     char  *p1;	    	/* Pointer into suffix name */
     char  *p2;	    	/* Pointer into string being examined */
     if (sd->len < s->nameLen)
 	return NULL;		/* this string is shorter than the suffix */
     p1 = s->name + s->nameLen;
     p2 = sd->ename;
     while (p1 >= s->name && *p1 == *p2) {
 	p1--;
 	p2--;
+    }
     return p1 == s->name - 1 ? p2 : NULL;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffSuffIsSuffixP --
  *	Predicate form of SuffSuffIsSuffix. Passed as the callback function
  *	to Lst_Find.
+ *
  * Results:
  *	0 if the suffix is the one desired, non-zero if not.
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 static int
 SuffSuffIsSuffixP(const void *s, const void *sd)
+{
     return !SuffSuffIsSuffix(s, sd);
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffSuffHasNameP --
  *	Callback procedure for finding a suffix based on its name. Used by
  *	Suff_GetPath.
+ *
  * Input:
  *	s		Suffix to check
  *	sd		Desired name
+ *
  * Results:
  *	0 if the suffix is of the given name. non-zero otherwise.
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 static int
 SuffSuffHasNameP(const void *s, const void *sname)
+{
     return strcmp(sname, ((const Suff *)s)->name);
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffSuffIsPrefix  --
  *	See if the suffix described by s is a prefix of the string. Care
  *	must be taken when using this to search for transformations and
  *	what-not, since there could well be two suffixes, one of which
  *	is a prefix of the other...
+ *
  * Input:
  *	s		suffix to compare
  *	str		string to examine
+ *
  * Results:
  *	0 if s is a prefix of str. non-zero otherwise
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 static int
 SuffSuffIsPrefix(const void *s, const void *str)
+{
     return SuffStrIsPrefix(((const Suff *)s)->name, str) == NULL;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffGNHasNameP  --
  *	See if the graph node has the desired name
+ *
  * Input:
  *	gn		current node we're looking at
  *	name		name we're looking for
+ *
  * Results:
  *	0 if it does. non-zero if it doesn't
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 static int
 SuffGNHasNameP(const void *gn, const void *name)
+{
     return strcmp(name, ((const GNode *)gn)->name);
+}
 	    /*********** Maintenance Functions ************/
 static void
 SuffUnRef(void *lp, void *sp)
+{
     Lst l = (Lst) lp;
     LstNode ln = Lst_MemberS(l, sp);
     if (ln != NULL) {
 	Lst_RemoveS(l, ln);
 	((Suff *)sp)->refCount--;
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffFree  --
  *	Free up all memory associated with the given suffix structure.
+ *
  * Results:
  *	none
+ *
  * Side Effects:
  *	the suffix entry is detroyed
  *-----------------------------------------------------------------------
  */
 static void
 SuffFree(void *sp)
+{
     Suff           *s = (Suff *)sp;
     if (s == suffNull)
 	suffNull = NULL;
     if (s == emptySuff)
 	emptySuff = NULL;
 #ifdef notdef
     /* We don't delete suffixes in order, so we cannot use this */
     if (s->refCount)
 	Punt("Internal error deleting suffix `%s' with refcount = %d", s->name,
 	    s->refCount);
 #endif
     Lst_FreeS(s->ref);
     Lst_FreeS(s->children);
     Lst_FreeS(s->parents);
     Lst_DestroyS(s->searchPath, Dir_Destroy);
     free(s->name);
     free(s);
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffRemove  --
  *	Remove the suffix into the list
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	The reference count for the suffix is decremented and the
  *	suffix is possibly freed
  *-----------------------------------------------------------------------
  */
 static void
 SuffRemove(Lst l, Suff *s)
+{
     SuffUnRef(l, s);
     if (s->refCount == 0) {
 	SuffUnRef(sufflist, s);
 	SuffFree(s);
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffInsert  --
  *	Insert the suffix into the list keeping the list ordered by suffix
  *	numbers.
+ *
  * Input:
  *	l		the list where in s should be inserted
  *	s		the suffix to insert
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	The reference count of the suffix is incremented
  *-----------------------------------------------------------------------
  */
 static void
 SuffInsert(Lst l, Suff *s)
+{
     LstNode 	  ln;		/* current element in l we're examining */
     Suff          *s2 = NULL;	/* the suffix descriptor in this element */
     Lst_OpenS(l);
     while ((ln = Lst_NextS(l)) != NULL) {
 	s2 = Lst_DatumS(ln);
 	if (s2->sNum >= s->sNum) {
 	    break;
+	}
+    }
     Lst_CloseS(l);
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "inserting %s(%d)...", s->name, s->sNum);
+    }
     if (ln == NULL) {
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "at end of list\n");
+	}
 	Lst_AppendS(l, s);
 	s->refCount++;
 	Lst_AppendS(s->ref, l);
     } else if (s2->sNum != s->sNum) {
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "before %s(%d)\n", s2->name, s2->sNum);
+	}
 	Lst_InsertBeforeS(l, ln, s);
 	s->refCount++;
 	Lst_AppendS(s->ref, l);
     } else if (DEBUG(SUFF)) {
 	fprintf(debug_file, "already there\n");
+    }
+}
 static Suff *
 SuffNew(const char *name)
+{
     Suff *s = bmake_malloc(sizeof(Suff));
     s->name =   	bmake_strdup(name);
     s->nameLen = 	strlen(s->name);
     s->searchPath = Lst_Init();
     s->children = 	Lst_Init();
     s->parents = 	Lst_Init();
     s->ref = 	Lst_Init();
     s->sNum =   	sNum++;
     s->flags =  	0;
     s->refCount =	1;
     return s;
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_ClearSuffixes --
  *	This is gross. Nuke the list of suffixes but keep all transformation
  *	rules around. The transformation graph is destroyed in this process,
  *	but we leave the list of rules so when a new graph is formed the rules
  *	will remain.
  *	This function is called from the parse module when a
  *	.SUFFIXES:\n line is encountered.
+ *
  * Results:
  *	none
+ *
  * Side Effects:
  *	the sufflist and its graph nodes are destroyed
  *-----------------------------------------------------------------------
  */
 void
 Suff_ClearSuffixes(void)
+{
 #ifdef CLEANUP
     Lst_MoveAllS(suffClean, sufflist);
 #endif
     sufflist = Lst_Init();
     sNum = 0;
     if (suffNull)
 	SuffFree(suffNull);
     emptySuff = suffNull = SuffNew("");
     Dir_Concat(suffNull->searchPath, dirSearchPath);
     suffNull->flags =  	    SUFF_NULL;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffParseTransform --
  *	Parse a transformation string to find its two component suffixes.
+ *
  * Input:
  *	str		String being parsed
  *	srcPtr		Place to store source of trans.
  *	targPtr		Place to store target of trans.
+ *
  * Results:
  *	TRUE if the string is a valid transformation and FALSE otherwise.
+ *
  * Side Effects:
  *	The passed pointers are overwritten.
+ *
  *-----------------------------------------------------------------------
  */
 static Boolean
 SuffParseTransform(char *str, Suff **srcPtr, Suff **targPtr)
+{
     LstNode		srcLn;	    /* element in suffix list of trans source*/
     Suff		*src;	    /* Source of transformation */
     LstNode		targLn;	    /* element in suffix list of trans target*/
     char		*str2;	    /* Extra pointer (maybe target suffix) */
     LstNode 	    	singleLn;   /* element in suffix list of any suffix
 				     * that exactly matches str */
     Suff    	    	*single = NULL;/* Source of possible transformation to
 				     * null suffix */
     srcLn = NULL;
     singleLn = NULL;
     /*
      * Loop looking first for a suffix that matches the start of the
      * string and then for one that exactly matches the rest of it. If
      * we can find two that meet these criteria, we've successfully
      * parsed the string.
      */
     for (;;) {
 	if (srcLn == NULL) {
 	    srcLn = Lst_FindS(sufflist, SuffSuffIsPrefix, str);
 	} else {
 	    srcLn = Lst_FindFrom(sufflist, Lst_SuccS(srcLn),
 				 SuffSuffIsPrefix, str);
+	}
 	if (srcLn == NULL) {
 	    /*
 	     * Ran out of source suffixes -- no such rule
 	     */
 	    if (singleLn != NULL) {
 		/*
 		 * Not so fast Mr. Smith! There was a suffix that encompassed
 		 * the entire string, so we assume it was a transformation
 		 * to the null suffix (thank you POSIX). We still prefer to
 		 * find a double rule over a singleton, hence we leave this
 		 * check until the end.
+		 *
 		 * XXX: Use emptySuff over suffNull?
 		 */
 		*srcPtr = single;
 		*targPtr = suffNull;
 		return TRUE;
+	    }
 	    return FALSE;
+	}
 	src = Lst_DatumS(srcLn);
 	str2 = str + src->nameLen;
 	if (*str2 == '\0') {
 	    single = src;
 	    singleLn = srcLn;
 	} else {
 	    targLn = Lst_FindS(sufflist, SuffSuffHasNameP, str2);
 	    if (targLn != NULL) {
 		*srcPtr = src;
 		*targPtr = Lst_DatumS(targLn);
 		return TRUE;
+	    }
+	}
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_IsTransform  --
  *	Return TRUE if the given string is a transformation rule
+ *
+ *
  * Input:
  *	str		string to check
+ *
  * Results:
  *	TRUE if the string is a concatenation of two known suffixes.
  *	FALSE otherwise
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 Boolean
 Suff_IsTransform(char *str)
+{
     Suff    	  *src, *targ;
     return SuffParseTransform(str, &src, &targ);
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_AddTransform --
  *	Add the transformation rule described by the line to the
  *	list of rules and place the transformation itself in the graph
+ *
  * Input:
  *	line		name of transformation to add
+ *
  * Results:
  *	The node created for the transformation in the transforms list
+ *
  * Side Effects:
  *	The node is placed on the end of the transforms Lst and links are
  *	made between the two suffixes mentioned in the target name
  *-----------------------------------------------------------------------
  */
 GNode *
 Suff_AddTransform(char *line)
+{
     GNode         *gn;		/* GNode of transformation rule */
     Suff          *s,		/* source suffix */
 		  *t;		/* target suffix */
     LstNode 	  ln;	    	/* Node for existing transformation */
     ln = Lst_Find(transforms, SuffGNHasNameP, line);
     if (ln == NULL) {
 	/*
 	 * Make a new graph node for the transformation. It will be filled in
 	 * by the Parse module.
 	 */
 	gn = Targ_NewGN(line);
 	Lst_AppendS(transforms, gn);
     } else {
 	/*
 	 * New specification for transformation rule. Just nuke the old list
 	 * of commands so they can be filled in again... We don't actually
 	 * free the commands themselves, because a given command can be
 	 * attached to several different transformations.
 	 */
 	gn = Lst_DatumS(ln);
 	Lst_FreeS(gn->commands);
 	Lst_FreeS(gn->children);
 	gn->commands = Lst_Init();
 	gn->children = Lst_Init();
+    }
     gn->type = OP_TRANSFORM;
     (void)SuffParseTransform(line, &s, &t);
     /*
      * link the two together in the proper relationship and order
      */
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "defining transformation from `%s' to `%s'\n",
 		s->name, t->name);
+    }
     SuffInsert(t->children, s);
     SuffInsert(s->parents, t);
     return gn;
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_EndTransform --
  *	Handle the finish of a transformation definition, removing the
  *	transformation from the graph if it has neither commands nor
  *	sources. This is a callback procedure for the Parse module via
  *	Lst_ForEach
+ *
  * Input:
  *	gnp		Node for transformation
  *	dummy		Node for transformation
+ *
  * Results:
  *	=== 0
+ *
  * Side Effects:
  *	If the node has no commands or children, the children and parents
  *	lists of the affected suffixes are altered.
+ *
  *-----------------------------------------------------------------------
  */
 int
 Suff_EndTransform(void *gnp, void *dummy MAKE_ATTR_UNUSED)
+{
     GNode *gn = (GNode *)gnp;
     if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmptyS(gn->cohorts))
 	gn = Lst_DatumS(Lst_LastS(gn->cohorts));
     if ((gn->type & OP_TRANSFORM) && Lst_IsEmptyS(gn->commands) &&
 	Lst_IsEmptyS(gn->children))
+    {
 	Suff	*s, *t;
 	/*
 	 * SuffParseTransform() may fail for special rules which are not
 	 * actual transformation rules. (e.g. .DEFAULT)
 	 */
 	if (SuffParseTransform(gn->name, &s, &t)) {
 	    Lst	 p;
 	    if (DEBUG(SUFF)) {
 		fprintf(debug_file, "deleting transformation from `%s' to `%s'\n",
 		s->name, t->name);
+	    }
 	    /*
 	     * Store s->parents because s could be deleted in SuffRemove
 	     */
 	    p = s->parents;
 	    /*
 	     * Remove the source from the target's children list. We check for a
 	     * nil return to handle a beanhead saying something like
 	     *  .c.o .c.o:
+	     *
 	     * We'll be called twice when the next target is seen, but .c and .o
 	     * are only linked once...
 	     */
 	    SuffRemove(t->children, s);
 	    /*
 	     * Remove the target from the source's parents list
 	     */
 	    SuffRemove(p, t);
+	}
     } else if ((gn->type & OP_TRANSFORM) && DEBUG(SUFF)) {
 	fprintf(debug_file, "transformation %s complete\n", gn->name);
+    }
     return 0;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffRebuildGraph --
  *	Called from Suff_AddSuffix via Lst_ForEach to search through the
  *	list of existing transformation rules and rebuild the transformation
  *	graph when it has been destroyed by Suff_ClearSuffixes. If the
  *	given rule is a transformation involving this suffix and another,
  *	existing suffix, the proper relationship is established between
  *	the two.
+ *
  * Input:
  *	transformp	Transformation to test
  *	sp		Suffix to rebuild
+ *
  * Results:
  *	Always 0.
+ *
  * Side Effects:
  *	The appropriate links will be made between this suffix and
  *	others if transformation rules exist for it.
+ *
  *-----------------------------------------------------------------------
  */
 static int
 SuffRebuildGraph(void *transformp, void *sp)
+{
     GNode   	*transform = (GNode *)transformp;
     Suff    	*s = (Suff *)sp;
     char 	*cp;
     LstNode	ln;
     Suff  	*s2;
     SuffixCmpData sd;
     /*
      * First see if it is a transformation from this suffix.
      */
     cp = UNCONST(SuffStrIsPrefix(s->name, transform->name));
     if (cp != NULL) {
 	ln = Lst_FindS(sufflist, SuffSuffHasNameP, cp);
 	if (ln != NULL) {
 	    /*
 	     * Found target. Link in and return, since it can't be anything
 	     * else.
 	     */
 	    s2 = Lst_DatumS(ln);
 	    SuffInsert(s2->children, s);
 	    SuffInsert(s->parents, s2);
 	    return 0;
+	}
+    }
     /*
      * Not from, maybe to?
      */
     sd.len = strlen(transform->name);
     sd.ename = transform->name + sd.len;
     cp = SuffSuffIsSuffix(s, &sd);
     if (cp != NULL) {
 	/*
 	 * Null-terminate the source suffix in order to find it.
 	 */
 	cp[1] = '\0';
 	ln = Lst_FindS(sufflist, SuffSuffHasNameP, transform->name);
 	/*
 	 * Replace the start of the target suffix
 	 */
 	cp[1] = s->name[0];
 	if (ln != NULL) {
 	    /*
 	     * Found it -- establish the proper relationship
 	     */
 	    s2 = Lst_DatumS(ln);
 	    SuffInsert(s->children, s2);
 	    SuffInsert(s2->parents, s);
+	}
+    }
     return 0;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffScanTargets --
  *	Called from Suff_AddSuffix via Lst_ForEach to search through the
  *	list of existing targets and find if any of the existing targets
  *	can be turned into a transformation rule.
+ *
  * Results:
  *	1 if a new main target has been selected, 0 otherwise.
+ *
  * Side Effects:
  *	If such a target is found and the target is the current main
  *	target, the main target is set to NULL and the next target
  *	examined (if that exists) becomes the main target.
+ *
  *-----------------------------------------------------------------------
  */
 static int
 SuffScanTargets(void *targetp, void *gsp)
+{
     GNode   	*target = (GNode *)targetp;
     GNodeSuff	*gs = (GNodeSuff *)gsp;
     Suff	*s, *t;
     char 	*ptr;
     if (*gs->gn == NULL && gs->r && (target->type & OP_NOTARGET) == 0) {
 	*gs->gn = target;
 	Targ_SetMain(target);
 	return 1;
+    }
     if (target->type == OP_TRANSFORM)
 	return 0;
     if ((ptr = strstr(target->name, gs->s->name)) == NULL ||
 	ptr == target->name)
 	return 0;
     if (SuffParseTransform(target->name, &s, &t)) {
 	if (*gs->gn == target) {
 	    gs->r = TRUE;
 	    *gs->gn = NULL;
 	    Targ_SetMain(NULL);
+	}
 	Lst_FreeS(target->children);
 	target->children = Lst_Init();
 	target->type = OP_TRANSFORM;
 	/*
 	 * link the two together in the proper relationship and order
 	 */
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "defining transformation from `%s' to `%s'\n",
 		s->name, t->name);
+	}
 	SuffInsert(t->children, s);
 	SuffInsert(s->parents, t);
+    }
     return 0;
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_AddSuffix --
  *	Add the suffix in string to the end of the list of known suffixes.
  *	Should we restructure the suffix graph? Make doesn't...
+ *
  * Input:
  *	str		the name of the suffix to add
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	A GNode is created for the suffix and a Suff structure is created and
  *	added to the suffixes list unless the suffix was already known.
  *	The mainNode passed can be modified if a target mutated into a
  *	transform and that target happened to be the main target.
  *-----------------------------------------------------------------------
  */
 void
 Suff_AddSuffix(char *str, GNode **gn)
+{
     Suff          *s;	    /* new suffix descriptor */
     LstNode 	  ln;
     GNodeSuff	  gs;
     ln = Lst_FindS(sufflist, SuffSuffHasNameP, str);
     if (ln == NULL) {
         s = SuffNew(str);
 	Lst_AppendS(sufflist, s);
 	/*
 	 * We also look at our existing targets list to see if adding
 	 * this suffix will make one of our current targets mutate into
 	 * a suffix rule. This is ugly, but other makes treat all targets
 	 * that start with a . as suffix rules.
 	 */
 	gs.gn = gn;
 	gs.s  = s;
 	gs.r  = FALSE;
 	Lst_ForEachS(Targ_List(), SuffScanTargets, &gs);
 	/*
 	 * Look for any existing transformations from or to this suffix.
 	 * XXX: Only do this after a Suff_ClearSuffixes?
 	 */
 	Lst_ForEachS(transforms, SuffRebuildGraph, s);
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_GetPath --
  *	Return the search path for the given suffix, if it's defined.
+ *
  * Results:
  *	The searchPath for the desired suffix or NULL if the suffix isn't
  *	defined.
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 Lst
 Suff_GetPath(char *sname)
+{
     LstNode   	  ln;
     Suff    	  *s;
     ln = Lst_FindS(sufflist, SuffSuffHasNameP, sname);
     if (ln == NULL) {
 	return NULL;
     } else {
 	s = Lst_DatumS(ln);
 	return s->searchPath;
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_DoPaths --
  *	Extend the search paths for all suffixes to include the default
  *	search path.
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	The searchPath field of all the suffixes is extended by the
  *	directories in dirSearchPath. If paths were specified for the
  *	".h" suffix, the directories are stuffed into a global variable
  *	called ".INCLUDES" with each directory preceded by a -I. The same
  *	is done for the ".a" suffix, except the variable is called
  *	".LIBS" and the flag is -L.
  *-----------------------------------------------------------------------
  */
 void
 Suff_DoPaths(void)
+{
     Suff	   	*s;
     LstNode  		ln;
     char		*ptr;
     Lst	    	    	inIncludes; /* Cumulative .INCLUDES path */
     Lst	    	    	inLibs;	    /* Cumulative .LIBS path */
     inIncludes = Lst_Init();
     inLibs = Lst_Init();
     Lst_OpenS(sufflist);
     while ((ln = Lst_NextS(sufflist)) != NULL) {
 	s = Lst_DatumS(ln);
 	if (!Lst_IsEmptyS(s->searchPath)) {
 #ifdef INCLUDES
 	    if (s->flags & SUFF_INCLUDE) {
 		Dir_Concat(inIncludes, s->searchPath);
+	    }
 #endif /* INCLUDES */
 #ifdef LIBRARIES
 	    if (s->flags & SUFF_LIBRARY) {
 		Dir_Concat(inLibs, s->searchPath);
+	    }
 #endif /* LIBRARIES */
 	    Dir_Concat(s->searchPath, dirSearchPath);
 	} else {
 	    Lst_DestroyS(s->searchPath, Dir_Destroy);
 	    s->searchPath = Lst_CopyS(dirSearchPath, Dir_CopyDir);
+	}
+    }
     Lst_CloseS(sufflist);
     Var_Set(".INCLUDES", ptr = Dir_MakeFlags("-I", inIncludes), VAR_GLOBAL);
     free(ptr);
     Var_Set(".LIBS", ptr = Dir_MakeFlags("-L", inLibs), VAR_GLOBAL);
     free(ptr);
     Lst_DestroyS(inIncludes, Dir_Destroy);
     Lst_DestroyS(inLibs, Dir_Destroy);
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_AddInclude --
  *	Add the given suffix as a type of file which gets included.
  *	Called from the parse module when a .INCLUDES line is parsed.
  *	The suffix must have already been defined.
+ *
  * Input:
  *	sname		Name of the suffix to mark
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	The SUFF_INCLUDE bit is set in the suffix's flags field
+ *
  *-----------------------------------------------------------------------
  */
 void
 Suff_AddInclude(char *sname)
+{
     LstNode	  ln;
     Suff	  *s;
     ln = Lst_FindS(sufflist, SuffSuffHasNameP, sname);
     if (ln != NULL) {
 	s = Lst_DatumS(ln);
 	s->flags |= SUFF_INCLUDE;
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_AddLib --
  *	Add the given suffix as a type of file which is a library.
  *	Called from the parse module when parsing a .LIBS line. The
  *	suffix must have been defined via .SUFFIXES before this is
  *	called.
+ *
  * Input:
  *	sname		Name of the suffix to mark
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	The SUFF_LIBRARY bit is set in the suffix's flags field
+ *
  *-----------------------------------------------------------------------
  */
 void
 Suff_AddLib(char *sname)
+{
     LstNode	  ln;
     Suff	  *s;
     ln = Lst_FindS(sufflist, SuffSuffHasNameP, sname);
     if (ln != NULL) {
 	s = Lst_DatumS(ln);
 	s->flags |= SUFF_LIBRARY;
 @@ -1606,1059 +1610,1044 @@ SuffExpandChildren(LstNode cln, GNode *p
 		    void	*freeIt;
 		    junk = Var_Parse(cp, pgn, VARE_UNDEFERR|VARE_WANTRES,
 			&len, &freeIt);
 		    if (junk != var_Error) {
 			cp += len - 1;
+		    }
 		    free(freeIt);
 		} else if (*cp == '\\' && cp[1] != '\0') {
 		    /*
 		     * Escaped something -- skip over it
 		     */
 		    cp++;
+		}
+	    }
 	    if (cp != start) {
 		/*
 		 * Stuff left over -- add it to the list too
 		 */
 		gn = Targ_FindNode(start, TARG_CREATE);
 		Lst_AppendS(members, gn);
+	    }
 	    /*
 	     * Point cp back at the beginning again so the variable value
 	     * can be freed.
 	     */
 	    cp = initcp;
+	}
 	/*
 	 * Add all elements of the members list to the parent node.
 	 */
 	while(!Lst_IsEmptyS(members)) {
 	    gn = Lst_DequeueS(members);
 	    if (DEBUG(SUFF)) {
 		fprintf(debug_file, "%s...", gn->name);
+	    }
 	    /* Add gn to the parents child list before the original child */
 	    Lst_InsertBeforeS(pgn->children, cln, gn);
 	    Lst_AppendS(gn->parents, pgn);
 	    pgn->unmade++;
 	    /* Expand wildcards on new node */
 	    SuffExpandWildcards(Lst_PrevS(cln), pgn);
+	}
 	Lst_FreeS(members);
 	/*
 	 * Free the result
 	 */
 	free(cp);
+    }
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "\n");
+    }
     /*
      * Now the source is expanded, remove it from the list of children to
      * keep it from being processed.
      */
     pgn->unmade--;
     Lst_RemoveS(pgn->children, cln);
     Lst_RemoveS(cgn->parents, Lst_MemberS(cgn->parents, pgn));
+}
 static void
 SuffExpandWildcards(LstNode cln, GNode *pgn)
+{
     GNode   	*cgn = Lst_DatumS(cln);
     GNode	*gn;	    /* New source 8) */
     char	*cp;	    /* Expanded value */
     Lst 	explist;    /* List of expansions */
     if (!Dir_HasWildcards(cgn->name))
 	return;
     /*
      * Expand the word along the chosen path
      */
     explist = Lst_Init();
     Dir_Expand(cgn->name, Suff_FindPath(cgn), explist);
     while (!Lst_IsEmptyS(explist)) {
 	/*
 	 * Fetch next expansion off the list and find its GNode
 	 */
 	cp = Lst_DequeueS(explist);
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "%s...", cp);
+	}
 	gn = Targ_FindNode(cp, TARG_CREATE);
 	/* Add gn to the parents child list before the original child */
 	Lst_InsertBeforeS(pgn->children, cln, gn);
 	Lst_AppendS(gn->parents, pgn);
 	pgn->unmade++;
+    }
     Lst_FreeS(explist);
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "\n");
+    }
     /*
      * Now the source is expanded, remove it from the list of children to
      * keep it from being processed.
      */
     pgn->unmade--;
     Lst_RemoveS(pgn->children, cln);
     Lst_RemoveS(cgn->parents, Lst_MemberS(cgn->parents, pgn));
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_FindPath --
  *	Find a path along which to expand the node.
+ *
  *	If the word has a known suffix, use that path.
  *	If it has no known suffix, use the default system search path.
+ *
  * Input:
  *	gn		Node being examined
+ *
  * Results:
  *	The appropriate path to search for the GNode.
+ *
  * Side Effects:
  *	XXX: We could set the suffix here so that we don't have to scan
  *	again.
+ *
  *-----------------------------------------------------------------------
  */
 Lst
 Suff_FindPath(GNode* gn)
+{
     Suff *suff = gn->suffix;
     if (suff == NULL) {
 	SuffixCmpData sd;   /* Search string data */
 	LstNode ln;
 	sd.len = strlen(gn->name);
 	sd.ename = gn->name + sd.len;
 	ln = Lst_FindS(sufflist, SuffSuffIsSuffixP, &sd);
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "Wildcard expanding \"%s\"...", gn->name);
+	}
 	if (ln != NULL)
 	    suff = Lst_DatumS(ln);
 	/* XXX: Here we can save the suffix so we don't have to do this again */
+    }
     if (suff != NULL) {
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "suffix is \"%s\"...", suff->name);
+	}
 	return suff->searchPath;
     } else {
 	/*
 	 * Use default search path
 	 */
 	return dirSearchPath;
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffApplyTransform --
  *	Apply a transformation rule, given the source and target nodes
  *	and suffixes.
+ *
  * Input:
  *	tGn		Target node
  *	sGn		Source node
  *	t		Target suffix
  *	s		Source suffix
+ *
  * Results:
  *	TRUE if successful, FALSE if not.
+ *
  * Side Effects:
  *	The source and target are linked and the commands from the
  *	transformation are added to the target node's commands list.
  *	All attributes but OP_DEPMASK and OP_TRANSFORM are applied
  *	to the target. The target also inherits all the sources for
  *	the transformation rule.
+ *
  *-----------------------------------------------------------------------
  */
 static Boolean
 SuffApplyTransform(GNode *tGn, GNode *sGn, Suff *t, Suff *s)
+{
     LstNode 	ln, nln;    /* General node */
     char    	*tname;	    /* Name of transformation rule */
     GNode   	*gn;	    /* Node for same */
     /*
      * Form the proper links between the target and source.
      */
     Lst_AppendS(tGn->children, sGn);
     Lst_AppendS(sGn->parents, tGn);
     tGn->unmade += 1;
     /*
      * Locate the transformation rule itself
      */
     tname = str_concat2(s->name, t->name);
     ln = Lst_Find(transforms, SuffGNHasNameP, tname);
     free(tname);
     if (ln == NULL) {
 	/*
 	 * Not really such a transformation rule (can happen when we're
 	 * called to link an OP_MEMBER and OP_ARCHV node), so return
 	 * FALSE.
 	 */
 	return FALSE;
+    }
     gn = Lst_DatumS(ln);
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "\tapplying %s -> %s to \"%s\"\n", s->name, t->name, tGn->name);
+    }
     /*
      * Record last child for expansion purposes
      */
     ln = Lst_LastS(tGn->children);
     /*
      * Pass the buck to Make_HandleUse to apply the rule
      */
     (void)Make_HandleUse(gn, tGn);
     /*
      * Deal with wildcards and variables in any acquired sources
      */
     for (ln = ln != NULL ? Lst_SuccS(ln) : NULL; ln != NULL; ln = nln) {
 	nln = Lst_SuccS(ln);
 	SuffExpandChildren(ln, tGn);
+    }
     /*
      * Keep track of another parent to which this beast is transformed so
      * the .IMPSRC variable can be set correctly for the parent.
      */
     Lst_AppendS(sGn->iParents, tGn);
     return TRUE;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffFindArchiveDeps --
  *	Locate dependencies for an OP_ARCHV node.
+ *
  * Input:
  *	gn		Node for which to locate dependencies
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	Same as Suff_FindDeps
+ *
  *-----------------------------------------------------------------------
  */
 static void
 SuffFindArchiveDeps(GNode *gn, Lst slst)
+{
     char    	*eoarch;    /* End of archive portion */
     char    	*eoname;    /* End of member portion */
     GNode   	*mem;	    /* Node for member */
     LstNode 	ln, nln;    /* Next suffix node to check */
     Suff    	*ms;	    /* Suffix descriptor for member */
     char    	*name;	    /* Start of member's name */
     /*
      * The node is an archive(member) pair. so we must find a
      * suffix for both of them.
      */
     eoarch = strchr(gn->name, '(');
     eoname = strchr(eoarch, ')');
     /*
      * Caller guarantees the format `libname(member)', via
      * Arch_ParseArchive.
      */
     assert(eoarch != NULL);
     assert(eoname != NULL);
     *eoname = '\0';	  /* Nuke parentheses during suffix search */
     *eoarch = '\0';	  /* So a suffix can be found */
     name = eoarch + 1;
     /*
      * To simplify things, call Suff_FindDeps recursively on the member now,
      * so we can simply compare the member's .PREFIX and .TARGET variables
      * to locate its suffix. This allows us to figure out the suffix to
      * use for the archive without having to do a quadratic search over the
      * suffix list, backtracking for each one...
      */
     mem = Targ_FindNode(name, TARG_CREATE);
     SuffFindDeps(mem, slst);
     /*
      * Create the link between the two nodes right off
      */
     Lst_AppendS(gn->children, mem);
     Lst_AppendS(mem->parents, gn);
     gn->unmade += 1;
     /*
      * Copy in the variables from the member node to this one.
      */
+    {
 	char *freeIt;
 	Var_Set(PREFIX, Var_Value(PREFIX, mem, &freeIt), gn);
 	bmake_free(freeIt);
 	Var_Set(TARGET, Var_Value(TARGET, mem, &freeIt), gn);
 	bmake_free(freeIt);
+    }
     ms = mem->suffix;
     if (ms == NULL) {
 	/*
 	 * Didn't know what it was -- use .NULL suffix if not in make mode
 	 */
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "using null suffix\n");
+	}
 	ms = suffNull;
+    }
     /*
      * Set the other two local variables required for this target.
      */
     Var_Set(MEMBER, name, gn);
     Var_Set(ARCHIVE, gn->name, gn);
     /*
      * Set $@ for compatibility with other makes
      */
     Var_Set(TARGET, gn->name, gn);
     /*
      * Now we've got the important local variables set, expand any sources
      * that still contain variables or wildcards in their names.
      */
     for (ln = Lst_FirstS(gn->children); ln != NULL; ln = nln) {
 	nln = Lst_SuccS(ln);
 	SuffExpandChildren(ln, gn);
+    }
     if (ms != NULL) {
 	/*
 	 * Member has a known suffix, so look for a transformation rule from
 	 * it to a possible suffix of the archive. Rather than searching
 	 * through the entire list, we just look at suffixes to which the
 	 * member's suffix may be transformed...
 	 */
 	SuffixCmpData	sd;		/* Search string data */
 	/*
 	 * Use first matching suffix...
 	 */
 	sd.len = eoarch - gn->name;
 	sd.ename = eoarch;
 	ln = Lst_Find(ms->parents, SuffSuffIsSuffixP, &sd);
 	if (ln != NULL) {
 	    /*
 	     * Got one -- apply it
 	     */
 	    if (!SuffApplyTransform(gn, mem, (Suff *)Lst_DatumS(ln), ms) &&
 		DEBUG(SUFF))
+	    {
 		fprintf(debug_file, "\tNo transformation from %s -> %s\n",
 		       ms->name, ((Suff *)Lst_DatumS(ln))->name);
+	    }
+	}
+    }
     /*
      * Replace the opening and closing parens now we've no need of the separate
      * pieces.
      */
     *eoarch = '('; *eoname = ')';
     /*
      * Pretend gn appeared to the left of a dependency operator so
      * the user needn't provide a transformation from the member to the
      * archive.
      */
     if (OP_NOP(gn->type)) {
 	gn->type |= OP_DEPENDS;
+    }
     /*
      * Flag the member as such so we remember to look in the archive for
      * its modification time. The OP_JOIN | OP_MADE is needed because this
      * target should never get made.
      */
     mem->type |= OP_MEMBER | OP_JOIN | OP_MADE;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffFindNormalDeps --
  *	Locate implicit dependencies for regular targets.
+ *
  * Input:
  *	gn		Node for which to find sources
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	Same as Suff_FindDeps...
+ *
  *-----------------------------------------------------------------------
  */
 static void
 SuffFindNormalDeps(GNode *gn, Lst slst)
+{
     char    	*eoname;    /* End of name */
     char    	*sopref;    /* Start of prefix */
     LstNode 	ln, nln;    /* Next suffix node to check */
     Lst	    	srcs;	    /* List of sources at which to look */
     Lst	    	targs;	    /* List of targets to which things can be
 			     * transformed. They all have the same file,
 			     * but different suff and pref fields */
     Src	    	*bottom;    /* Start of found transformation path */
     Src 	*src;	    /* General Src pointer */
     char    	*pref;	    /* Prefix to use */
     Src	    	*targ;	    /* General Src target pointer */
     SuffixCmpData sd;	    /* Search string data */
     sd.len = strlen(gn->name);
     sd.ename = eoname = gn->name + sd.len;
     sopref = gn->name;
     /*
      * Begin at the beginning...
      */
     ln = Lst_First(sufflist);
     srcs = Lst_Init();
     targs = Lst_Init();
     /*
      * We're caught in a catch-22 here. On the one hand, we want to use any
      * transformation implied by the target's sources, but we can't examine
      * the sources until we've expanded any variables/wildcards they may hold,
      * and we can't do that until we've set up the target's local variables
      * and we can't do that until we know what the proper suffix for the
      * target is (in case there are two suffixes one of which is a suffix of
      * the other) and we can't know that until we've found its implied
      * source, which we may not want to use if there's an existing source
      * that implies a different transformation.
+     *
      * In an attempt to get around this, which may not work all the time,
      * but should work most of the time, we look for implied sources first,
      * checking transformations to all possible suffixes of the target,
      * use what we find to set the target's local variables, expand the
      * children, then look for any overriding transformations they imply.
      * Should we find one, we discard the one we found before.
      */
     bottom = NULL;
     targ = NULL;
     if (!(gn->type & OP_PHONY)) {
 	while (ln != NULL) {
 	    /*
 	     * Look for next possible suffix...
 	     */
 	    ln = Lst_FindFrom(sufflist, ln, SuffSuffIsSuffixP, &sd);
 	    if (ln != NULL) {
 		int	    prefLen;	    /* Length of the prefix */
 		/*
 		 * Allocate a Src structure to which things can be transformed
 		 */
 		targ = bmake_malloc(sizeof(Src));
 		targ->file = bmake_strdup(gn->name);
 		targ->suff = Lst_DatumS(ln);
 		targ->suff->refCount++;
 		targ->node = gn;
 		targ->parent = NULL;
 		targ->children = 0;
 #ifdef DEBUG_SRC
 		targ->cp = Lst_Init();
 #endif
 		/*
 		 * Allocate room for the prefix, whose end is found by
 		 * subtracting the length of the suffix from
 		 * the end of the name.
 		 */
 		prefLen = (eoname - targ->suff->nameLen) - sopref;
 		targ->pref = bmake_malloc(prefLen + 1);
 		memcpy(targ->pref, sopref, prefLen);
 		targ->pref[prefLen] = '\0';
 		/*
 		 * Add nodes from which the target can be made
 		 */
 		SuffAddLevel(srcs, targ);
 		/*
 		 * Record the target so we can nuke it
 		 */
 		Lst_AppendS(targs, targ);
 		/*
 		 * Search from this suffix's successor...
 		 */
 		ln = Lst_SuccS(ln);
+	    }
+	}
 	/*
 	 * Handle target of unknown suffix...
 	 */
 	if (Lst_IsEmptyS(targs) && suffNull != NULL) {
 	    if (DEBUG(SUFF)) {
 		fprintf(debug_file, "\tNo known suffix on %s. Using .NULL suffix\n", gn->name);
+	    }
 	    targ = bmake_malloc(sizeof(Src));
 	    targ->file = bmake_strdup(gn->name);
 	    targ->suff = suffNull;
 	    targ->suff->refCount++;
 	    targ->node = gn;
 	    targ->parent = NULL;
 	    targ->children = 0;
 	    targ->pref = bmake_strdup(sopref);
 #ifdef DEBUG_SRC
 	    targ->cp = Lst_Init();
 #endif
 	    /*
 	     * Only use the default suffix rules if we don't have commands
 	     * defined for this gnode; traditional make programs used to
 	     * not define suffix rules if the gnode had children but we
 	     * don't do this anymore.
 	     */
 	    if (Lst_IsEmptyS(gn->commands))
 		SuffAddLevel(srcs, targ);
 	    else {
 		if (DEBUG(SUFF))
 		    fprintf(debug_file, "not ");
+	    }
 	    if (DEBUG(SUFF))
 		fprintf(debug_file, "adding suffix rules\n");
 	    Lst_AppendS(targs, targ);
+	}
 	/*
 	 * Using the list of possible sources built up from the target
 	 * suffix(es), try and find an existing file/target that matches.
 	 */
 	bottom = SuffFindThem(srcs, slst);
 	if (bottom == NULL) {
 	    /*
 	     * No known transformations -- use the first suffix found
 	     * for setting the local variables.
 	     */
 	    if (!Lst_IsEmptyS(targs)) {
 		targ = Lst_DatumS(Lst_First(targs));
 	    } else {
 		targ = NULL;
+	    }
 	} else {
 	    /*
 	     * Work up the transformation path to find the suffix of the
 	     * target to which the transformation was made.
 	     */
 	    for (targ = bottom; targ->parent != NULL; targ = targ->parent)
 		continue;
+	}
+    }
     Var_Set(TARGET, gn->path ? gn->path : gn->name, gn);
     pref = (targ != NULL) ? targ->pref : gn->name;
     Var_Set(PREFIX, pref, gn);
     /*
      * Now we've got the important local variables set, expand any sources
      * that still contain variables or wildcards in their names.
      */
     for (ln = Lst_First(gn->children); ln != NULL; ln = nln) {
 	nln = Lst_SuccS(ln);
 	SuffExpandChildren(ln, gn);
+    }
     if (targ == NULL) {
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "\tNo valid suffix on %s\n", gn->name);
+	}
 sfnd_abort:
 	/*
 	 * Deal with finding the thing on the default search path. We
 	 * always do that, not only if the node is only a source (not
 	 * on the lhs of a dependency operator or [XXX] it has neither
 	 * children or commands) as the old pmake did.
 	 */
 	if ((gn->type & (OP_PHONY|OP_NOPATH)) == 0) {
 	    free(gn->path);
 	    gn->path = Dir_FindFile(gn->name,
 				    (targ == NULL ? dirSearchPath :
 				     targ->suff->searchPath));
 	    if (gn->path != NULL) {
 		char *ptr;
 		Var_Set(TARGET, gn->path, gn);
 		if (targ != NULL) {
 		    /*
 		     * Suffix known for the thing -- trim the suffix off
 		     * the path to form the proper .PREFIX variable.
 		     */
 		    int     savep = strlen(gn->path) - targ->suff->nameLen;
 		    char    savec;
 		    if (gn->suffix)
 			gn->suffix->refCount--;
 		    gn->suffix = targ->suff;
 		    gn->suffix->refCount++;
 		    savec = gn->path[savep];
 		    gn->path[savep] = '\0';
 		    if ((ptr = strrchr(gn->path, '/')) != NULL)
 			ptr++;
 		    else
 			ptr = gn->path;
 		    Var_Set(PREFIX, ptr, gn);
 		    gn->path[savep] = savec;
 		} else {
 		    /*
 		     * The .PREFIX gets the full path if the target has
 		     * no known suffix.
 		     */
 		    if (gn->suffix)
 			gn->suffix->refCount--;
 		    gn->suffix = NULL;
 		    if ((ptr = strrchr(gn->path, '/')) != NULL)
 			ptr++;
 		    else
 			ptr = gn->path;
 		    Var_Set(PREFIX, ptr, gn);
+		}
+	    }
+	}
 	goto sfnd_return;
+    }
     /*
      * If the suffix indicates that the target is a library, mark that in
      * the node's type field.
      */
     if (targ->suff->flags & SUFF_LIBRARY) {
 	gn->type |= OP_LIB;
+    }
     /*
      * Check for overriding transformation rule implied by sources
      */
     if (!Lst_IsEmptyS(gn->children)) {
 	src = SuffFindCmds(targ, slst);
 	if (src != NULL) {
 	    /*
 	     * Free up all the Src structures in the transformation path
 	     * up to, but not including, the parent node.
 	     */
 	    while (bottom && bottom->parent != NULL) {
 		if (Lst_MemberS(slst, bottom) == NULL) {
 		    Lst_AppendS(slst, bottom);
+		}
 		bottom = bottom->parent;
+	    }
 	    bottom = src;
+	}
+    }
     if (bottom == NULL) {
 	/*
 	 * No idea from where it can come -- return now.
 	 */
 	goto sfnd_abort;
+    }
     /*
      * We now have a list of Src structures headed by 'bottom' and linked via
      * their 'parent' pointers. What we do next is create links between
      * source and target nodes (which may or may not have been created)
      * and set the necessary local variables in each target. The
      * commands for each target are set from the commands of the
      * transformation rule used to get from the src suffix to the targ
      * suffix. Note that this causes the commands list of the original
      * node, gn, to be replaced by the commands of the final
      * transformation rule. Also, the unmade field of gn is incremented.
      * Etc.
      */
     if (bottom->node == NULL) {
 	bottom->node = Targ_FindNode(bottom->file, TARG_CREATE);
+    }
     for (src = bottom; src->parent != NULL; src = src->parent) {
 	targ = src->parent;
 	if (src->node->suffix)
 	    src->node->suffix->refCount--;
 	src->node->suffix = src->suff;
 	src->node->suffix->refCount++;
 	if (targ->node == NULL) {
 	    targ->node = Targ_FindNode(targ->file, TARG_CREATE);
+	}
 	SuffApplyTransform(targ->node, src->node,
 			   targ->suff, src->suff);
 	if (targ->node != gn) {
 	    /*
 	     * Finish off the dependency-search process for any nodes
 	     * between bottom and gn (no point in questing around the
 	     * filesystem for their implicit source when it's already
 	     * known). Note that the node can't have any sources that
 	     * need expanding, since SuffFindThem will stop on an existing
 	     * node, so all we need to do is set the standard and System V
 	     * variables.
 	     */
 	    targ->node->type |= OP_DEPS_FOUND;
 	    Var_Set(PREFIX, targ->pref, targ->node);
 	    Var_Set(TARGET, targ->node->name, targ->node);
+	}
+    }
     if (gn->suffix)
 	gn->suffix->refCount--;
     gn->suffix = src->suff;
     gn->suffix->refCount++;
     /*
      * Nuke the transformation path and the Src structures left over in the
      * two lists.
      */
 sfnd_return:
     if (bottom)
 	if (Lst_MemberS(slst, bottom) == NULL)
 	    Lst_AppendS(slst, bottom);
     while (SuffRemoveSrc(srcs) || SuffRemoveSrc(targs))
 	continue;
     Lst_MoveAllS(slst, srcs);
     Lst_MoveAllS(slst, targs);
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_FindDeps  --
  *	Find implicit sources for the target described by the graph node
  *	gn
+ *
  * Results:
  *	Nothing.
+ *
  * Side Effects:
  *	Nodes are added to the graph below the passed-in node. The nodes
  *	are marked to have their IMPSRC variable filled in. The
  *	PREFIX variable is set for the given node and all its
  *	implied children.
+ *
  * Notes:
  *	The path found by this target is the shortest path in the
  *	transformation graph, which may pass through non-existent targets,
  *	to an existing target. The search continues on all paths from the
  *	root suffix until a file is found. I.e. if there's a path
  *	.o -> .c -> .l -> .l,v from the root and the .l,v file exists but
  *	the .c and .l files don't, the search will branch out in
  *	all directions from .o and again from all the nodes on the
  *	next level until the .l,v node is encountered.
+ *
  *-----------------------------------------------------------------------
  */
 void
 Suff_FindDeps(GNode *gn)
+{
     SuffFindDeps(gn, srclist);
     while (SuffRemoveSrc(srclist))
 	continue;
+}
 /*
  * Input:
  *	gn		node we're dealing with
+ *
  */
 static void
 SuffFindDeps(GNode *gn, Lst slst)
+{
     if (gn->type & OP_DEPS_FOUND) {
 	/*
 	 * If dependencies already found, no need to do it again...
 	 */
 	return;
     } else {
 	gn->type |= OP_DEPS_FOUND;
+    }
     /*
      * Make sure we have these set, may get revised below.
      */
     Var_Set(TARGET, gn->path ? gn->path : gn->name, gn);
     Var_Set(PREFIX, gn->name, gn);
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "SuffFindDeps (%s)\n", gn->name);
+    }
     if (gn->type & OP_ARCHV) {
 	SuffFindArchiveDeps(gn, slst);
     } else if (gn->type & OP_LIB) {
 	/*
 	 * If the node is a library, it is the arch module's job to find it
 	 * and set the TARGET variable accordingly. We merely provide the
 	 * search path, assuming all libraries end in ".a" (if the suffix
 	 * hasn't been defined, there's nothing we can do for it, so we just
 	 * set the TARGET variable to the node's name in order to give it a
 	 * value).
 	 */
 	LstNode	ln;
 	Suff	*s;
 	ln = Lst_FindS(sufflist, SuffSuffHasNameP, LIBSUFF);
 	if (gn->suffix)
 	    gn->suffix->refCount--;
 	if (ln != NULL) {
 	    gn->suffix = s = Lst_DatumS(ln);
 	    gn->suffix->refCount++;
 	    Arch_FindLib(gn, s->searchPath);
 	} else {
 	    gn->suffix = NULL;
 	    Var_Set(TARGET, gn->name, gn);
+	}
 	/*
 	 * Because a library (-lfoo) target doesn't follow the standard
 	 * filesystem conventions, we don't set the regular variables for
 	 * the thing. .PREFIX is simply made empty...
 	 */
 	Var_Set(PREFIX, "", gn);
     } else {
 	SuffFindNormalDeps(gn, slst);
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_SetNull --
  *	Define which suffix is the null suffix.
+ *
  * Input:
  *	name		Name of null suffix
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	'suffNull' is altered.
+ *
  * Notes:
  *	Need to handle the changing of the null suffix gracefully so the
  *	old transformation rules don't just go away.
+ *
  *-----------------------------------------------------------------------
  */
 void
 Suff_SetNull(char *name)
+{
     Suff    *s;
     LstNode ln;
     ln = Lst_FindS(sufflist, SuffSuffHasNameP, name);
     if (ln != NULL) {
 	s = Lst_DatumS(ln);
 	if (suffNull != NULL) {
 	    suffNull->flags &= ~SUFF_NULL;
+	}
 	s->flags |= SUFF_NULL;
 	/*
 	 * XXX: Here's where the transformation mangling would take place
 	 */
 	suffNull = s;
     } else {
 	Parse_Error(PARSE_WARNING, "Desired null suffix %s not defined.",
 		     name);
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_Init --
  *	Initialize suffixes module
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	Many
  *-----------------------------------------------------------------------
  */
 void
 Suff_Init(void)
+{
 #ifdef CLEANUP
     suffClean = Lst_Init();
     sufflist = Lst_Init();
 #endif
     srclist = Lst_Init();
     transforms = Lst_Init();
     /*
      * Create null suffix for single-suffix rules (POSIX). The thing doesn't
      * actually go on the suffix list or everyone will think that's its
      * suffix.
      */
     Suff_ClearSuffixes();
+}
 /*-
  *----------------------------------------------------------------------
  * Suff_End --
  *	Cleanup the this module
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	The memory is free'd.
  *----------------------------------------------------------------------
  */
 void
 Suff_End(void)
+{
 #ifdef CLEANUP
     Lst_DestroyS(sufflist, SuffFree);
     Lst_DestroyS(suffClean, SuffFree);
     if (suffNull)
 	SuffFree(suffNull);
     Lst_FreeS(srclist);
     Lst_FreeS(transforms);
 #endif
+}
 /********************* DEBUGGING FUNCTIONS **********************/
 static int SuffPrintName(void *s, void *dummy MAKE_ATTR_UNUSED)
+{
     fprintf(debug_file, "%s ", ((Suff *)s)->name);
     return 0;
+}
 static int
 SuffPrintSuff(void *sp, void *dummy MAKE_ATTR_UNUSED)
+{
     Suff    *s = (Suff *)sp;
     int	    flags;
     int	    flag;
     fprintf(debug_file, "# `%s' [%d] ", s->name, s->refCount);
-    flags = s->flags;
+    if (s->flags != 0) {
-    if (flags) {
+	char flags_buf[SuffFlags_ToStringSize];
 	fputs(" (", debug_file);
-	while (flags) {
+	fprintf(debug_file, " (%s)",
-	    flag = 1 << (ffs(flags) - 1);
+		Enum_FlagsToString(flags_buf, sizeof flags_buf,
-	    flags &= ~flag;
+				   s->flags, SuffFlags_ToStringSpecs));
 	    switch (flag) {
 		case SUFF_NULL:
 		    fprintf(debug_file, "NULL");
 		    break;
 		case SUFF_INCLUDE:
 		    fprintf(debug_file, "INCLUDE");
 		    break;
 		case SUFF_LIBRARY:
 		    fprintf(debug_file, "LIBRARY");
 		    break;
 	    fputc(flags ? '|' : ')', debug_file);
+    }
     fputc('\n', debug_file);
     fprintf(debug_file, "#\tTo: ");
     Lst_ForEachS(s->parents, SuffPrintName, NULL);
     fputc('\n', debug_file);
     fprintf(debug_file, "#\tFrom: ");
     Lst_ForEachS(s->children, SuffPrintName, NULL);
     fputc('\n', debug_file);
     fprintf(debug_file, "#\tSearch Path: ");
     Dir_PrintPath(s->searchPath);
     fputc('\n', debug_file);
     return 0;
+}
 static int
 SuffPrintTrans(void *tp, void *dummy MAKE_ATTR_UNUSED)
+{
     GNode   *t = (GNode *)tp;
     fprintf(debug_file, "%-16s: ", t->name);
     Targ_PrintType(t->type);
     fputc('\n', debug_file);
     Lst_ForEachS(t->commands, Targ_PrintCmd, NULL);
     fputc('\n', debug_file);
     return 0;
+}
 void
 Suff_PrintAll(void)
+{
     fprintf(debug_file, "#*** Suffixes:\n");
     Lst_ForEachS(sufflist, SuffPrintSuff, NULL);
     fprintf(debug_file, "#*** Transformations:\n");
     Lst_ForEachS(transforms, SuffPrintTrans, NULL);
+}