Module Name: src
Committed By: rillig
Date: Sat Dec 12 18:53:53 UTC 2020
Modified Files:
src/usr.bin/make: compat.c job.c main.c nonints.h var.c
Log Message:
make(1): rename Var_ExportVars to Var_ReexportVars
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/make/compat.c
cvs rdiff -u -r1.384 -r1.385 src/usr.bin/make/job.c
cvs rdiff -u -r1.494 -r1.495 src/usr.bin/make/main.c
cvs rdiff -u -r1.166 -r1.167 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.724 -r1.725 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/compat.c
diff -u src/usr.bin/make/compat.c:1.207 src/usr.bin/make/compat.c:1.208
--- src/usr.bin/make/compat.c:1.207 Sat Dec 12 00:33:25 2020
+++ src/usr.bin/make/compat.c Sat Dec 12 18:53:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.207 2020/12/12 00:33:25 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.208 2020/12/12 18:53:53 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -96,7 +96,7 @@
#include "pathnames.h"
/* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.207 2020/12/12 00:33:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.208 2020/12/12 18:53:53 rillig Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
@@ -348,7 +348,7 @@ Compat_RunCommand(const char *cmdp, GNod
Fatal("Could not fork");
}
if (cpid == 0) {
- Var_ExportVars();
+ Var_ReexportVars();
#ifdef USE_META
if (useMeta) {
meta_compat_child();
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.384 src/usr.bin/make/job.c:1.385
--- src/usr.bin/make/job.c:1.384 Sat Dec 12 13:13:34 2020
+++ src/usr.bin/make/job.c Sat Dec 12 18:53:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.384 2020/12/12 13:13:34 rillig Exp $ */
+/* $NetBSD: job.c,v 1.385 2020/12/12 18:53:53 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.384 2020/12/12 13:13:34 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.385 2020/12/12 18:53:53 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@@ -1459,7 +1459,7 @@ JobExec(Job *job, char **argv)
# endif
#endif
- Var_ExportVars();
+ Var_ReexportVars();
(void)execv(shellPath, argv);
execDie("exec", shellPath);
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.494 src/usr.bin/make/main.c:1.495
--- src/usr.bin/make/main.c:1.494 Fri Dec 11 23:00:59 2020
+++ src/usr.bin/make/main.c Sat Dec 12 18:53:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.494 2020/12/11 23:00:59 rillig Exp $ */
+/* $NetBSD: main.c,v 1.495 2020/12/12 18:53:53 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.494 2020/12/11 23:00:59 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.495 2020/12/12 18:53:53 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1799,7 +1799,7 @@ Cmd_Exec(const char *cmd, const char **e
(void)dup2(pipefds[1], 1);
(void)close(pipefds[1]);
- Var_ExportVars();
+ Var_ReexportVars();
(void)execv(shellPath, UNCONST(args));
_exit(1);
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.166 src/usr.bin/make/nonints.h:1.167
--- src/usr.bin/make/nonints.h:1.166 Sat Dec 12 00:05:05 2020
+++ src/usr.bin/make/nonints.h Sat Dec 12 18:53:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.166 2020/12/12 00:05:05 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.167 2020/12/12 18:53:53 rillig Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -323,7 +323,7 @@ VarParseResult Var_Parse(const char **,
VarParseResult Var_Subst(const char *, GNode *, VarEvalFlags, char **);
void Var_Stats(void);
void Var_Dump(GNode *);
-void Var_ExportVars(void);
+void Var_ReexportVars(void);
void Var_Export(const char *, Boolean);
void Var_UnExport(const char *);
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.724 src/usr.bin/make/var.c:1.725
--- src/usr.bin/make/var.c:1.724 Sat Dec 12 18:11:42 2020
+++ src/usr.bin/make/var.c Sat Dec 12 18:53:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.724 2020/12/12 18:11:42 rillig Exp $ */
+/* $NetBSD: var.c,v 1.725 2020/12/12 18:53:53 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -98,7 +98,8 @@
*
* Var_Delete Delete a variable.
*
- * Var_ExportVars Export some or even all variables to the environment
+ * Var_ReexportVars
+ * Export some or even all variables to the environment
* of this process and its child processes.
*
* Var_Export Export the variable to the environment of this process
@@ -130,7 +131,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.724 2020/12/12 18:11:42 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.725 2020/12/12 18:53:53 rillig Exp $");
/* A string that may need to be freed after use. */
typedef struct FStr {
@@ -627,7 +628,7 @@ ExportVar(const char *name, VarExportFla
* This gets called from our child processes.
*/
void
-Var_ExportVars(void)
+Var_ReexportVars(void)
{
char *val;
