|
4 | 4 | *
|
5 | 5 | * Copyright (c) 2000-2009, PostgreSQL Global Development Group
|
6 | 6 | *
|
7 |
| - * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.58 2009/01/01 17:23:53 momjian Exp $ |
| 7 | + * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.59 2009/04/09 14:21:02 tgl Exp $ |
8 | 8 | */
|
9 | 9 |
|
10 | 10 | %{
|
@@ -446,8 +446,13 @@ ParseConfigFile(const char *config_file, const char *calling_file,
|
446 | 446 |
|
447 | 447 | /* now we'd like an end of line, or possibly EOF */
|
448 | 448 | token =yylex();
|
449 |
| -if (token != GUC_EOL && token !=0) |
450 |
| -goto parse_error; |
| 449 | +if (token != GUC_EOL) |
| 450 | +{ |
| 451 | +if (token !=0) |
| 452 | +goto parse_error; |
| 453 | +/* treat EOF like \n for line numbering purposes, cf bug 4752 */ |
| 454 | +ConfigFileLineno++; |
| 455 | +} |
451 | 456 |
|
452 | 457 | /* OK, process the option name and value */
|
453 | 458 | if (guc_name_compare(opt_name,"include") ==0)
|
|