 @@ -1,14 +1,14 @@
-/*	$NetBSD: arch.c,v 1.152 2020/11/02 18:24:42 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.153 2020/11/02 19:07:09 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.
 @@ -120,27 +120,27 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <ar.h>
 #include <utime.h>
 #include "make.h"
 #include "dir.h"
 #include "config.h"
 /*	"@(#)arch.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: arch.c,v 1.152 2020/11/02 18:24:42 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.153 2020/11/02 19:07:09 rillig Exp $");
 #ifdef TARGET_MACHINE
 #undef MAKE_MACHINE
 #define MAKE_MACHINE TARGET_MACHINE
 #endif
 #ifdef TARGET_MACHINE_ARCH
 #undef MAKE_MACHINE_ARCH
 #define MAKE_MACHINE_ARCH TARGET_MACHINE_ARCH
 #endif
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
 @@ -179,49 +179,49 @@ ArchFree(void *ap)
     free(a);
+}
 #endif
 /*-
  *-----------------------------------------------------------------------
  * 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
+ *	pp		Pointer to start of specification, updated
  *	nodeLst		Lst on which to place the nodes
  *	ctxt		Context in which to expand variables
+ *
  * Results:
- *	TRUE if it was a valid specification. The linePtr is updated
+ *	TRUE if it was a valid specification. The pp is updated
  *	to point to the first non-space after the archive spec. The
  *	nodes for the members are placed on the given list.
  *-----------------------------------------------------------------------
  */
 Boolean
