CVS commit: src/usr.bin/make

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Mon Jun 19 14:59:06 UTC 2017

Modified Files:
        src/usr.bin/make: main.c

Log Message:
Remove previous variable expansion code; sjg had already added the code to
do it. Note that the manual page already documents this behavior and does
not need to change:

        -dV -V VAR:     prints the raw variable
        -V VAR:         prints the expanded variable


To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 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.269 src/usr.bin/make/main.c:1.270
--- src/usr.bin/make/main.c:1.269	Sat Jun 17 15:59:28 2017
+++ src/usr.bin/make/main.c	Mon Jun 19 10:59:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.269 2017/06/17 19:59:28 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.270 2017/06/19 14:59:06 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.269 2017/06/17 19:59:28 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.270 2017/06/19 14:59:06 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.269 2017/06/17 19:59:28 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.270 2017/06/19 14:59:06 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -855,7 +855,7 @@ doPrintVars(void)
 	if (debugVflag)
 		expandVars = FALSE;
 	else
-		expandVars = getBoolean(".MAKE.EXPAND_VARIABLES", FALSE);
+		expandVars = getBoolean(".MAKE.EXPAND_VARIABLES", TRUE);
 
 	for (ln = Lst_First(variables); ln != NULL;
 	    ln = Lst_Succ(ln)) {
@@ -880,13 +880,7 @@ doPrintVars(void)
 			value = p1 = Var_Subst(NULL, tmp, VAR_GLOBAL,
 			    VARF_WANTRES);
 		} else {
-			value = Var_Value(var, VAR_GLOBAL, &p1);
-			if (!noExpand && value && *value == '$') {
-				value = Var_Subst(NULL, value,
-				    VAR_GLOBAL, VARF_WANTRES);
-				free(p1);
-				p1 = value;
-			}
+			value = p1 = Var_Value(var, VAR_GLOBAL, &p1);
 		}
 		printf("%s\n", value ? value : "");
 		free(p1);