d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When Parse_Error is called after the top-level Makefile is closed we

Browse Source 
have no CURFILE anymore so we cannot print a file name or line number.

When ParseSkipLine() returns NULL (it does this when it has detected an
EOF in an .if block) try to pop the input stack and process the next line
This commit is contained in:
harti 2005-04-07 14:39:38 +00:00
parent 18ca5d4e9f
commit da722414da
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,7 +299,9 @@ Parse_Error(int type, const char *fmt, ...)
va_list ap;
va_start(ap, fmt);
fprintf(stderr, "\"%s\", line %d: ", CURFILE->fname, CURFILE->lineno);
if (CURFILE != NULL)
fprintf(stderr, "\"%s\", line %d: ",
CURFILE->fname, CURFILE->lineno);
if (type == PARSE_WARNING)
fprintf(stderr, "warning: ");
vfprintf(stderr, fmt, ap);
@ -2233,8 +2235,10 @@ ParseReadLine(void)
line = ParseSkipLine(1, 0);
} while (line &&
Cond_Eval(line, CURFILE->lineno) != COND_PARSE);
if (line == NULL)
break;
if (line == NULL) {
/* try to pop input stack */
goto again;
}
/*FALLTHRU*/
case COND_PARSE: