From: Michael Meskes <meskes@usa.net>

+ Mon Aug 31 09:40:04 CEST 1998
+
+       - Minor patch to Makefile
+       - Put pgc.l in sync with scan.l
+
+ Tue Sep  1 11:31:05 CEST 1998
+
+       - Fixed another bug in preproc.y
+
+ Thu Sep  3 12:21:16 CEST 1998
+
+       - Sync preproc.y with gram.y
+
+ Mon Sep 14 09:21:02 CEST 1998
+
+       - Sync preproc.y with gram.y yet again
+
+ Thu Sep 17 08:55:33 CEST 1998
+
+       - Synced preproc.y and gram.y one more time
+
+ Thu Sep 17 19:23:24 CEST 1998
+
+       - Added missing ´;´ in preproc.y
+       - Set version to 2.4.2

src/interfaces/ecpg/ChangeLog

@@ -311,3 +311,29 @@ Fri Aug 28 15:36:58 CEST 1998
 	- Removed one line of code that AIX complains about since it was not
 	  needed anyway
 	- Set library version to 2.6.1
+
+Mon Aug 31 09:40:04 CEST 1998
+
+	- Minor patch to Makefile
+	- Put pgc.l in sync with scan.l
+
+Tue Sep  1 11:31:05 CEST 1998
+
+	- Fixed another bug in preproc.y
+
+Thu Sep  3 12:21:16 CEST 1998
+
+	- Sync preproc.y with gram.y
+
+Mon Sep 14 09:21:02 CEST 1998
+
+	- Sync preproc.y with gram.y yet again
+
+Thu Sep 17 08:55:33 CEST 1998
+
+	- Synced preproc.y and gram.y one more time
+
+Thu Sep 17 19:23:24 CEST 1998
+
+	- Added missing ´;´ in preproc.y
+	- Set version to 2.4.2

src/interfaces/ecpg/preproc/Makefile

@@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global
 
 MAJOR_VERSION=2
 MINOR_VERSION=4
-PATCHLEVEL=1
+PATCHLEVEL=2
 
 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
 	-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \

src/interfaces/ecpg/preproc/keywords.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.4 1998/09/01 03:28:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.5 1998/09/21 05:52:53 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -150,6 +150,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"notnull", NOTNULL},
 	{"null", NULL_P},
 	{"numeric", NUMERIC},
+	{"of", OF},
 	{"oids", OIDS},
 	{"on", ON},
 	{"operator", OPERATOR},

src/interfaces/ecpg/preproc/pgc.l

@@ -340,6 +340,9 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 						if (isascii((unsigned char)yytext[i]) && isupper(yytext[i]))
 							yytext[i] = tolower(yytext[i]);
 
+					if (i >= NAMEDATALEN)
+						yytext[NAMEDATALEN-1] = '\0';
+
 					keyword = ScanKeywordLookup((char*)yytext);
 					if (keyword != NULL) {
 						return keyword->value;
@@ -478,6 +481,9 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 						if (isascii((unsigned char)yytext[i]) && isupper(yytext[i]))
 							yytext[i] = tolower(yytext[i]);
 
+					if (i >= NAMEDATALEN)
+						yytext[NAMEDATALEN-1] = '\0';
+
 					keyword = ScanKeywordLookup((char*)yytext);
 					if (keyword != NULL) {
 						return keyword->value;