 @@ -1,14 +1,14 @@
-/*	$NetBSD: arch.c,v 1.97 2020/08/26 22:55:46 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.98 2020/08/27 06:13:53 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.
 @@ -59,34 +59,34 @@
  * 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: arch.c,v 1.97 2020/08/26 22:55:46 rillig Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.98 2020/08/27 06:13:53 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: arch.c,v 1.97 2020/08/26 22:55:46 rillig Exp $");
+__RCSID("$NetBSD: arch.c,v 1.98 2020/08/27 06:13:53 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * arch.c --
  *	Functions to manipulate libraries, archives and their members.
+ *
  *	Once again, cacheing/hashing comes into play in the manipulation
  * of archives. The first time an archive is referenced, all of its members'
  * headers are read and hashed and the archive closed again. All hashed
  * archives are kept on a list which is searched each time an archive member
  * is referenced.
 @@ -215,36 +215,36 @@ ArchFree(void *ap)
 /*-
  *-----------------------------------------------------------------------
  * Arch_ParseArchive --
  *	Parse the archive specification in the given line and find/create
  *	the nodes for the specified archive members, placing their nodes
  *	on the given list.
+ *
  * Input:
  *	linePtr		Pointer to start of specification
  *	nodeLst		Lst on which to place the nodes
  *	ctxt		Context in which to expand variables
+ *
  * Results:
- *	SUCCESS if it was a valid specification. The linePtr is updated
+ *	TRUE if it was a valid specification. The linePtr is updated
  *	to point to the first non-space after the archive spec. The
  *	nodes for the members are placed on the given list.
+ *
  * Side Effects:
  *	Some nodes may be created. The given list is extended.
+ *
  *-----------------------------------------------------------------------
  */
-ReturnStatus
+Boolean
 Arch_ParseArchive(char **linePtr, Lst nodeLst, GNode *ctxt)
