Improve error reporting for problems in text search configuration files

by installing an error context subroutine that will provide the file name
and line number for all errors detected while reading a config file.
Some of the reader routines were already doing that in an ad-hoc way for
errors detected directly in the reader, but it didn't help for problems
detected in subroutines, such as encoding violations.

Back-patch to 8.3 because 8.3 is where people will be trying to debug
configuration files.

Author: tglsfdc

contrib/dict_xsyn/dict_xsyn.c

@@ -6,7 +6,7 @@
  * Copyright (c) 2007-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.4 2008/01/01 20:31:21 tgl Exp $
+ *	  $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.5 2008/06/18 20:55:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include "commands/defrem.h"
 #include "fmgr.h"
-#include "storage/fd.h"
 #include "tsearch/ts_locale.h"
 #include "tsearch/ts_utils.h"
 
@@ -75,17 +74,17 @@ static void
 read_dictionary(DictSyn *d, char *filename)
 {
 	char	   *real_filename = get_tsearch_config_filename(filename, "rules");
-	FILE	   *fin;
+	tsearch_readline_state trst;
 	char	   *line;
 	int			cur = 0;
 
-	if ((fin = AllocateFile(real_filename, "r")) == NULL)
+	if (!tsearch_readline_begin(&trst, real_filename))
 		ereport(ERROR,
 				(errcode(ERRCODE_CONFIG_FILE_ERROR),
 				 errmsg("could not open synonym file \"%s\": %m",
 						real_filename)));
 
-	while ((line = t_readline(fin)) != NULL)
+	while ((line = tsearch_readline(&trst)) != NULL)
 	{
 		char	   *value;
 		char	   *key;
@@ -119,7 +118,7 @@ read_dictionary(DictSyn *d, char *filename)
 		cur++;
 	}
 
-	FreeFile(fin);
+	tsearch_readline_end(&trst);
 
 	d->len = cur;
 	if (cur > 1)

src/backend/tsearch/dict_synonym.c

@@ -7,14 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tsearch/dict_synonym.c,v 1.8 2008/03/10 03:01:28 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/dict_synonym.c,v 1.9 2008/06/18 20:55:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "commands/defrem.h"
-#include "storage/fd.h"
 #include "tsearch/ts_locale.h"
 #include "tsearch/ts_public.h"
 #include "tsearch/ts_utils.h"
@@ -79,7 +78,7 @@ dsynonym_init(PG_FUNCTION_ARGS)
 	ListCell   *l;
 	char	   *filename = NULL;
 	bool		case_sensitive = false;
-	FILE	   *fin;
+	tsearch_readline_state trst;
 	char	   *starti,
 			   *starto,
 			   *end = NULL;
@@ -108,15 +107,15 @@ dsynonym_init(PG_FUNCTION_ARGS)
 
 	filename = get_tsearch_config_filename(filename, "syn");
 
-	if ((fin = AllocateFile(filename, "r")) == NULL)
+	if (!tsearch_readline_begin(&trst, filename))
 		ereport(ERROR,
 				(errcode(ERRCODE_CONFIG_FILE_ERROR),
 				 errmsg("could not open synonym file \"%s\": %m",
 						filename)));
 
 	d = (DictSyn *) palloc0(sizeof(DictSyn));
 
-	while ((line = t_readline(fin)) != NULL)
+	while ((line = tsearch_readline(&trst)) != NULL)
 	{
 		starti = findwrd(line, &end);
 		if (!starti)
@@ -175,7 +174,7 @@ dsynonym_init(PG_FUNCTION_ARGS)
 		pfree(line);
 	}
 
-	FreeFile(fin);
+	tsearch_readline_end(&trst);
 
 	d->len = cur;
 	qsort(d->syn, d->len, sizeof(Syn), compareSyn);

src/backend/tsearch/dict_thesaurus.c

@@ -7,15 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.11 2008/01/01 19:45:52 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.12 2008/06/18 20:55:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "catalog/namespace.h"
 #include "commands/defrem.h"
-#include "storage/fd.h"
 #include "tsearch/ts_cache.h"
 #include "tsearch/ts_locale.h"
 #include "tsearch/ts_public.h"
@@ -169,30 +168,26 @@ addWrd(DictThesaurus *d, char *b, char *e, uint16 idsubst, uint16 nwrd, uint16 p
 static void
 thesaurusRead(char *filename, DictThesaurus *d)
 {
-	FILE	   *fh;
-	int			lineno = 0;
+	tsearch_readline_state trst;
 	uint16		idsubst = 0;
 	bool		useasis = false;
 	char	   *line;
 
 	filename = get_tsearch_config_filename(filename, "ths");
-	fh = AllocateFile(filename, "r");
-	if (!fh)
+	if (!tsearch_readline_begin(&trst, filename))
 		ereport(ERROR,
 				(errcode(ERRCODE_CONFIG_FILE_ERROR),
 				 errmsg("could not open thesaurus file \"%s\": %m",
 						filename)));
 
-	while ((line = t_readline(fh)) != NULL)
+	while ((line = tsearch_readline(&trst)) != NULL)
 	{
 		char	   *ptr;
 		int			state = TR_WAITLEX;
 		char	   *beginwrd = NULL;
 		uint16		posinsubst = 0;
 		uint16		nwrd = 0;
 
-		lineno++;
-
 		ptr = line;
 
 		/* is it a comment? */
@@ -213,13 +208,9 @@ thesaurusRead(char *filename, DictThesaurus *d)
 				if (t_iseq(ptr, ':'))
 				{
 					if (posinsubst == 0)
-					{
-						FreeFile(fh);
 						ereport(ERROR,
 								(errcode(ERRCODE_CONFIG_FILE_ERROR),
-								 errmsg("unexpected delimiter at line %d of thesaurus file \"%s\"",
-										lineno, filename)));
-					}
+								 errmsg("unexpected delimiter")));
 					state = TR_WAITSUBS;
 				}
 				else if (!t_isspace(ptr))
@@ -269,8 +260,7 @@ thesaurusRead(char *filename, DictThesaurus *d)
 					if (ptr == beginwrd)
 						ereport(ERROR,
 								(errcode(ERRCODE_CONFIG_FILE_ERROR),
-								 errmsg("unexpected end of line or lexeme at line %d of thesaurus file \"%s\"",
-										lineno, filename)));
+								 errmsg("unexpected end of line or lexeme")));
 					addWrd(d, beginwrd, ptr, idsubst, nwrd++, posinsubst, useasis);
 					state = TR_WAITSUBS;
 				}
@@ -286,28 +276,23 @@ thesaurusRead(char *filename, DictThesaurus *d)
 			if (ptr == beginwrd)
 				ereport(ERROR,
 						(errcode(ERRCODE_CONFIG_FILE_ERROR),
-						 errmsg("unexpected end of line or lexeme at line %d of thesaurus file \"%s\"",
-								lineno, filename)));
+						 errmsg("unexpected end of line or lexeme")));
 			addWrd(d, beginwrd, ptr, idsubst, nwrd++, posinsubst, useasis);
 		}
 
 		idsubst++;
 
 		if (!(nwrd && posinsubst))
-		{
-			FreeFile(fh);
 			ereport(ERROR,
 					(errcode(ERRCODE_CONFIG_FILE_ERROR),
-					 errmsg("unexpected end of line at line %d of thesaurus file \"%s\"",
-							lineno, filename)));
-		}
+					 errmsg("unexpected end of line")));
 
 		pfree(line);
 	}
 
 	d->nsubst = idsubst;
 
-	FreeFile(fh);
+	tsearch_readline_end(&trst);
 }
 
 static TheLexeme *