[src/trunk]: src/usr.bin/make make(1): use constant string for Var_Subst

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

details:   https://anonhg.NetBSD.org/src/rev/30df4220db6a
branches:  trunk
changeset: 941694:30df4220db6a
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Oct 27 07:38:08 2020 +0000

description:
make(1): use constant string for Var_Subst

The times where Var_Subst needed a modifiable string are long gone.

diffstat:

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

diffs (34 lines):

diff -r 2b1a20f02a86 -r 30df4220db6a usr.bin/make/main.c
--- a/usr.bin/make/main.c       Tue Oct 27 07:34:36 2020 +0000
+++ b/usr.bin/make/main.c       Tue Oct 27 07:38:08 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.398 2020/10/27 07:34:36 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.399 2020/10/27 07:38:08 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -118,7 +118,7 @@
 #include "trace.h"
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.398 2020/10/27 07:34:36 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.399 2020/10/27 07:38:08 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
@@ -1479,14 +1479,8 @@
         */
        if (Var_Exists("VPATH", VAR_CMD)) {
                char *vpath, savec;
-               /*
-                * GCC stores string constants in read-only memory, but
-                * Var_Subst will want to write this thing, so store it
-                * in an array
-                */
-               static char VPATH[] = "${VPATH}";
 
-               (void)Var_Subst(VPATH, VAR_CMD, VARE_WANTRES, &vpath);
+               (void)Var_Subst("${VPATH}", VAR_CMD, VARE_WANTRES, &vpath);
                /* TODO: handle errors */
                path = vpath;
                do {