+{
     char	    *cp;	    /* Pointer into line */
     GNode	    *gn;     	    /* New node */
     char	    *libName;  	    /* Library-part of specification */
     char	    *memName;  	    /* Member-part of specification */
     char	    saveChar;  	    /* Ending delimiter of member-name */
     Boolean 	    subLibName;	    /* TRUE if libName should have/had
 				     * variable substitution performed on it */
     libName = *linePtr;
     subLibName = FALSE;
 @@ -254,27 +254,27 @@ Arch_ParseArchive(char **linePtr, Lst no
 	    /*
 	     * Variable spec, so call the Var module to parse the puppy
 	     * so we can safely advance beyond it...
 	     */
 	    int 	length;
 	    void	*freeIt;
 	    const char	*result;
 	    result = Var_Parse(cp, ctxt, VARE_UNDEFERR|VARE_WANTRES,
 			       &length, &freeIt);
 	    free(freeIt);
 	    if (result == var_Error) {
-		return FAILURE;
+		return FALSE;
 	    } else {
 		subLibName = TRUE;
+	    }
 	    cp += length-1;
+	}
+    }
     *cp++ = '\0';
     if (subLibName) {
 	libName = Var_Subst(libName, ctxt, VARE_UNDEFERR|VARE_WANTRES);
+    }
 @@ -296,45 +296,45 @@ Arch_ParseArchive(char **linePtr, Lst no
 		/*
 		 * Variable spec, so call the Var module to parse the puppy
 		 * so we can safely advance beyond it...
 		 */
 		int 	length;
 		void	*freeIt;
 		const char *result;
 		result = Var_Parse(cp, ctxt, VARE_UNDEFERR|VARE_WANTRES,
 				   &length, &freeIt);
 		free(freeIt);
 		if (result == var_Error) {
-		    return FAILURE;
+		    return FALSE;
 		} else {
 		    doSubst = TRUE;
+		}
 		cp += length;
 	    } else {
 		cp++;
+	    }
+	}
 	/*
 	 * If the specification ends without a closing parenthesis,
 	 * chances are there's something wrong (like a missing backslash),
 	 * so it's better to return failure than allow such things to happen
 	 */
 	if (*cp == '\0') {
 	    printf("No closing parenthesis in archive specification\n");
-	    return FAILURE;
+	    return FALSE;
+	}
 	/*
 	 * If we didn't move anywhere, we must be done
 	 */
 	if (cp == memName) {
 	    break;
+	}
 	saveChar = *cp;
 	*cp = '\0';
 	/*
 @@ -363,90 +363,90 @@ Arch_ParseArchive(char **linePtr, Lst no
 	     */
 	    buf = sacrifice = str_concat4(libName, "(", memName, ")");
 	    if (strchr(memName, '$') && strcmp(memName, oldMemName) == 0) {
 		/*
 		 * Must contain dynamic sources, so we can't deal with it now.
 		 * Just create an ARCHV node for the thing and let
 		 * SuffExpandChildren handle it...
 		 */
 		gn = Targ_FindNode(buf, TARG_CREATE);
 		if (gn == NULL) {
 		    free(buf);
-		    return FAILURE;
+		    return FALSE;
 		} else {
 		    gn->type |= OP_ARCHV;
 		    Lst_AppendS(nodeLst, gn);
+		}
-	    } else if (Arch_ParseArchive(&sacrifice, nodeLst, ctxt)!=SUCCESS) {
+	    } else if (!Arch_ParseArchive(&sacrifice, nodeLst, ctxt)) {
 		/*
 		 * Error in nested call -- free buffer and return FAILURE
 		 * ourselves.
 		 */
 		free(buf);
-		return FAILURE;
+		return FALSE;
+	    }
 	    /*
 	     * Free buffer and continue with our work.
 	     */
 	    free(buf);
 	} else if (Dir_HasWildcards(memName)) {
 	    Lst members = Lst_Init();
 	    Buffer nameBuf;
 	    Buf_Init(&nameBuf, 0);
 	    Dir_Expand(memName, dirSearchPath, members);
 	    while (!Lst_IsEmpty(members)) {
 		char *member = Lst_DequeueS(members);
 		Buf_Empty(&nameBuf);
 		Buf_AddStr(&nameBuf, libName);
 		Buf_AddStr(&nameBuf, "(");
 		Buf_AddStr(&nameBuf, member);
 		Buf_AddStr(&nameBuf, ")");
 		free(member);
 		gn = Targ_FindNode(Buf_GetAll(&nameBuf, NULL), TARG_CREATE);
 		if (gn == NULL) {
 		    Buf_Destroy(&nameBuf, TRUE);
-		    return FAILURE;
+		    return FALSE;
 		} else {
 		    /*
 		     * We've found the node, but have to make sure the rest of
 		     * the world knows it's an archive member, without having
 		     * to constantly check for parentheses, so we type the
 		     * thing with the OP_ARCHV bit before we place it on the
 		     * end of the provided list.
 		     */
 		    gn->type |= OP_ARCHV;
 		    Lst_AppendS(nodeLst, gn);
+		}
+	    }
 	    Lst_FreeS(members);
 	    Buf_Destroy(&nameBuf, TRUE);
 	} else {
 	    Buffer nameBuf;
 	    Buf_Init(&nameBuf, 0);
 	    Buf_AddStr(&nameBuf, libName);
 	    Buf_AddStr(&nameBuf, "(");
 	    Buf_AddStr(&nameBuf, memName);
 	    Buf_AddStr(&nameBuf, ")");
 	    gn = Targ_FindNode(Buf_GetAll(&nameBuf, NULL), TARG_CREATE);
 	    Buf_Destroy(&nameBuf, TRUE);
 	    if (gn == NULL) {
-		return FAILURE;
+		return FALSE;
 	    } else {
 		/*
 		 * We've found the node, but have to make sure the rest of the
 		 * world knows it's an archive member, without having to
 		 * constantly check for parentheses, so we type the thing with
 		 * the OP_ARCHV bit before we place it on the end of the
 		 * provided list.
 		 */
 		gn->type |= OP_ARCHV;
 		Lst_AppendS(nodeLst, gn);
+	    }
+	}
 	if (doSubst) {
 @@ -463,27 +463,27 @@ Arch_ParseArchive(char **linePtr, Lst no
 	free(libName);
+    }
     /*
      * We promised the pointer would be set up at the next non-space, so
      * we must advance cp there before setting *linePtr... (note that on
      * entrance to the loop, cp is guaranteed to point at a ')')
      */
     do {
 	cp++;
     } while (*cp != '\0' && isspace ((unsigned char)*cp));
     *linePtr = cp;
-    return SUCCESS;
+    return TRUE;
+}
 /*-
  *-----------------------------------------------------------------------
  * ArchFindArchive --
  *	See if the given archive is the one we are looking for. Called
  *	From ArchStatMember and ArchFindMember via Lst_Find.
+ *
  * Input:
  *	ar		Current list element
  *	archName	Name we want
+ *
  * Results:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.263 2020/08/26 22:55:46 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.264 2020/08/27 06:13:53 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.
 @@ -59,34 +59,34 @@
  * 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: parse.c,v 1.263 2020/08/26 22:55:46 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.264 2020/08/27 06:13:53 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.263 2020/08/26 22:55:46 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.264 2020/08/27 06:13:53 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * parse.c --
  *	Functions to parse a makefile.
+ *
  *	One function, Parse_Init, must be called before any functions
  *	in this module are used. After that, the function Parse_File is the
  *	main entry point and controls most of the other functions in this
  *	module.
+ *
 @@ -1244,27 +1244,27 @@ ParseDoDependency(char *line)
 	 * name of an object file inside an archive (ar file).
 	 */
 	if (!ParseIsEscaped(lstart, cp) && *cp == LPAREN) {
 	    /*
 	     * Archives must be handled specially to make sure the OP_ARCHV
 	     * flag is set in their 'type' field, for one thing, and because
 	     * things like "archive(file1.o file2.o file3.o)" are permissible.
 	     * Arch_ParseArchive will set 'line' to be the first non-blank
 	     * after the archive-spec. It creates/finds nodes for the members
 	     * and places them on the given list, returning SUCCESS if all
 	     * went well and FAILURE if there was an error in the
 	     * specification. On error, line should remain untouched.
 	     */
-	    if (Arch_ParseArchive(&line, targets, VAR_CMD) != SUCCESS) {
+	    if (!Arch_ParseArchive(&line, targets, VAR_CMD)) {
 		Parse_Error(PARSE_FATAL,
 			     "Error in archive specification: \"%s\"", line);
 		goto out;
 	    } else {
 		/* Done with this word; on to the next. */
 		cp = line;
 		continue;
+	    }
+	}
 	if (!*cp) {
 	    /*
 	     * We got to the end of the line while we were still
 @@ -1703,27 +1703,27 @@ ParseDoDependency(char *line)
 		if (*cp == LPAREN && cp > line && cp[-1] != '$') {
 		    /*
 		     * Only stop for a left parenthesis if it isn't at the
 		     * start of a word (that'll be for variable changes
 		     * later) and isn't preceded by a dollar sign (a dynamic
 		     * source).
 		     */
 		    break;
+		}
+	    }
 	    if (*cp == LPAREN) {
 		sources = Lst_Init();
-		if (Arch_ParseArchive(&line, sources, VAR_CMD) != SUCCESS) {
+		if (!Arch_ParseArchive(&line, sources, VAR_CMD)) {
 		    Parse_Error(PARSE_FATAL,
 				 "Error in source archive spec \"%s\"", line);
 		    goto out;
+		}
 		while (!Lst_IsEmpty(sources)) {
 		    gn = Lst_DequeueS(sources);
 		    ParseDoSrc(tOp, gn->name);
+		}
 		Lst_FreeS(sources);
 		cp = line;
 	    } else {
 		if (*cp) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nonints.h,v 1.98 2020/08/23 18:26:35 rillig Exp $	*/
+/*	$NetBSD: nonints.h,v 1.99 2020/08/27 06:13:53 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.
 @@ -63,27 +63,27 @@
  * 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: @(#)nonints.h	8.3 (Berkeley) 3/19/94
  */
 /* arch.c */
-ReturnStatus Arch_ParseArchive(char **, Lst, GNode *);
+Boolean Arch_ParseArchive(char **, Lst, GNode *);
 void Arch_Touch(GNode *);
 void Arch_TouchLib(GNode *);
 time_t Arch_MTime(GNode *);
 time_t Arch_MemMTime(GNode *);
 void Arch_FindLib(GNode *, Lst);
 Boolean Arch_LibOODate(GNode *);
 void Arch_Init(void);
 void Arch_End(void);
 int Arch_IsLib(GNode *);
 /* compat.c */
 int CompatRunCommand(void *, void *);
 void Compat_Run(Lst);