From 5c6ef1cc665e8a86813e54815dee8d5bd4eae3b2 Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 19 Jun 2017 15:49:21 +0000 Subject: [PATCH] make the code look like to 1.266 --- usr.bin/make/main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index cb3dd5031739..97fc3853f681 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.270 2017/06/19 14:59:06 christos Exp $ */ +/* $NetBSD: main.c,v 1.271 2017/06/19 15:49:21 christos Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.270 2017/06/19 14:59:06 christos Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.271 2017/06/19 15:49:21 christos Exp $"; #else #include #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.270 2017/06/19 14:59:06 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.271 2017/06/19 15:49:21 christos Exp $"); #endif #endif /* not lint */ #endif @@ -862,10 +862,6 @@ doPrintVars(void) char *var = (char *)Lst_Datum(ln); char *value; char *p1; - Boolean noExpand; - - if ((noExpand = (*var == '\\'))) - var++; if (strchr(var, '$')) { value = p1 = Var_Subst(NULL, var, VAR_GLOBAL, @@ -880,7 +876,7 @@ doPrintVars(void) value = p1 = Var_Subst(NULL, tmp, VAR_GLOBAL, VARF_WANTRES); } else { - value = p1 = Var_Value(var, VAR_GLOBAL, &p1); + value = Var_Value(var, VAR_GLOBAL, &p1); } printf("%s\n", value ? value : ""); free(p1);