From b060c8787f70ec560dadacddd800a20ca1b09a64 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 9 Apr 2009 14:21:02 +0000
Subject: [PATCH] Treat EOF like \n for line-counting purposes in
ParseConfigFile, per bug #4752. Fujii Masao
---
src/backend/utils/misc/guc-file.l | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index 9bc1106632d..ad52fb138a3 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -4,7 +4,7 @@
*
* Copyright (c) 2000-2009, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.58 2009/01/01 17:23:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.59 2009/04/09 14:21:02 tgl Exp $
*/
%{
@@ -446,8 +446,13 @@ ParseConfigFile(const char *config_file, const char *calling_file,
/* now we'd like an end of line, or possibly EOF */
token = yylex();
- if (token != GUC_EOL && token != 0)
- goto parse_error;
+ if (token != GUC_EOL)
+ {
+ if (token != 0)
+ goto parse_error;
+ /* treat EOF like \n for line numbering purposes, cf bug 4752 */
+ ConfigFileLineno++;
+ }
/* OK, process the option name and value */
if (guc_name_compare(opt_name, "include") == 0)
--
GitLab