diff options
| author | joerg <joerg@NetBSD.org> | 2013-06-10 19:07:09 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2013-06-10 19:07:09 +0000 |
| commit | 85bfea0f2f50d8d1ee489b68b8eb4e327454a7ba (patch) | |
| tree | 35218a570c1baa2d93452da8c61bcbe09afa6fff /usr.bin/make | |
| parent | d5213d5c74a936f74ed36d6b4b49077f400c4bf0 (diff) | |
Revert last, it doesn't even build.
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/main.c | 16 | ||||
| -rw-r--r-- | usr.bin/make/var.c | 20 |
2 files changed, 22 insertions, 14 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index cdbbc94b9b3..5f46111bc2c 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.211 2013/06/10 16:46:19 christos Exp $ */ +/* $NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.211 2013/06/10 16:46:19 christos Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\ #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.211 2013/06/10 16:46:19 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -937,11 +937,13 @@ main(int argc, char **argv) * Set some other useful macros */ { - char tmp[64], *ep; + char tmp[64]; + const char *ep; - snprintf(tmp, sizeof(tmp), "%d", - (ep = getenv("MAKELEVEL")) ? atoi(ep) + 1 : 0); - Var_Set(MAKELEVEL, tmp, VAR_GLOBAL, 0); + if (!(ep = getenv(MAKE_LEVEL))) { + ep = "0"; + } + Var_Set(MAKE_LEVEL, ep, VAR_GLOBAL, 0); snprintf(tmp, sizeof(tmp), "%u", myPid); Var_Set(".MAKE.PID", tmp, VAR_GLOBAL, 0); snprintf(tmp, sizeof(tmp), "%u", getppid()); diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c index 054e0fea706..b1ab398acab 100644 --- a/usr.bin/make/var.c +++ b/usr.bin/make/var.c @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.176 2013/06/10 16:46:19 christos Exp $ */ +/* $NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: var.c,v 1.176 2013/06/10 16:46:19 christos Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg 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.176 2013/06/10 16:46:19 christos Exp $"); +__RCSID("$NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg 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); /* 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, cp, 1); } else { for (; *str != '\n' && isspace((unsigned char) *str); str++) continue; @@ -960,8 +960,14 @@ Var_Set(const char *name, const char *val, GNode *ctxt, int flags) * We allow the makefiles to update .MAKE.LEVEL and ensure * children see a correctly incremented value. */ - if (ctxt == VAR_GLOBAL && strcmp(MAKELEVEL, name) == 0) - setenv("MAKELEVEL", val, 1); + if (ctxt == VAR_GLOBAL && strcmp(MAKE_LEVEL, name) == 0) { + char tmp[64]; + int level; + + level = atoi(val); + snprintf(tmp, sizeof(tmp), "%u", level + 1); + setenv(MAKE_LEVEL, tmp, 1); + } out: |
