[src/trunk]: src/usr.bin/make -V: try to expand the variable again if the val...

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

details:   https://anonhg.NetBSD.org/src/rev/0c6082acb33d
branches:  trunk
changeset: 354465:0c6082acb33d
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 17 15:49:56 2017 +0000

description:
-V: try to expand the variable again if the value contains a variable.

diffstat:

 usr.bin/make/main.c |  20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r d5a17fafe718 -r 0c6082acb33d usr.bin/make/main.c
--- a/usr.bin/make/main.c       Sat Jun 17 15:26:50 2017 +0000
+++ b/usr.bin/make/main.c       Sat Jun 17 15:49:56 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.266 2017/06/17 15:26:50 christos Exp $      */
+/*     $NetBSD: main.c,v 1.267 2017/06/17 15:49:56 christos Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.266 2017/06/17 15:26:50 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.267 2017/06/17 15:49:56 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.266 2017/06/17 15:26:50 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.267 2017/06/17 15:49:56 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -864,18 +864,26 @@
                char *p1;
                
                if (strchr(var, '$')) {
-                   value = p1 = Var_Subst(NULL, var, VAR_GLOBAL, VARF_WANTRES);
+                       value = p1 = Var_Subst(NULL, var, VAR_GLOBAL,
+                           VARF_WANTRES);
                } else if (expandVars) {
                        char tmp[128];
                        int len = snprintf(tmp, sizeof(tmp), "${%s}", var);
                                                        
                        if (len >= (int)sizeof(tmp))
                                Fatal("%s: variable name too big: %s",
-                                     progname, var);
+                                   progname, var);
                        value = p1 = Var_Subst(NULL, tmp, VAR_GLOBAL,
                            VARF_WANTRES);
                } else {
-                       value = Var_Value(var, VAR_GLOBAL, &p1);
+                       char *next = var;
+                       value = Var_Value(next, VAR_GLOBAL, &p1);
+                       if (*value == '$') {
+                               var = value;
+                               value = p1 = Var_Subst(NULL, var,
+                                   VAR_GLOBAL, VARF_WANTRES);
+                               free(var);
+                       }
                }
                printf("%s\n", value ? value : "");
                free(p1);