diff options
| author | rillig <rillig@NetBSD.org> | 2020-12-12 18:53:53 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2020-12-12 18:53:53 +0000 |
| commit | 933b9c8ea2ff70a7a71b0168d0f2e80d43871d31 (patch) | |
| tree | 25cd57fff0f3e0f0ff69a768835dc0418d222d7a /usr.bin/make | |
| parent | 771a503559a6f8881f535df6f3d4067f075e9e7c (diff) | |
make(1): rename Var_ExportVars to Var_ReexportVars
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/compat.c | 6 | ||||
| -rw-r--r-- | usr.bin/make/job.c | 6 | ||||
| -rw-r--r-- | usr.bin/make/main.c | 6 | ||||
| -rw-r--r-- | usr.bin/make/nonints.h | 4 | ||||
| -rw-r--r-- | usr.bin/make/var.c | 9 |
5 files changed, 16 insertions, 15 deletions
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c index 6d62d325da4..3af8fac1aac 100644 --- a/usr.bin/make/compat.c +++ b/usr.bin/make/compat.c @@ -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, GNode *gn) Fatal("Could not fork"); } if (cpid == 0) { - Var_ExportVars(); + Var_ReexportVars(); #ifdef USE_META if (useMeta) { meta_compat_child(); diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index 28e31f32c13..86b97e04a44 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -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); diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index 47925625bcb..1b2ba7ac891 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -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 **errfmt) (void)dup2(pipefds[1], 1); (void)close(pipefds[1]); - Var_ExportVars(); + Var_ReexportVars(); (void)execv(shellPath, UNCONST(args)); _exit(1); diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h index 1fd86089aca..679b2037ee1 100644 --- a/usr.bin/make/nonints.h +++ b/usr.bin/make/nonints.h @@ -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 **, GNode *, VarEvalFlags, 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 *); diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c index 01bf3cf2c9c..00d33defca8 100644 --- a/usr.bin/make/var.c +++ b/usr.bin/make/var.c @@ -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, VarExportFlags flags) * This gets called from our child processes. */ void -Var_ExportVars(void) +Var_ReexportVars(void) { char *val; |
