postgres.git / summary / log / commit / refs

commit    92d77c69e56579fb55126cd82e92eddf93774dad
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Wed Dec 11 22:17:11 2002 +0000

    Fix line count error reporting in config files, like pg_hba.conf, per
    report from Oliver Elphick.
    
    Backpatch to 7.3.


 src/backend/libpq/hba.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index c468f2cb340..46fa3084514 100644
--- 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)


[parent: d9d59ca65ef4]