Module Name: src
Committed By: sjg
Date: Tue Jun 18 20:06:09 UTC 2013
Modified Files:
src/usr.bin/make: main.c make.h var.c
Log Message:
Use a #define for the variable name we put in environment to pass .MAKE.LEVEL
in case we don't want to use gmake's MAKELEVEL in a different way.
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/usr.bin/make/main.c
cvs rdiff -u -r1.90 -r1.91 src/usr.bin/make/make.h
cvs rdiff -u -r1.178 -r1.179 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/main.c
diff -u src/usr.bin/make/main.c:1.213 src/usr.bin/make/main.c:1.214
--- src/usr.bin/make/main.c:1.213 Mon Jun 10 20:24:58 2013
+++ src/usr.bin/make/main.c Tue Jun 18 20:06:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.213 2013/06/10 20:24:58 christos Exp $ */
+/* $NetBSD: main.c,v 1.214 2013/06/18 20:06:09 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.213 2013/06/10 20:24:58 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.214 2013/06/18 20:06:09 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.213 2013/06/10 20:24:58 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.214 2013/06/18 20:06:09 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -940,7 +940,7 @@ main(int argc, char **argv)
char tmp[64], *ep;
snprintf(tmp, sizeof(tmp), "%d",
- (ep = getenv("MAKELEVEL")) ? atoi(ep) + 1 : 0);
+ (ep = getenv(MAKE_LEVEL_ENV)) ? atoi(ep) + 1 : 0);
Var_Set(MAKE_LEVEL, tmp, VAR_GLOBAL, 0);
snprintf(tmp, sizeof(tmp), "%u", myPid);
Var_Set(".MAKE.PID", tmp, VAR_GLOBAL, 0);
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.90 src/usr.bin/make/make.h:1.91
--- src/usr.bin/make/make.h:1.90 Mon Feb 25 01:57:14 2013
+++ src/usr.bin/make/make.h Tue Jun 18 20:06:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.90 2013/02/25 01:57:14 dholland Exp $ */
+/* $NetBSD: make.h,v 1.91 2013/06/18 20:06:09 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -426,6 +426,9 @@ extern pid_t myPid;
#define MAKEFILE_PREFERENCE ".MAKE.MAKEFILE_PREFERENCE"
#define MAKE_DEPENDFILE ".MAKE.DEPENDFILE" /* .depend */
#define MAKE_MODE ".MAKE.MODE"
+#ifndef MAKE_LEVEL_ENV
+# define MAKE_LEVEL_ENV "MAKELEVEL"
+#endif
/*
* debug control:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.178 src/usr.bin/make/var.c:1.179
--- src/usr.bin/make/var.c:1.178 Mon Jun 10 20:24:58 2013
+++ src/usr.bin/make/var.c Tue Jun 18 20:06:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.178 2013/06/10 20:24:58 christos Exp $ */
+/* $NetBSD: var.c,v 1.179 2013/06/18 20:06:09 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.178 2013/06/10 20:24:58 christos Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.179 2013/06/18 20:06:09 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.178 2013/06/10 20:24:58 christos Exp $");
+__RCSID("$NetBSD: var.c,v 1.179 2013/06/18 20:06:09 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -778,7 +778,7 @@ Var_UnExport(char *str)
if (unexport_env) {
char **newenv;
- cp = getenv("MAKELEVEL"); /* we should preserve this */
+ cp = getenv(MAKE_LEVEL_ENV); /* we should preserve this */
if (environ == savedEnv) {
/* we have been here before! */
newenv = bmake_realloc(environ, 2 * sizeof(char *));
@@ -795,7 +795,7 @@ Var_UnExport(char *str)
environ = savedEnv = newenv;
newenv[0] = NULL;
newenv[1] = NULL;
- setenv("MAKELEVEL", cp, 1);
+ setenv(MAKE_LEVEL_ENV, cp, 1);
} else {
for (; *str != '\n' && isspace((unsigned char) *str); str++)
continue;
@@ -961,7 +961,7 @@ Var_Set(const char *name, const char *va
* children see a correctly incremented value.
*/
if (ctxt == VAR_GLOBAL && strcmp(MAKE_LEVEL, name) == 0)
- setenv("MAKELEVEL", val, 1);
+ setenv(MAKE_LEVEL_ENV, val, 1);
out:
