database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-08 07:21:33 +03:00
Code

Treat EOF like \n for line-counting purposes in ParseConfigFile,

Browse Source 
per bug #4752.  Fujii Masao
This commit is contained in:
Tom Lane 2009-04-09 14:21:02 +00:00
parent 03cd7571e8
commit b060c8787f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/utils/misc/guc-file.l
View File

@ -4,7 +4,7 @@
* *
* Copyright (c) 2000-2009, PostgreSQL Global Development Group * 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 */ /* now we'd like an end of line, or possibly EOF */
token = yylex(); token = yylex();
if (token != GUC_EOL && token != 0) if (token != GUC_EOL)
{
if (token != 0)
goto parse_error; goto parse_error;
/* treat EOF like \n for line numbering purposes, cf bug 4752 */
ConfigFileLineno++;
}
/* OK, process the option name and value */ /* OK, process the option name and value */
if (guc_name_compare(opt_name, "include") == 0) if (guc_name_compare(opt_name, "include") == 0)