mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix stopword and synonym files parsing bug in MSVC build, per report from 

Magnus Hagander. Also, now it ignores space symbol after stopwords.
This commit is contained in:
Teodor Sigaev 2007-03-26 12:25:35 +00:00
parent a6fbd2f12a
commit debb3aa8e9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/tsearch2/dict_syn.c
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/contrib/tsearch2/dict_syn.c,v 1.12 2007/02/08 11:10:26 petere Exp $ */
/* $PostgreSQL: pgsql/contrib/tsearch2/dict_syn.c,v 1.13 2007/03/26 12:25:35 teodor Exp $ */
/*
* ISpell interface
@ -40,7 +40,7 @@ findwrd(char *in, char **end)
while (*in && isspace((unsigned char) *in))
in++;
if (!in)
if (*in=='\0')
return NULL;
start = in;
@ -103,10 +103,7 @@ syn_init(PG_FUNCTION_ARGS)
while (fgets(buf, sizeof(buf), fin))
{
slen = strlen(buf) - 1;
buf[slen] = '\0';
if (*buf == '\0')
continue;
pg_verifymbstr(buf, strlen(buf), false);
if (cur == d->len)
{
d->len = (d->len) ? 2 * d->len : 16;

8
contrib/tsearch2/stopword.c
View File

@ -47,9 +47,13 @@ readstoplist(text *in, StopList * s)
while (fgets(buf, sizeof(buf), hin))
{
buf[strlen(buf) - 1] = '\0';
pbuf = buf;
while( !isspace( *pbuf ) )
pbuf++;
*pbuf = '\0';
pg_verifymbstr(buf, strlen(buf), false);
if (*buf == '\0')
if (*buf == '\0' || *buf=='\n' || *buf=='\r')
continue;
if (s->len >= reallen)