Fix line count error reporting in config files, like pg_hba.conf, per

bmomjian · bmomjian · commit 92d77c69e565 · 2002-12-11T22:17:11.000Z
report from Oliver Elphick.

Backpatch to 7.3.
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.90 2002/12/06 04:37:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.91 2002/12/11 22:17:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -93,6 +93,7 @@ void
 next_token(FILE *fp, char *buf, const int bufsz)
 {
 	int			c;
+	char	   *start_buf = buf;
 	char	   *end_buf = buf + (bufsz - 1);
 	bool		in_quote = false;
 	bool		was_quote = false;
@@ -115,7 +116,10 @@ next_token(FILE *fp, char *buf, const int bufsz)
 			{
 				while ((c = getc(fp)) != EOF && c != '\n')
 					;
-				continue;
+				/* If only comment, consume EOL too; return EOL */
+				if (c != EOF && buf == start_buf)
+					c = getc(fp);
+				break;
 			}
 
 			if (buf >= end_buf)

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.90 2002/12/06 04:37:02 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.91 2002/12/11 22:17:11 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -93,6 +93,7 @@ void`
`93`	`93`	`next_token(FILE fp, char buf, const int bufsz)`
`94`	`94`	`{`
`95`	`95`	`int c;`
	`96`	`+ char *start_buf = buf;`
`96`	`97`	`char *end_buf = buf + (bufsz - 1);`
`97`	`98`	`bool in_quote = false;`
`98`	`99`	`bool was_quote = false;`
`@@ -115,7 +116,10 @@ next_token(FILE fp, char buf, const int bufsz)`
`115`	`116`	`{`
`116`	`117`	`while ((c = getc(fp)) != EOF && c != '\n')`
`117`	`118`	`;`
`118`		`- continue;`
	`119`	`+ /* If only comment, consume EOL too; return EOL */`
	`120`	`+ if (c != EOF && buf == start_buf)`
	`121`	`+ c = getc(fp);`
	`122`	`+ break;`
`119`	`123`	`}`
`120`	`124`
`121`	`125`	`if (buf >= end_buf)`