Sun Dec 27 18:22:28 2020 UTC ()

make(1): skip variable expansion in ParseDependencyTargetWord

The goal of the code is just to skip over the variable expression, thus
there is no need to evaluate it.


(rillig)

diff -r1.518 -r1.519 src/usr.bin/make/parse.c

--- src/usr.bin/make/parse.c 2020/12/27 11:47:04	1.518
+++ src/usr.bin/make/parse.c 2020/12/27 18:22:28	1.519

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.518 2020/12/27 11:47:04 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.519 2020/12/27 18:22:28 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -107,27 +107,27 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.518 2020/12/27 11:47:04 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.519 2020/12/27 18:22:28 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
 	char *fname;		/* name of file (relative? absolute?) */
 	Boolean fromForLoop;	/* simulated .include by the .for loop */
 	int lineno;		/* current line number in file */
 	int first_lineno;	/* line number of start of text */
 	unsigned int cond_depth; /* 'if' nesting when file opened */
 	Boolean depending;	/* state of doing_depend on EOF */
 @@ -1074,29 +1074,28 @@ ParseDependencyTargetWord(const char **p
 		if (*cp == '$') {
 			/*
 			 * Must be a dynamic source (would have been expanded
 			 * otherwise), so call the Var module to parse the
 			 * puppy so we can safely advance beyond it.
+			 *
 			 * There should be no errors in this, as they would
 			 * have been discovered in the initial Var_Subst and
 			 * we wouldn't be here.
 			 */
 			const char *nested_p = cp;
 			FStr nested_val;
-			/* XXX: Why VARE_WANTRES? */
+			(void)Var_Parse(&nested_p, VAR_CMDLINE, VARE_NONE,
-			(void)Var_Parse(&nested_p, VAR_CMDLINE,
+			    &nested_val);
 			    VARE_WANTRES | VARE_UNDEFERR, &nested_val);
 			/* TODO: handle errors */
 			FStr_Done(&nested_val);
 			cp += nested_p - cp;
 		} else
 			cp++;
+	}
 	*pp = cp;
+}
 /* Handle special targets like .PATH, .DEFAULT, .BEGIN, .ORDER. */
 static void
 ParseDoDependencyTargetSpecial(ParseSpecial *inout_specType,