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

report from Oliver Elphick.

Backpatch to 7.3.
This commit is contained in:
Bruce Momjian 2002-12-11 22:17:11 +00:00
parent d9d59ca65e
commit 92d77c69e5
1 changed files with 6 additions and 2 deletions

View File

@ -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)