[src/trunk]: src/usr.bin/make Make chdir_verify_path() do variable expansion ...

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

details:   https://anonhg.NetBSD.org/src/rev/31467e745cab
branches:  trunk
changeset: 481868:31467e745cab
user:      sjg <sjg%NetBSD.org@localhost>
date:      Tue Feb 08 12:43:25 2000 +0000

description:
Make chdir_verify_path() do variable expansion on path in case
someone wants to do freaky stuff with $MAKEOBJDIR.
Initialize the Var system and set .CURDIR, MACHINE and MACHINE_ARCH
before chdir_verify_path() is called.

diffstat:

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

diffs (72 lines):

diff -r 1163877356cb -r 31467e745cab usr.bin/make/main.c
--- a/usr.bin/make/main.c       Tue Feb 08 12:38:16 2000 +0000
+++ b/usr.bin/make/main.c       Tue Feb 08 12:43:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.50 1999/09/15 10:47:37 mycroft Exp $        */
+/*     $NetBSD: main.c,v 1.51 2000/02/08 12:43:25 sjg Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,7 +39,7 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: main.c,v 1.50 1999/09/15 10:47:37 mycroft Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.51 2000/02/08 12:43:25 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -51,7 +51,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.50 1999/09/15 10:47:37 mycroft Exp $");
+__RCSID("$NetBSD: main.c,v 1.51 2000/02/08 12:43:25 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -419,6 +419,9 @@
 {
        struct stat sb;
 
+       if (strchr(path, '$') != 0) {
+               path = Var_Subst(NULL, path, VAR_GLOBAL, 0);
+       }
        if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) {
                if (chdir(path)) {
                        (void)fprintf(stderr, "make warning: %s: %s.\n",
@@ -547,6 +550,15 @@
        }
 
        /*
+        * Just in case MAKEOBJDIR wants us to do something tricky.
+        */
+       Var_Init();             /* Initialize the lists of variables for
+                                * parsing arguments */
+       Var_Set(".CURDIR", curdir, VAR_GLOBAL);
+       Var_Set("MACHINE", machine, VAR_GLOBAL);
+       Var_Set("MACHINE_ARCH", machine_arch, VAR_GLOBAL);
+
+       /*
         * If the MAKEOBJDIR (or by default, the _PATH_OBJDIR) directory
         * exists, change into it and build there.  (If a .${MACHINE} suffix
         * exists, use that directory instead).
@@ -624,9 +636,6 @@
        Dir_Init(curdir != objdir ? curdir : NULL);
        Parse_Init();           /* Need to initialize the paths of #include
                                 * directories */
-       Var_Init();             /* As well as the lists of variables for
-                                * parsing arguments */
-       Var_Set(".CURDIR", curdir, VAR_GLOBAL);
        Var_Set(".OBJDIR", objdir, VAR_GLOBAL);
 
        /*
@@ -639,8 +648,6 @@
        Var_Set(".MAKE", argv[0], VAR_GLOBAL);
        Var_Set(MAKEFLAGS, "", VAR_GLOBAL);
        Var_Set("MFLAGS", "", VAR_GLOBAL);
-       Var_Set("MACHINE", machine, VAR_GLOBAL);
-       Var_Set("MACHINE_ARCH", machine_arch, VAR_GLOBAL);
 
        /*
         * First snag any flags out of the MAKE environment variable.