Fix config file lexer to not barf if postgresql.conf ends with a comment

tglsfdc · tglsfdc · commit 40d091b81872 · 2005-07-08T18:41:40.000Z
that has no terminating newline.  Per report from maps.on at gmx.net.
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.30 2005/03/11 19:13:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.31 2005/07/08 18:41:40 tgl Exp $
  */
 
 %{
@@ -70,7 +70,7 @@ STRING          \'([^'\n]|\\.)*\'
 
 \n              ConfigFileLineno++; return GUC_EOL;
 [ \t\r]+        /* eat whitespace */
-#.*$            /* eat comment */
+#.*             /* eat comment (.* matches anything until newline) */
 
 {ID}            return GUC_ID;
 {QUALIFIED_ID}  return GUC_QUALIFIED_ID;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.30 2005/03/11 19:13:42 momjian Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.31 2005/07/08 18:41:40 tgl Exp $`
`8`	`8`	`*/`
`9`	`9`
`10`	`10`	`%{`
`@@ -70,7 +70,7 @@ STRING \'([^'\n]\|\\.)*\'`
`70`	`70`
`71`	`71`	`\n ConfigFileLineno++; return GUC_EOL;`
`72`	`72`	`[ \t\r]+ /* eat whitespace */`
`73`		`-#.$ / eat comment */`
	`73`	`+#.* /* eat comment (.* matches anything until newline) */`
`74`	`74`
`75`	`75`	`{ID} return GUC_ID;`
`76`	`76`	`{QUALIFIED_ID} return GUC_QUALIFIED_ID;`