 @@ -1,1627 +1,1629 @@
-/*	$NetBSD: suff.c,v 1.125 2020/08/28 04:48:57 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.126 2020/08/28 06:37:21 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.125 2020/08/28 04:48:57 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.126 2020/08/28 06:37:21 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.125 2020/08/28 04:48:57 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.126 2020/08/28 06:37:21 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, such as ".c" */
     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_Member(l, sp);
     if (ln != NULL) {
 	Lst_Remove(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_Free(s->ref);
     Lst_Free(s->children);
     Lst_Free(s->parents);
     Lst_Destroy(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_Open(l);
     while ((ln = Lst_Next(l)) != NULL) {
 	s2 = Lst_Datum(ln);
 	if (s2->sNum >= s->sNum) {
 	    break;
+	}
+    }
     Lst_Close(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_Append(l, s);
 	s->refCount++;
 	Lst_Append(s->ref, l);
     } else if (s2->sNum != s->sNum) {
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "before %s(%d)\n", s2->name, s2->sNum);
+	}
 	Lst_InsertBefore(l, ln, s);
 	s->refCount++;
 	Lst_Append(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_MoveAll(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_Find(sufflist, SuffSuffIsPrefix, str);
 	} else {
-	    srcLn = Lst_FindFrom(sufflist, Lst_Succ(srcLn),
+	    LstNode succ = Lst_Succ(srcLn);
-				 SuffSuffIsPrefix, str);
+	    srcLn = succ != NULL
 		    ? Lst_FindFrom(sufflist, succ, SuffSuffIsPrefix, str)
 		    : NULL;
+	}
 	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_Datum(srcLn);
 	str2 = str + src->nameLen;
 	if (*str2 == '\0') {
 	    single = src;
 	    singleLn = srcLn;
 	} else {
 	    targLn = Lst_Find(sufflist, SuffSuffHasNameP, str2);
 	    if (targLn != NULL) {
 		*srcPtr = src;
 		*targPtr = Lst_Datum(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_Append(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_Datum(ln);
 	Lst_Free(gn->commands);
 	Lst_Free(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_IsEmpty(gn->cohorts))
 	gn = Lst_Datum(Lst_Last(gn->cohorts));
     if ((gn->type & OP_TRANSFORM) && Lst_IsEmpty(gn->commands) &&
 	Lst_IsEmpty(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_Find(sufflist, SuffSuffHasNameP, cp);
 	if (ln != NULL) {
 	    /*
 	     * Found target. Link in and return, since it can't be anything
 	     * else.
 	     */
 	    s2 = Lst_Datum(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_Find(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_Datum(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_Free(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_Find(sufflist, SuffSuffHasNameP, str);
     if (ln == NULL) {
         s = SuffNew(str);
 	Lst_Append(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_ForEach(Targ_List(), SuffScanTargets, &gs);
 	/*
 	 * Look for any existing transformations from or to this suffix.
 	 * XXX: Only do this after a Suff_ClearSuffixes?
 	 */
 	Lst_ForEach(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_Find(sufflist, SuffSuffHasNameP, sname);
     if (ln == NULL) {
 	return NULL;
     } else {
 	s = Lst_Datum(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_Open(sufflist);
     while ((ln = Lst_Next(sufflist)) != NULL) {
 	s = Lst_Datum(ln);
 	if (!Lst_IsEmpty(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_Destroy(s->searchPath, Dir_Destroy);
 	    s->searchPath = Lst_Copy(dirSearchPath, Dir_CopyDir);
+	}
+    }
     Lst_Close(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_Destroy(inIncludes, Dir_Destroy);
     Lst_Destroy(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_Find(sufflist, SuffSuffHasNameP, sname);
     if (ln != NULL) {
 	s = Lst_Datum(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_Find(sufflist, SuffSuffHasNameP, sname);
     if (ln != NULL) {
 	s = Lst_Datum(ln);
 	s->flags |= SUFF_LIBRARY;
+    }
+}
 	  /********** Implicit Source Search Functions *********/
 /*-
  *-----------------------------------------------------------------------
  * SuffAddSrc  --
  *	Add a suffix as a Src structure to the given list with its parent
  *	being the given Src structure. If the suffix is the null suffix,
  *	the prefix is used unaltered as the file name in the Src structure.
+ *
  * Input:
  *	sp		suffix for which to create a Src structure
  *	lsp		list and parent for the new Src
+ *
  * Results:
  *	always returns 0
+ *
  * Side Effects:
  *	A Src structure is created and tacked onto the end of the list
  *-----------------------------------------------------------------------
  */
 static int
 SuffAddSrc(void *sp, void *lsp)
+{
     Suff	*s = (Suff *)sp;
     LstSrc      *ls = (LstSrc *)lsp;
     Src         *s2;	    /* new Src structure */
     Src    	*targ; 	    /* Target structure */
     targ = ls->s;
     if ((s->flags & SUFF_NULL) && (*s->name != '\0')) {
 	/*
 	 * If the suffix has been marked as the NULL suffix, also create a Src
 	 * structure for a file with no suffix attached. Two birds, and all
 	 * that...
 	 */
 	s2 = bmake_malloc(sizeof(Src));
 	s2->file =  	bmake_strdup(targ->pref);
 	s2->pref =  	targ->pref;
 	s2->parent = 	targ;
 	s2->node =  	NULL;
 	s2->suff =  	s;
 	s->refCount++;
 	s2->children =	0;
 	targ->children += 1;
 	Lst_Append(ls->l, s2);
 #ifdef DEBUG_SRC
 	s2->cp = Lst_Init();
 	Lst_Append(targ->cp, s2);
 	fprintf(debug_file, "1 add %p %p to %p:", targ, s2, ls->l);
 	Lst_ForEach(ls->l, PrintAddr, NULL);
 	fprintf(debug_file, "\n");
 #endif
+    }
     s2 = bmake_malloc(sizeof(Src));
     s2->file = 	    str_concat2(targ->pref, s->name);
     s2->pref =	    targ->pref;
     s2->parent =    targ;
     s2->node = 	    NULL;
     s2->suff = 	    s;
     s->refCount++;
     s2->children =  0;
     targ->children += 1;
     Lst_Append(ls->l, s2);
 #ifdef DEBUG_SRC
     s2->cp = Lst_Init();
     Lst_Append(targ->cp, s2);
     fprintf(debug_file, "2 add %p %p to %p:", targ, s2, ls->l);
     Lst_ForEach(ls->l, PrintAddr, NULL);
     fprintf(debug_file, "\n");
 #endif
     return 0;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffAddLevel  --
  *	Add all the children of targ as Src structures to the given list
+ *
  * Input:
  *	l		list to which to add the new level
  *	targ		Src structure to use as the parent
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  * 	Lots of structures are created and added to the list
  *-----------------------------------------------------------------------
  */
 static void
 SuffAddLevel(Lst l, Src *targ)
+{
     LstSrc         ls;
     ls.s = targ;
     ls.l = l;
     Lst_ForEach(targ->suff->children, SuffAddSrc, &ls);
+}
 /*-
  *----------------------------------------------------------------------
  * SuffRemoveSrc --
  *	Free all src structures in list that don't have a reference count
+ *
  * Results:
  *	Ture if an src was removed
+ *
  * Side Effects:
  *	The memory is free'd.
  *----------------------------------------------------------------------
  */
 static int
 SuffRemoveSrc(Lst l)
+{
     LstNode ln;
     Src *s;
     int t = 0;
     Lst_Open(l);
 #ifdef DEBUG_SRC
     fprintf(debug_file, "cleaning %lx: ", (unsigned long) l);
     Lst_ForEach(l, PrintAddr, NULL);
     fprintf(debug_file, "\n");
 #endif
     while ((ln = Lst_Next(l)) != NULL) {
 	s = Lst_Datum(ln);
 	if (s->children == 0) {
 	    free(s->file);
 	    if (!s->parent)
 		free(s->pref);
 	    else {
 #ifdef DEBUG_SRC
 		LstNode ln2 = Lst_Member(s->parent->cp, s);
 		if (ln2 != NULL)
 		    Lst_Remove(s->parent->cp, ln2);
 #endif
 		--s->parent->children;
+	    }
 #ifdef DEBUG_SRC
 	    fprintf(debug_file, "free: [l=%p] p=%p %d\n", l, s, s->children);
 	    Lst_Free(s->cp);
 #endif
 	    Lst_Remove(l, ln);
 	    free(s);
 	    t |= 1;
 	    Lst_Close(l);
 	    return TRUE;
+	}
 #ifdef DEBUG_SRC
 	else {
 	    fprintf(debug_file, "keep: [l=%p] p=%p %d: ", l, s, s->children);
 	    Lst_ForEach(s->cp, PrintAddr, NULL);
 	    fprintf(debug_file, "\n");
+	}
 #endif
+    }
     Lst_Close(l);
     return t;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffFindThem --
  *	Find the first existing file/target in the list srcs
+ *
  * Input:
  *	srcs		list of Src structures to search through
+ *
  * Results:
  *	The lowest structure in the chain of transformations
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 static Src *
 SuffFindThem(Lst srcs, Lst slst)
+{
     Src            *s;		/* current Src */
     Src		   *rs;		/* returned Src */
     char	   *ptr;
     rs = NULL;
     while (!Lst_IsEmpty(srcs)) {
 	s = Lst_Dequeue(srcs);
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "\ttrying %s...", s->file);
+	}
 	/*
 	 * A file is considered to exist if either a node exists in the
 	 * graph for it or the file actually exists.
 	 */
 	if (Targ_FindNode(s->file, TARG_NOCREATE) != NULL) {
 #ifdef DEBUG_SRC
 	    fprintf(debug_file, "remove %p from %p\n", s, srcs);
 #endif
 	    rs = s;
 	    break;
+	}
 	if ((ptr = Dir_FindFile(s->file, s->suff->searchPath)) != NULL) {
 	    rs = s;
 #ifdef DEBUG_SRC
 	    fprintf(debug_file, "remove %p from %p\n", s, srcs);
 #endif
 	    free(ptr);
 	    break;
+	}
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "not there\n");
+	}
 	SuffAddLevel(srcs, s);
 	Lst_Append(slst, s);
+    }
     if (DEBUG(SUFF) && rs) {
 	fprintf(debug_file, "got it\n");
+    }
     return rs;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffFindCmds --
  *	See if any of the children of the target in the Src structure is
  *	one from which the target can be transformed. If there is one,
  *	a Src structure is put together for it and returned.
+ *
  * Input:
  *	targ		Src structure to play with
+ *
  * Results:
  *	The Src structure of the "winning" child, or NULL if no such beast.
+ *
  * Side Effects:
  *	A Src structure may be allocated.
+ *
  *-----------------------------------------------------------------------
  */
 static Src *
 SuffFindCmds(Src *targ, Lst slst)
+{
     LstNode 	  	ln; 	/* General-purpose list node */
     GNode		*t, 	/* Target GNode */
 			*s; 	/* Source GNode */
     int	    	  	prefLen;/* The length of the defined prefix */
     Suff    	  	*suff;	/* Suffix on matching beastie */
     Src	    	  	*ret;	/* Return value */
     char    	  	*cp;
     t = targ->node;
     Lst_Open(t->children);
     prefLen = strlen(targ->pref);
     for (;;) {
 	ln = Lst_Next(t->children);
 	if (ln == NULL) {
 	    Lst_Close(t->children);
 	    return NULL;
+	}
 	s = Lst_Datum(ln);
 	if (s->type & OP_OPTIONAL && Lst_IsEmpty(t->commands)) {
 	    /*
 	     * We haven't looked to see if .OPTIONAL files exist yet, so
 	     * don't use one as the implicit source.
 	     * This allows us to use .OPTIONAL in .depend files so make won't
 	     * complain "don't know how to make xxx.h' when a dependent file
 	     * has been moved/deleted.
 	     */
 	    continue;
+	}
 	cp = strrchr(s->name, '/');
 	if (cp == NULL) {
 	    cp = s->name;
 	} else {
 	    cp++;
+	}
 	if (strncmp(cp, targ->pref, prefLen) != 0)
 	    continue;
 	/*
 	 * The node matches the prefix ok, see if it has a known
 	 * suffix.
 	 */
 	ln = Lst_Find(sufflist, SuffSuffHasNameP, &cp[prefLen]);
 	if (ln == NULL)
 	    continue;
 	/*
 	 * It even has a known suffix, see if there's a transformation
 	 * defined between the node's suffix and the target's suffix.
+	 *
 	 * XXX: Handle multi-stage transformations here, too.
 	 */
 	suff = Lst_Datum(ln);
 	/* XXX: Can targ->suff be NULL here? */
 	if (targ->suff != NULL &&
 	    Lst_Member(suff->parents, targ->suff) != NULL)
 	    break;
+    }
     /*
      * Hot Damn! Create a new Src structure to describe
      * this transformation (making sure to duplicate the
      * source node's name so Suff_FindDeps can free it
      * again (ick)), and return the new structure.
      */
     ret = bmake_malloc(sizeof(Src));
     ret->file = bmake_strdup(s->name);
     ret->pref = targ->pref;
     ret->suff = suff;
     suff->refCount++;
     ret->parent = targ;
     ret->node = s;
     ret->children = 0;
     targ->children += 1;
 #ifdef DEBUG_SRC
     ret->cp = Lst_Init();
     fprintf(debug_file, "3 add %p %p\n", targ, ret);
     Lst_Append(targ->cp, ret);
 #endif
     Lst_Append(slst, ret);
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "\tusing existing source %s\n", s->name);
+    }
     return ret;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffExpandChildren --
  *	Expand the names of any children of a given node that contain
  *	variable invocations or file wildcards into actual targets.
+ *
  * Input:
  *	cln		Child to examine
  *	pgn		Parent node being processed
+ *
  * Results:
  *	=== 0 (continue)
+ *
  * Side Effects:
  *	The expanded node is removed from the parent's list of children,
  *	and the parent's unmade counter is decremented, but other nodes
  * 	may be added.
+ *
  *-----------------------------------------------------------------------
  */
 static void
 SuffExpandChildren(LstNode cln, GNode *pgn)
+{
     GNode   	*cgn = Lst_Datum(cln);
     GNode	*gn;	    /* New source 8) */
     char	*cp;	    /* Expanded value */
     if (!Lst_IsEmpty(cgn->order_pred) || !Lst_IsEmpty(cgn->order_succ))
 	/* It is all too hard to process the result of .ORDER */
 	return;
     if (cgn->type & OP_WAIT)
 	/* Ignore these (& OP_PHONY ?) */
 	return;
     /*
      * First do variable expansion -- this takes precedence over
      * wildcard expansion. If the result contains wildcards, they'll be gotten
      * to later since the resulting words are tacked on to the end of
      * the children list.
      */
     if (strchr(cgn->name, '$') == NULL) {
 	SuffExpandWildcards(cln, pgn);
 	return;
+    }
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "Expanding \"%s\"...", cgn->name);
+    }
     cp = Var_Subst(cgn->name, pgn, VARE_UNDEFERR|VARE_WANTRES);
     if (cp != NULL) {
 	Lst	    members = Lst_Init();
 	if (cgn->type & OP_ARCHV) {
 	    /*
 	     * Node was an archive(member) target, so we want to call
 	     * on the Arch module to find the nodes for us, expanding
 	     * variables in the parent's context.
 	     */
 	    char	*sacrifice = cp;
 	    (void)Arch_ParseArchive(&sacrifice, members, pgn);
 	} else {
 	    /*
 	     * Break the result into a vector of strings whose nodes
 	     * we can find, then add those nodes to the members list.
 	     * Unfortunately, we can't use brk_string b/c it
 	     * doesn't understand about variable specifications with
 	     * spaces in them...
 	     */
 	    char	    *start;
 	    char	    *initcp = cp;   /* For freeing... */
 	    for (start = cp; *start == ' ' || *start == '\t'; start++)
 		continue;
 	    for (cp = start; *cp != '\0'; cp++) {
 		if (*cp == ' ' || *cp == '\t') {
 		    /*
 		     * White-space -- terminate element, find the node,
 		     * add it, skip any further spaces.
 		     */
 		    *cp++ = '\0';
 		    gn = Targ_FindNode(start, TARG_CREATE);
 		    Lst_Append(members, gn);
 		    while (*cp == ' ' || *cp == '\t') {
 			cp++;
+		    }
 		    /*
 		     * Adjust cp for increment at start of loop, but
 		     * set start to first non-space.
 		     */
 		    start = cp--;
 		} else if (*cp == '$') {
 		    /*
 		     * Start of a variable spec -- contact variable module
 		     * to find the end so we can skip over it.
 		     */
 		    const char	*junk;
 		    int 	len;
 		    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) {