Sat Dec 12 20:00:52 2020 UTC ()

make(1): extract ExportVarsExpand from Var_Export


(rillig)

diff -r1.727 -r1.728 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2020/12/12 19:39:34	1.727
+++ src/usr.bin/make/var.c 2020/12/12 20:00:51	1.728

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.727 2020/12/12 19:39:34 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.728 2020/12/12 20:00:51 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.
 @@ -121,27 +121,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.727 2020/12/12 19:39:34 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.728 2020/12/12 20:00:51 rillig Exp $");
 /* A string that may need to be freed after use. */
 typedef struct FStr {
 	const char *str;
 	void *freeIt;
 } FStr;
 typedef enum VarFlags {
 	VAR_NONE	= 0,
 	/*
 	 * The variable's value is currently being used by Var_Parse or
 	 * Var_Subst.  This marker is used to avoid endless recursion.
 @@ -684,59 +684,66 @@ ExportVars(const char *varnames, Boolean
 		const char *varname = words.words[i];
 		if (!ExportVar(varname, flags))
 			continue;
 		if (var_exportedVars == VAR_EXPORTED_NONE)
 			var_exportedVars = VAR_EXPORTED_SOME;
 		if (isExport && (flags & VAR_EXPORT_PARENT))
 			Var_Append(MAKE_EXPORTED, varname, VAR_GLOBAL);
+	}
 	Words_Free(words);
+}
 static void
 ExportVarsExpand(const char *uvarnames, Boolean isExport, VarExportFlags flags)
+{
 	char *xvarnames;
 	(void)Var_Subst(uvarnames, VAR_GLOBAL, VARE_WANTRES, &xvarnames);
 	/* TODO: handle errors */
 	ExportVars(xvarnames, isExport, flags);
 	free(xvarnames);
+}
 /*
  * This is called when .export is seen or .MAKE.EXPORTED is modified.
+ *
  * It is also called when any exported variable is modified.
  * XXX: Is it really?
+ *
  * str has the format "[-env|-literal] varname...".
  */
 void
 Var_Export(const char *str, Boolean isExport)
+{
 	VarExportFlags flags;
 	char *varnames;
 	if (isExport && str[0] == '\0') {
 		var_exportedVars = VAR_EXPORTED_ALL; /* use with caution! */
 		return;
+	}
 	if (isExport && strncmp(str, "-env", 4) == 0) {
 		str += 4;
 		flags = VAR_EXPORT_NORMAL;
 	} else if (isExport && strncmp(str, "-literal", 8) == 0) {
 		str += 8;
 		flags = VAR_EXPORT_LITERAL;
 	} else {
 		flags = VAR_EXPORT_PARENT;
+	}
-	(void)Var_Subst(str, VAR_GLOBAL, VARE_WANTRES, &varnames);
+	ExportVarsExpand(str, isExport, flags);
 	/* TODO: handle errors */
 	ExportVars(varnames, isExport, flags);
 	free(varnames);
+}
 extern char **environ;
 static void
 ClearEnv(void)
+{
 	const char *cp;
 	char **newenv;
 	cp = getenv(MAKE_LEVEL_ENV);	/* we should preserve this */
 	if (environ == savedEnv) {