Module Name: src
Committed By: rillig
Date: Fri Dec 4 22:35:40 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): extract UnexportVar from Var_UnExport
To generate a diff of this commit:
cvs rdiff -u -r1.699 -r1.700 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.699 src/usr.bin/make/var.c:1.700
--- src/usr.bin/make/var.c:1.699 Sat Nov 28 16:36:19 2020
+++ src/usr.bin/make/var.c Fri Dec 4 22:35:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.699 2020/11/28 16:36:19 rillig Exp $ */
+/* $NetBSD: var.c,v 1.700 2020/12/04 22:35:40 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.699 2020/11/28 16:36:19 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.700 2020/12/04 22:35:40 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,34 @@ Var_Export(const char *str, Boolean isEx
extern char **environ;
+static void
+UnexportVar(const char *varname, Boolean unexport_env, Boolean adjust)
+{
+ Var *v = VarFind(varname, VAR_GLOBAL, FALSE);
+ if (v == NULL) {
+ VAR_DEBUG1("Not unexporting \"%s\" (not found)\n", varname);
+ return;
+ }
+
+ 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 (adjust) {
+ /* 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);
+ }
+}
+
/*
* This is called when .unexport[-env] is seen.
*
@@ -723,40 +751,12 @@ Var_UnExport(const char *str)
}
{
- Var *v;
size_t i;
Words words = Str_Words(varnames, FALSE);
for (i = 0; i < words.len; i++) {
const char *varname = words.words[i];
- v = VarFind(varname, VAR_GLOBAL, FALSE);
- if (v == NULL) {
- VAR_DEBUG1("Not unexporting \"%s\" (not found)\n", varname);
- continue;
- }
-
- 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 */
- 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);
- }
+ UnexportVar(varname, unexport_env, varnames == str);
}
Words_Free(words);
if (varnames != str) {
