 @@ -1,14 +1,14 @@
-/*      $NetBSD: meta.c,v 1.133 2020/10/30 20:30:44 rillig Exp $ */
+/*      $NetBSD: meta.c,v 1.134 2020/10/31 09:57:47 rillig Exp $ */
 /*
  * Implement 'meta' mode.
  * Adapted from John Birrell's patches to FreeBSD make.
  * --sjg
  */
 /*
  * Copyright (c) 2009-2016, Juniper Networks, Inc.
  * Portions Copyright (c) 2009, John Birrell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -316,27 +316,27 @@ meta_name(char *mname, size_t mnamelen,
 static int
 is_submake(void *cmdp, void *gnp)
+{
     static const char *p_make = NULL;
     static size_t p_len;
     char  *cmd = cmdp;
     GNode *gn = gnp;
     char *mp = NULL;
     char *cp;
     char *cp2;
     int rc = 0;				/* keep looking */
     if (!p_make) {
-        void *dontFreeIt;
+	void *dontFreeIt;
 	p_make = Var_Value(".MAKE", gn, &dontFreeIt);
 	p_len = strlen(p_make);
+    }
     cp = strchr(cmd, '$');
     if ((cp)) {
 	(void)Var_Subst(cmd, gn, VARE_WANTRES, &mp);
 	/* TODO: handle errors */
 	cmd = mp;
+    }
     cp2 = strstr(cmd, p_make);
     if ((cp2)) {
 	switch (cp2[p_len]) {
 	case '\0':
 @@ -1592,27 +1592,27 @@ meta_oodate(GNode *gn, Boolean oodate)
+		}
+	    }
 	    if (!cp) {
 		DEBUG1(META, "%s: required but missing\n", fname);
 		oodate = TRUE;
 		needOODATE = TRUE;	/* assume the worst */
+	    }
+	}
+    }
     Lst_Destroy(missingFiles, free);
     if (oodate && needOODATE) {
-        void *freeIt;
+	void *freeIt;
 	/*
 	 * Target uses .OODATE which is empty; or we wouldn't be here.
 	 * We have decided it is oodate, so .OODATE needs to be set.
 	 * All we can sanely do is set it to .ALLSRC.
 	 */
 	Var_Delete(OODATE, gn);
 	Var_Set(OODATE, Var_Value(ALLSRC, gn, &freeIt), gn);
 	bmake_free(freeIt);
+    }
  oodate_out:
     for (i--; i >= 0; i--) {
 	bmake_free(pa[i]);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.613 2020/10/31 09:27:19 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.614 2020/10/31 09:57:47 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.
 @@ -119,27 +119,27 @@
 #include    <sys/types.h>
 #include    <regex.h>
 #endif
 #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.613 2020/10/31 09:27:19 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.614 2020/10/31 09:57:47 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).
  */
 @@ -741,27 +741,27 @@ Var_UnExport(const char *str)
 	    VAR_DEBUG1("Unexporting \"%s\"\n", varname);
 	    if (!unexport_env && (v->flags & VAR_EXPORTED) &&
 		!(v->flags & VAR_REEXPORT))
 		unsetenv(v->name);
 	    v->flags &= ~(unsigned)(VAR_EXPORTED | VAR_REEXPORT);
 	    /*
 	     * If we are unexporting a list,
 	     * remove each one from .MAKE.EXPORTED.
 	     * If we are removing them all,
 	     * just delete .MAKE.EXPORTED below.
 	     */
 	    if (varnames == str) {
-	        /* XXX: v->name is injected without escaping it */
+		/* XXX: v->name is injected without escaping it */
 		char *expr = str_concat3("${" MAKE_EXPORTED ":N", v->name, "}");
 		char *cp;
 		(void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &cp);
 		/* TODO: handle errors */
 		Var_Set(MAKE_EXPORTED, cp, VAR_GLOBAL);
 		free(cp);
 		free(expr);
+	    }
+	}
 	Words_Free(words);
 	if (varnames != str) {
 	    Var_Delete(MAKE_EXPORTED, VAR_GLOBAL);
 	    free(varnames_freeIt);
 @@ -937,27 +937,27 @@ Var_Append(const char *name, const char
 		       "name expands to empty string - ignored\n",
 		       unexpanded_name, val);
 	    free(name_freeIt);
 	    return;
+	}
+    }
     v = VarFind(name, ctxt, ctxt == VAR_GLOBAL);
     if (v == NULL) {
 	/* XXX: name is expanded for the second time */
 	Var_Set(name, val, ctxt);
     } else if (v->flags & VAR_READONLY) {
-        VAR_DEBUG1("Ignoring append to %s since it is read-only\n", name);
+	VAR_DEBUG1("Ignoring append to %s since it is read-only\n", name);
     } else if (ctxt == VAR_CMDLINE || !(v->flags & VAR_FROM_CMD)) {
 	Buf_AddByte(&v->val, ' ');
 	Buf_AddStr(&v->val, val);
 	VAR_DEBUG3("%s:%s = %s\n",
 		   ctxt->name, name, Buf_GetAll(&v->val, NULL));
 	if (v->flags & VAR_FROM_ENV) {
 	    HashEntry *h;
 	    /*
 	     * If the original variable came from the environment, we
 	     * have to install it in the global context (we could place