Commit2618fcd

committed

Fix scanner name length trimming.

1 parent53916ca commit2618fcdCopy full SHA for 2618fcd

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.55 1998/08/2904:09:23 momjian Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.56 1998/08/2905:27:15 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -146,6 +146,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,`
`146`	`146`	`}`
`147`	`147`	`else`
`148`	`148`	`{`
	`149`	`+/* if we elog() out, the file stays open */`
`149`	`150`	`fp=AllocateFile(filename,"r");`
`150`	`151`	`if (fp==NULL)`
`151`	`152`	`elog(ERROR,"COPY command, running in backend with "`
`@@ -173,6 +174,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,`
`173`	`174`	`mode_toumask;/* Pre-existing umask value */`
`174`	`175`
`175`	`176`	`oumask=umask((mode_t)0);`
	`177`	`+/* if we elog() out, the file stays open */`
`176`	`178`	`fp=AllocateFile(filename,"w");`
`177`	`179`	`umask(oumask);`
`178`	`180`	`if (fp==NULL)`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.41 1998/08/2902:36:18 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.42 1998/08/2905:27:17 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -323,8 +323,8 @@ other.`
`323`	`323`	`if (isascii((unsignedchar)yytext[i]) &&`
`324`	`324`	`isupper(yytext[i]))`
`325`	`325`	`yytext[i] =tolower(yytext[i]);`
`326`		`-if (i > NAMEDATALEN)`
`327`		`-yytext[NAMEDATALEN] ='\0';`
	`326`	`+if (i >= NAMEDATALEN)`
	`327`	`+yytext[NAMEDATALEN-1] ='\0';`
`328`	`328`
`329`	`329`	`keyword =ScanKeywordLookup((char*)yytext);`
`330`	`330`	`if (keyword !=NULL) {`
`@@ -402,8 +402,8 @@ other.`
`402`	`402`	`if (isascii((unsignedchar)yytext[i]) &&`
`403`	`403`	`isupper(yytext[i]))`
`404`	`404`	`yytext[i] =tolower(yytext[i]);`
`405`		`-if (i > NAMEDATALEN)`
`406`		`-yytext[NAMEDATALEN] ='\0';`
	`405`	`+if (i >= NAMEDATALEN)`
	`406`	`+yytext[NAMEDATALEN-1] ='\0';`
`407`	`407`
`408`	`408`	`keyword =ScanKeywordLookup((char*)yytext);`
`409`	`409`	`if (keyword !=NULL) {`

Comments

(0)