Module Name: src
Committed By: rillig
Date: Sun Jan 2 00:07:20 UTC 2022
Modified Files:
src/usr.bin/make: parse.c
src/usr.bin/make/unit-tests: directive-for-generating-endif.exp
Log Message:
make: fix line number in error message about open conditionals
To generate a diff of this commit:
cvs rdiff -u -r1.614 -r1.615 src/usr.bin/make/parse.c
cvs rdiff -u -r1.1 -r1.2 \
src/usr.bin/make/unit-tests/directive-for-generating-endif.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.614 src/usr.bin/make/parse.c:1.615
--- src/usr.bin/make/parse.c:1.614 Sat Jan 1 21:50:29 2022
+++ src/usr.bin/make/parse.c Sun Jan 2 00:07:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.614 2022/01/01 21:50:29 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.615 2022/01/02 00:07:20 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -110,7 +110,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.614 2022/01/01 21:50:29 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.615 2022/01/02 00:07:20 rillig Exp $");
/* types and constants */
@@ -2390,9 +2390,10 @@ ParseEOF(void)
curFile->buf_ptr = ptr;
curFile->buf_freeIt = ptr;
curFile->buf_end = ptr == NULL ? NULL : ptr + len;
- curFile->lineno = curFile->first_lineno;
- if (ptr != NULL)
+ if (ptr != NULL) {
+ curFile->lineno = curFile->first_lineno;
return true; /* Iterate again */
+ }
/*
* Ensure the makefile (or .for loop) didn't have mismatched
Index: src/usr.bin/make/unit-tests/directive-for-generating-endif.exp
diff -u src/usr.bin/make/unit-tests/directive-for-generating-endif.exp:1.1 src/usr.bin/make/unit-tests/directive-for-generating-endif.exp:1.2
--- src/usr.bin/make/unit-tests/directive-for-generating-endif.exp:1.1 Sat Aug 29 18:50:25 2020
+++ src/usr.bin/make/unit-tests/directive-for-generating-endif.exp Sun Jan 2 00:07:20 2022
@@ -1,7 +1,7 @@
make: "directive-for-generating-endif.mk" line 21: if-less endif
make: "directive-for-generating-endif.mk" line 21: if-less endif
make: "directive-for-generating-endif.mk" line 21: if-less endif
-make: "directive-for-generating-endif.mk" line 0: 3 open conditionals
+make: "directive-for-generating-endif.mk" line 26: 3 open conditionals
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