-Arch_ParseArchive(char **linePtr, GNodeList *nodeLst, GNode *ctxt)
+Arch_ParseArchive(char **pp, GNodeList *nodeLst, GNode *ctxt)
+{
     char *cp;			/* Pointer into line */
     GNode *gn;			/* New node */
     char *libName;		/* Library-part of specification */
     char *libName_freeIt = NULL;
     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;
+    libName = *pp;
     subLibName = FALSE;
     for (cp = libName; *cp != '(' && *cp != '\0';) {
 	if (*cp == '$') {
 	    /*
 	     * Variable spec, so call the Var module to parse the puppy
 	     * so we can safely advance beyond it...
 	     */
 	    const char *nested_p = cp;
 	    void *result_freeIt;
 	    const char *result;
 	    Boolean isError;
 @@ -384,29 +384,29 @@ Arch_ParseArchive(char **linePtr, GNodeL
 	    gn->type |= OP_ARCHV;
 	    Lst_Append(nodeLst, gn);
+	}
 	if (doSubst) {
 	    free(memName);
+	}
 	*cp = saveChar;
+    }
     free(libName_freeIt);
     cp++;			/* skip the ')' */
-    /* We promised that linePtr would be set up at the next non-space. */
+    /* We promised that pp would be set up at the next non-space. */
     pp_skip_whitespace(&cp);
-    *linePtr = cp;
+    *pp = cp;
     return TRUE;
+}
 /* Locate a member of an archive, given the path of the archive and the path
  * of the desired member.
+ *
  * Input:
  *	archive		Path to the archive
  *	member		Name of member; only its basename is used.
  *	hash		TRUE if archive should be hashed if not already so.
+ *
  * Results:
  *	The ar_hdr for the member.
 @@ -423,28 +423,28 @@ ArchStatMember(const char *archive, cons
     struct ar_hdr arh;		/* archive-member header for reading archive */
     char memName[MAXPATHLEN + 1];
 				/* Current member name while hashing. */
     /*
      * Because of space constraints and similar things, files are archived
      * using their basename, not the entire path.
      */
     const char *lastSlash = strrchr(member, '/');
     if (lastSlash != NULL)
 	member = lastSlash + 1;
     for (ln = archives->first; ln != NULL; ln = ln->next) {
-	const Arch *archPtr = ln->datum;
+	const Arch *a = ln->datum;
-	if (strcmp(archPtr->name, archive) == 0)
+	if (strcmp(a->name, archive) == 0)
 	    break;
+    }
     if (ln != NULL) {
 	struct ar_hdr *hdr;
 	ar = ln->datum;
 	hdr = HashTable_FindValue(&ar->members, member);
 	if (hdr != NULL)
 	    return hdr;
+	{
 	    /* Try truncated name */
 @@ -684,37 +684,37 @@ ArchSVR4Entry(Arch *ar, char *name, size
 /*-
  *-----------------------------------------------------------------------
  * ArchFindMember --
  *	Locate a member of an archive, given the path of the archive and
  *	the path of the desired member. If the archive is to be modified,
  *	the mode should be "r+", if not, it should be "r".
  *	The passed struct ar_hdr structure is filled in.
+ *
  * Input:
  *	archive		Path to the archive
  *	member		Name of member. If it is a path, only the last
  *			component is used.
- *	arhPtr		Pointer to header structure to be filled in
+ *	out_arh		Archive header to be filled in
  *	mode		The mode for opening the stream
+ *
  * Results:
  *	An FILE *, opened for reading and writing, positioned at the
  *	start of the member's struct ar_hdr, or NULL if the member was
  *	nonexistent. The current struct ar_hdr for member.
  *-----------------------------------------------------------------------
  */
 static FILE *
-ArchFindMember(const char *archive, const char *member, struct ar_hdr *arhPtr,
+ArchFindMember(const char *archive, const char *member, struct ar_hdr *out_arh,
 	       const char *mode)
+{
     FILE *arch;			/* Stream to archive */
     int size;			/* Size of archive member */
     char magic[SARMAG];
     size_t len, tlen;
     const char *lastSlash;
     arch = fopen(archive, mode);
     if (arch == NULL)
 	return NULL;
     /*
 @@ -726,75 +726,76 @@ ArchFindMember(const char *archive, cons
 	fclose(arch);
 	return NULL;
+    }
     /*
      * Because of space constraints and similar things, files are archived
      * using their basename, not the entire path.
      */
     lastSlash = strrchr(member, '/');
     if (lastSlash != NULL)
 	member = lastSlash + 1;
     len = tlen = strlen(member);
-    if (len > sizeof(arhPtr->ar_name)) {
+    if (len > sizeof(out_arh->ar_name)) {
-	tlen = sizeof(arhPtr->ar_name);
+	tlen = sizeof(out_arh->ar_name);
+    }
-    while (fread((char *)arhPtr, sizeof(struct ar_hdr), 1, arch) == 1) {
+    while (fread((char *)out_arh, sizeof(struct ar_hdr), 1, arch) == 1) {
-	if (strncmp(arhPtr->ar_fmag, ARFMAG, sizeof(arhPtr->ar_fmag)) != 0) {
+	if (strncmp(out_arh->ar_fmag, ARFMAG, sizeof(out_arh->ar_fmag)) != 0) {
 	    /*
 	     * The header is bogus, so the archive is bad
 	     * and there's no way we can recover...
 	     */
 	    fclose(arch);
 	    return NULL;
+	}
-	if (strncmp(member, arhPtr->ar_name, tlen) == 0) {
+	if (strncmp(member, out_arh->ar_name, tlen) == 0) {
 	    /*
 	     * If the member's name doesn't take up the entire 'name' field,
 	     * we have to be careful of matching prefixes. Names are space-
 	     * padded to the right, so if the character in 'name' at the end
 	     * of the matched string is anything but a space, this isn't the
 	     * member we sought.
 	     */
-	    if (tlen != sizeof arhPtr->ar_name && arhPtr->ar_name[tlen] != ' ')
+	    if (tlen != sizeof out_arh->ar_name &&
 		out_arh->ar_name[tlen] != ' ')
 		goto skip;
 	    /*
 	     * To make life easier, we reposition the file at the start
 	     * of the header we just read before we return the stream.
 	     * In a more general situation, it might be better to leave
 	     * the file at the actual member, rather than its header, but
 	     * not here...
 	     */
 	    if (fseek(arch, -(long)sizeof(struct ar_hdr), SEEK_CUR) != 0) {
 		fclose(arch);
 		return NULL;
+	    }
 	    return arch;
+	}
 #ifdef AR_EFMT1
 	/*
 	 * BSD 4.4 extended AR format: #1/<namelen>, with name as the
 	 * first <namelen> bytes of the file
 	 */
-	if (strncmp(arhPtr->ar_name, AR_EFMT1, sizeof(AR_EFMT1) - 1) == 0 &&
+	if (strncmp(out_arh->ar_name, AR_EFMT1, sizeof(AR_EFMT1) - 1) == 0 &&
-	    ch_isdigit(arhPtr->ar_name[sizeof(AR_EFMT1) - 1]))
+	    ch_isdigit(out_arh->ar_name[sizeof(AR_EFMT1) - 1]))
+	{
-	    int elen = atoi(&arhPtr->ar_name[sizeof(AR_EFMT1) - 1]);
+	    int elen = atoi(&out_arh->ar_name[sizeof(AR_EFMT1) - 1]);
 	    char ename[MAXPATHLEN + 1];
 	    if ((unsigned int)elen > MAXPATHLEN) {
 		fclose(arch);
 		return NULL;
+	    }
 	    if (fread(ename, (size_t)elen, 1, arch) != 1) {
 		fclose(arch);
 		return NULL;
+	    }
 	    ename[elen] = '\0';
 	    if (DEBUG(ARCH) || DEBUG(MAKE)) {
 		debug_printf("ArchFind: Extended format entry for %s\n", ename);
 @@ -813,28 +814,28 @@ ArchFindMember(const char *archive, cons
 		return NULL;
+	    }
+	}
 #endif
 skip:
 	/*
 	 * This isn't the member we're after, so we need to advance the
 	 * stream's pointer to the start of the next header. Files are
 	 * padded with newlines to an even-byte boundary, so we need to
 	 * extract the size of the file from the 'size' field of the
 	 * header and round it up during the seek.
 	 */
-	arhPtr->ar_size[sizeof(arhPtr->ar_size) - 1] = '\0';
+	out_arh->ar_size[sizeof(out_arh->ar_size) - 1] = '\0';
-	size = (int)strtol(arhPtr->ar_size, NULL, 10);
+	size = (int)strtol(out_arh->ar_size, NULL, 10);
 	if (fseek(arch, (size + 1) & ~1, SEEK_CUR) != 0) {
 	    fclose(arch);
 	    return NULL;
+	}
+    }
     /*
      * We've looked everywhere, but the member is not to be found. Close the
      * archive and return NULL -- an error.
      */
     fclose(arch);
     return NULL;
+}
 @@ -902,32 +903,32 @@ Arch_TouchLib(GNode *gn)
     (void)gn;
 #endif
+}
 /* Return the modification time of a member of an archive. The mtime field
  * of the given node is filled in with the value returned by the function.
+ *
  * Input:
  *	gn		Node describing archive member
  */
 time_t
 Arch_MTime(GNode *gn)
+{
-    struct ar_hdr *arhPtr;	/* Header of desired member */
+    struct ar_hdr *arh;		/* Header of desired member */
     time_t modTime;		/* Modification time as an integer */
-    arhPtr = ArchStatMember(GNode_VarArchive(gn), GNode_VarMember(gn), TRUE);
+    arh = ArchStatMember(GNode_VarArchive(gn), GNode_VarMember(gn), TRUE);
-    if (arhPtr != NULL) {
+    if (arh != NULL) {
-	modTime = (time_t)strtol(arhPtr->ar_date, NULL, 10);
+	modTime = (time_t)strtol(arh->ar_date, NULL, 10);
     } else {
 	modTime = 0;
+    }
     gn->mtime = modTime;
     return modTime;
+}
 /* Given a non-existent archive member's node, get its modification time from
  * its archived form, if it exists. gn->mtime is filled in as well. */
 time_t
 Arch_MemMTime(GNode *gn)
+{
 @@ -1032,33 +1033,33 @@ Arch_LibOODate(GNode *gn)
     Boolean oodate;
     if (gn->type & OP_PHONY) {
 	oodate = TRUE;
     } else if (!GNode_IsTarget(gn) && Lst_IsEmpty(gn->children)) {
 	oodate = FALSE;
     } else if ((!Lst_IsEmpty(gn->children) && gn->youngestChild == NULL) ||
 	       (gn->mtime > now) ||
 	       (gn->youngestChild != NULL &&
 		gn->mtime < gn->youngestChild->mtime)) {
 	oodate = TRUE;
     } else {
 #ifdef RANLIBMAG
-	struct ar_hdr *arhPtr;	/* Header for __.SYMDEF */
+	struct ar_hdr *arh;	/* Header for __.SYMDEF */
 	int modTimeTOC;		/* The table-of-contents's mod time */
-	arhPtr = ArchStatMember(gn->path, RANLIBMAG, FALSE);
+	arh = ArchStatMember(gn->path, RANLIBMAG, FALSE);
-	if (arhPtr != NULL) {
+	if (arh != NULL) {
-	    modTimeTOC = (int)strtol(arhPtr->ar_date, NULL, 10);
+	    modTimeTOC = (int)strtol(arh->ar_date, NULL, 10);
 	    if (DEBUG(ARCH) || DEBUG(MAKE)) {
 		debug_printf("%s modified %s...", RANLIBMAG, Targ_FmtTime(modTimeTOC));
+	    }
 	    oodate = (gn->youngestChild == NULL || gn->youngestChild->mtime > modTimeTOC);
 	} else {
 	    /*
 	     * A library w/o a table of contents is out-of-date
 	     */
 	    if (DEBUG(ARCH) || DEBUG(MAKE)) {
 		debug_printf("No t.o.c....");
+	    }
 	    oodate = TRUE;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cond.c,v 1.173 2020/10/30 20:30:44 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.174 2020/11/02 19:07:09 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 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.
 @@ -83,27 +83,27 @@
  *	Cond_restore_depth
  *			Save and restore the nesting of the conditions, at
  *			the start and end of including another makefile, to
  *			ensure that in each makefile the conditional
  *			directives are well-balanced.
  */
 #include <errno.h>
 #include "make.h"
 #include "dir.h"
 /*	"@(#)cond.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: cond.c,v 1.173 2020/10/30 20:30:44 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.174 2020/11/02 19:07:09 rillig Exp $");
 /*
  * The parsing of conditional expressions is based on this grammar:
  *	E -> F || E
  *	E -> F
  *	F -> T && F
  *	F -> T
  *	T -> defined(variable)
  *	T -> make(target)
  *	T -> exists(file)
  *	T -> empty(varspec)
  *	T -> target(name)
  *	T -> commands(name)
 @@ -664,41 +664,41 @@ CondParser_Comparison(CondParser *par, B
 	t = TOK_FALSE;
 	goto done;
+    }
     t = EvalCompare(lhs, lhsQuoted, op, rhs, rhsQuoted);
 done:
     free(lhsFree);
     free(rhsFree);
     return t;
+}
 static size_t
-ParseEmptyArg(const char **linePtr, Boolean doEval,
+ParseEmptyArg(const char **pp, Boolean doEval,
-	      const char *func MAKE_ATTR_UNUSED, char **argPtr)
+	      const char *func MAKE_ATTR_UNUSED, char **out_arg)
+{
     void *val_freeIt;
     const char *val;
     size_t magic_res;
     /* We do all the work here and return the result as the length */
-    *argPtr = NULL;
+    *out_arg = NULL;
-    (*linePtr)--;		/* Make (*linePtr)[1] point to the '('. */
+    (*pp)--;			/* Make (*pp)[1] point to the '('. */
-    (void)Var_Parse(linePtr, VAR_CMDLINE, doEval ? VARE_WANTRES : 0,
+    (void)Var_Parse(pp, VAR_CMDLINE, doEval ? VARE_WANTRES : 0,
 		    &val, &val_freeIt);
     /* TODO: handle errors */
-    /* If successful, *linePtr points beyond the closing ')' now. */
+    /* If successful, *pp points beyond the closing ')' now. */
     if (val == var_Error) {
 	free(val_freeIt);
 	return (size_t)-1;
+    }
     /* A variable is empty when it just contains spaces... 4/15/92, christos */
     cpp_skip_whitespace(&val);
     /*
      * For consistency with the other functions we can't generate the
      * true/false here.
      */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.647 2020/11/02 18:15:12 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.648 2020/11/02 19:07:09 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.
 @@ -120,27 +120,27 @@
 #include <regex.h>
 #endif
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.647 2020/11/02 18:15:12 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.648 2020/11/02 19:07:09 rillig Exp $");
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
 #define VAR_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(VAR, fmt, arg1, arg2, arg3)
 #define VAR_DEBUG4(fmt, arg1, arg2, arg3, arg4) DEBUG4(VAR, fmt, arg1, arg2, arg3, arg4)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
 @@ -3613,27 +3613,27 @@ ParseVarnameShort(
 /* Parse a long variable name enclosed in braces or parentheses such as $(VAR)
  * or ${VAR}, up to the closing brace or parenthesis, or in the case of
  * ${VAR:Modifiers}, up to the ':' that starts the modifiers.
  * Return whether to continue parsing. */
 static Boolean
 ParseVarnameLong(
 	const char **pp,
 	char startc,
 	GNode *ctxt,
 	VarEvalFlags eflags,
 	VarParseResult *out_FALSE_res,
 	const char **out_FALSE_val,
-	void **out_FALSE_freePtr,
+	void **out_FALSE_freeIt,
 	char *out_TRUE_endc,
 	const char **out_TRUE_p,
 	Var **out_TRUE_v,
 	Boolean *out_TRUE_haveModifier,
 	const char **out_TRUE_extraModifiers,
 	Boolean *out_TRUE_dynamic,
 	VarExprFlags *out_TRUE_exprFlags
 ) {
     size_t namelen;
     char *varname;
     Var *v;
     Boolean haveModifier;
 @@ -3689,27 +3689,27 @@ ParseVarnameLong(
     if (v == NULL) {
 	/* Defer expansion of dynamic variables if they appear in non-local
 	 * context since they are not defined there. */
 	dynamic = VarnameIsDynamic(varname, namelen) &&
 		  (ctxt == VAR_CMDLINE || ctxt == VAR_GLOBAL);
 	if (!haveModifier) {
 	    p++;		/* skip endc */
 	    *pp = p;
 	    if (dynamic) {
 		char *pstr = bmake_strsedup(start, p);
 		free(varname);
 		*out_FALSE_res = VPR_OK;
-		*out_FALSE_freePtr = pstr;
+		*out_FALSE_freeIt = pstr;
 		*out_FALSE_val = pstr;
 		return FALSE;
+	    }
 	    if ((eflags & VARE_UNDEFERR) && (eflags & VARE_WANTRES) &&
 		DEBUG(LINT))
+	    {
 		Parse_Error(PARSE_FATAL, "Variable \"%s\" is undefined",
 			    varname);
 		free(varname);
 		*out_FALSE_res = VPR_UNDEF_MSG;
 		*out_FALSE_val = var_Error;
 		return FALSE;

 @@ -1,36 +1,36 @@
-# $NetBSD: include-sub.mk,v 1.6 2020/10/25 12:08:53 rillig Exp $
+# $NetBSD: include-sub.mk,v 1.7 2020/11/02 19:07:09 rillig Exp $
 .if ${.INCLUDEDFROMFILE} == "include-main.mk"
 .  info sub-before-ok
 .else
 .  warning sub-before-fail(${.INCLUDEDFROMFILE})
 .endif
 # As of 2020-09-05, the .for loop is implemented as "including a file"
 # with a custom buffer.  Therefore this loop has side effects on these
 # variables.
 .for i in once
 .  if ${.INCLUDEDFROMFILE} == "include-main.mk"
 .    info sub-before-for-ok
 .  else
 .    warning sub-before-for-fail(${.INCLUDEDFROMFILE})
 .  endif
 .endfor
 # To see the variable 'includes' in action:
+#
 # Breakpoints:
-#	Parse_File		at "PtrVector_Push(&includes, curFile)"
+#	Parse_File		at "Vector_Push(&includes)"
 #	ParseMessage		at entry
 # Watches:
 #	((const IFile *[10])(*includes.items))
 #	*curFile
 .for i in deeply
 .  for i in nested
 .    for i in include
 .include "include-subsub.mk"
 .    endfor
 .  endfor
 .endfor