Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Change where variable substitution is done when processing traditional 

include statements so that if a variable expands to more than one file
  name make will "do the right thing".
- Add additional debug print

Reviewed by christos.
This commit is contained in:
ginsbach 2006-03-28 17:41:35 +00:00
parent 39cd836ee1
commit a8cd0ffcee
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/make/parse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: parse.c,v 1.110 2006/02/26 22:45:46 apb Exp $ */
/* $NetBSD: parse.c,v 1.111 2006/03/28 17:41:35 ginsbach Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: parse.c,v 1.110 2006/02/26 22:45:46 apb Exp $";
static char rcsid[] = "$NetBSD: parse.c,v 1.111 2006/03/28 17:41:35 ginsbach Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
__RCSID("$NetBSD: parse.c,v 1.110 2006/02/26 22:45:46 apb Exp $");
__RCSID("$NetBSD: parse.c,v 1.111 2006/03/28 17:41:35 ginsbach Exp $");
#endif
#endif /* not lint */
#endif
@ -2150,12 +2150,22 @@ ParseTraditionalInclude(char *line)
cfname = curFile.fname;
clineno = curFile.lineno;
if (DEBUG(PARSE)) {
printf("ParseTraditionalInclude: %s\n", file);
}
/*
* Skip over whitespace
*/
while (isspace((unsigned char)*file))
file++;
/*
* Substitute for any variables in the file name before trying to
* find the thing.
*/
file = Var_Subst(NULL, file, VAR_CMD, FALSE);
if (*file == '\0') {
Parse_Error(PARSE_FATAL,
"Filename missing from \"include\"");
@ -2174,12 +2184,6 @@ ParseTraditionalInclude(char *line)
else
done = 1;
/*
* Substitute for any variables in the file name before trying to
* find the thing.
*/
file = Var_Subst(NULL, file, VAR_CMD, FALSE);
/*
* Now we know the file's name, we attempt to find the durn thing.
* A return of NULL indicates the file don't exist.