Module Name: src
Committed By: christos
Date: Mon Jun 19 15:49:21 UTC 2017
Modified Files:
src/usr.bin/make: main.c
Log Message:
make the code look like to 1.266
To generate a diff of this commit:
cvs rdiff -u -r1.270 -r1.271 src/usr.bin/make/main.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.270 src/usr.bin/make/main.c:1.271
--- src/usr.bin/make/main.c:1.270 Mon Jun 19 10:59:06 2017
+++ src/usr.bin/make/main.c Mon Jun 19 11:49:21 2017
@@ -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 <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.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);
