From 4bdfa77c7f9f51045820c2f7583b0d102a648aca Mon Sep 17 00:00:00 2001
From: rillig <rillig@NetBSD.org>
Date: Fri, 4 Dec 2020 22:47:57 +0000
Subject: [PATCH] make(1): extract UnexportEnv from Var_UnExport

---
 usr.bin/make/var.c | 52 ++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 78084a96e652..20d0b36ab3e6 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.700 2020/12/04 22:35:40 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.701 2020/12/04 22:47:57 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
 #include "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.700 2020/12/04 22:35:40 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.701 2020/12/04 22:47:57 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -669,6 +669,32 @@ Var_Export(const char *str, Boolean isExport)
 
 extern char **environ;
 
+static void
+UnexportEnv(void)
+{
+	const char *cp;
+	char **newenv;
+
+	cp = getenv(MAKE_LEVEL_ENV);	/* we should preserve this */
+	if (environ == savedEnv) {
+		/* we have been here before! */
+		newenv = bmake_realloc(environ, 2 * sizeof(char *));
+	} else {
+		if (savedEnv != NULL) {
+			free(savedEnv);
+			savedEnv = NULL;
+		}
+		newenv = bmake_malloc(2 * sizeof(char *));
+	}
+
+	/* Note: we cannot safely free() the original environ. */
+	environ = savedEnv = newenv;
+	newenv[0] = NULL;
+	newenv[1] = NULL;
+	if (cp && *cp)
+		setenv(MAKE_LEVEL_ENV, cp, 1);
+}
+
 static void
 UnexportVar(const char *varname, Boolean unexport_env, Boolean adjust)
 {
@@ -715,27 +741,7 @@ Var_UnExport(const char *str)
     str += strlen("unexport");
     unexport_env = strncmp(str, "-env", 4) == 0;
     if (unexport_env) {
-	const char *cp;
-	char **newenv;
-
-	cp = getenv(MAKE_LEVEL_ENV);	/* we should preserve this */
-	if (environ == savedEnv) {
-	    /* we have been here before! */
-	    newenv = bmake_realloc(environ, 2 * sizeof(char *));
-	} else {
-	    if (savedEnv != NULL) {
-		free(savedEnv);
-		savedEnv = NULL;
-	    }
-	    newenv = bmake_malloc(2 * sizeof(char *));
-	}
-
-	/* Note: we cannot safely free() the original environ. */
-	environ = savedEnv = newenv;
-	newenv[0] = NULL;
-	newenv[1] = NULL;
-	if (cp && *cp)
-	    setenv(MAKE_LEVEL_ENV, cp, 1);
+    	UnexportEnv();
     } else {
 	cpp_skip_whitespace(&str);
 	if (str[0] != '\0')