 @@ -1,14 +1,14 @@
-/*	$NetBSD: arch.c,v 1.151 2020/10/31 18:41:07 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.152 2020/11/02 18:24:42 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.151 2020/10/31 18:41:07 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.152 2020/11/02 18:24:42 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;
 @@ -195,64 +195,67 @@ ArchFree(void *ap)
+ *
  * Results:
  *	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.
  *-----------------------------------------------------------------------
  */
 Boolean
 Arch_ParseArchive(char **linePtr, 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;
     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;
 	    /* XXX: is expanded twice: once here and once below */
 	    (void)Var_Parse(&nested_p, ctxt, VARE_UNDEFERR|VARE_WANTRES,
 			    &result, &result_freeIt);
 	    /* TODO: handle errors */
 	    isError = result == var_Error;
 	    free(result_freeIt);
 	    if (isError)
 		return FALSE;
 	    subLibName = TRUE;
 	    cp += nested_p - cp;
 	} else
 	    cp++;
+    }
     *cp++ = '\0';
     if (subLibName) {
 	(void)Var_Subst(libName, ctxt, VARE_UNDEFERR|VARE_WANTRES, &libName);
 	/* TODO: handle errors */
 	libName_freeIt = libName;
+    }
     for (;;) {
 	/*
 	 * First skip to the start of the member's name, mark that
 	 * place and skip to the end of it (either white-space or
 	 * a close paren).
 	 */
 	Boolean doSubst = FALSE; /* TRUE if need to substitute in memName */
 	pp_skip_whitespace(&cp);
 @@ -378,32 +381,27 @@ Arch_ParseArchive(char **linePtr, GNodeL
 	     * the OP_ARCHV bit before we place it on the end of the
 	     * provided list.
 	     */
 	    gn->type |= OP_ARCHV;
 	    Lst_Append(nodeLst, gn);
+	}
 	if (doSubst) {
 	    free(memName);
+	}
 	*cp = saveChar;
+    }
-    /*
+    free(libName_freeIt);
      * If substituted libName, free it now, since we need it no longer.
      */
     if (subLibName) {
 	free(libName);
     cp++;			/* skip the ')' */
     /* We promised that linePtr would be set up at the next non-space. */
     pp_skip_whitespace(&cp);
     *linePtr = 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