[src/trunk]: src/usr.bin/make put back previous change

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b8569555778a
branches:  trunk
changeset: 787323:b8569555778a
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jun 10 20:24:58 2013 +0000

description:
put back previous change

diffstat:

 usr.bin/make/main.c |  16 +++++++---------
 usr.bin/make/var.c  |  20 +++++++-------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diffs (106 lines):

diff -r b9acbbf89101 -r b8569555778a usr.bin/make/main.c
--- a/usr.bin/make/main.c       Mon Jun 10 20:08:35 2013 +0000
+++ b/usr.bin/make/main.c       Mon Jun 10 20:24:58 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $ */
+/*     $NetBSD: main.c,v 1.213 2013/06/10 20:24:58 christos Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.213 2013/06/10 20:24:58 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.213 2013/06/10 20:24:58 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -937,13 +937,11 @@
         * Set some other useful macros
         */
        {
-           char tmp[64];
-           const char *ep;
+           char tmp[64], *ep;
 
-           if (!(ep = getenv(MAKE_LEVEL))) {
-               ep = "0";
-           }
-           Var_Set(MAKE_LEVEL, ep, VAR_GLOBAL, 0);
+           snprintf(tmp, sizeof(tmp), "%d",
+               (ep = getenv("MAKELEVEL")) ? 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);
            snprintf(tmp, sizeof(tmp), "%u", getppid());
diff -r b9acbbf89101 -r b8569555778a usr.bin/make/var.c
--- a/usr.bin/make/var.c        Mon Jun 10 20:08:35 2013 +0000
+++ b/usr.bin/make/var.c        Mon Jun 10 20:24:58 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg Exp $  */
+/*     $NetBSD: var.c,v 1.178 2013/06/10 20:24:58 christos Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.178 2013/06/10 20:24:58 christos 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.177 2013/06/10 19:07:09 joerg Exp $");
+__RCSID("$NetBSD: var.c,v 1.178 2013/06/10 20:24:58 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -778,7 +778,7 @@
     if (unexport_env) {
        char **newenv;
 
-       cp = getenv(MAKE_LEVEL);        /* we should preserve this */
+       cp = getenv("MAKELEVEL");       /* we should preserve this */
        if (environ == savedEnv) {
            /* we have been here before! */
            newenv = bmake_realloc(environ, 2 * sizeof(char *));
@@ -795,7 +795,7 @@
        environ = savedEnv = newenv;
        newenv[0] = NULL;
        newenv[1] = NULL;
-       setenv(MAKE_LEVEL, cp, 1);
+       setenv("MAKELEVEL", cp, 1);
     } else {
        for (; *str != '\n' && isspace((unsigned char) *str); str++)
            continue;
@@ -960,14 +960,8 @@
      * We allow the makefiles to update .MAKE.LEVEL and ensure
      * children see a correctly incremented value.
      */
-    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);
-    }
+    if (ctxt == VAR_GLOBAL && strcmp(MAKE_LEVEL, name) == 0)
+       setenv("MAKELEVEL", val, 1);
        
        
  out: