[src/trunk]: src/usr.bin/make a variable that starts with \\ is not expanded.

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

details:   https://anonhg.NetBSD.org/src/rev/0b3782ae8481
branches:  trunk
changeset: 824772:0b3782ae8481
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 17 19:59:28 2017 +0000

description:
a variable that starts with \\ is not expanded.

diffstat:

 usr.bin/make/main.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r e067127d4837 -r 0b3782ae8481 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Sat Jun 17 17:12:03 2017 +0000
+++ b/usr.bin/make/main.c       Sat Jun 17 19:59:28 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.268 2017/06/17 16:34:07 christos Exp $      */
+/*     $NetBSD: main.c,v 1.269 2017/06/17 19:59:28 christos Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.268 2017/06/17 16:34:07 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.269 2017/06/17 19:59:28 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.268 2017/06/17 16:34:07 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.269 2017/06/17 19:59:28 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -862,6 +862,10 @@
                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,
@@ -877,7 +881,7 @@
                            VARF_WANTRES);
                } else {
                        value = Var_Value(var, VAR_GLOBAL, &p1);
-                       if (*value == '$') {
+                       if (!noExpand && value && *value == '$') {
                                value = Var_Subst(NULL, value,
                                    VAR_GLOBAL, VARF_WANTRES);
                                free(p1);