Hi, all,

bmomjian · bmomjian · commit 635498623dbb · 1999-12-27T15:45:04.000Z
This is the patch for the final bit.  Sorry that it's separate.

Cheers...


MikeA
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.127 1999/12/27 15:42:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.128 1999/12/27 15:45:04 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -1700,7 +1700,7 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
 				int			tgnargs = atoi(PQgetvalue(res2, i2, i_tgnargs));
 				const char *tgargs = PQgetvalue(res2, i2, i_tgargs);
 				const char *p;
-				char		farg[MAX_QUERY_SIZE];
+				PQExpBuffer	farg = createPQExpBuffer();
 				int			findx;
 
 				for (findx = 0; findx < numFuncs; findx++)
@@ -1786,14 +1786,13 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
 							break;
 					}
 					p--;
-					for (s = tgargs, d = &(farg[0]); s < p;)
+					for (s = tgargs; s < p;)
 					{
 						if (*s == '\'')
-							*d++ = '\\';
-						*d++ = *s++;
+							appendPQExpBufferChar(farg, '\\');
+						appendPQExpBufferChar(farg, *s++);
 					}
-					*d = 0;
-					appendPQExpBuffer(query, "'%s'%s", farg,
+					appendPQExpBuffer(query, "'%s'%s", farg->data,
 							(findx < tgnargs - 1) ? ", " : "");
 					tgargs = p + 4;
 				}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`*`
`23`	`23`	`* IDENTIFICATION`
`24`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.127 1999/12/27 15:42:43 momjian Exp $`
	`24`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.128 1999/12/27 15:45:04 momjian Exp $`
`25`	`25`	`*`
`26`	`26`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`27`	`27`	`*`
`@@ -1700,7 +1700,7 @@ getTables(int numTables, FuncInfo finfo, int numFuncs)`
`1700`	`1700`	`int tgnargs = atoi(PQgetvalue(res2, i2, i_tgnargs));`
`1701`	`1701`	`const char *tgargs = PQgetvalue(res2, i2, i_tgargs);`
`1702`	`1702`	`const char *p;`
`1703`		`- char farg[MAX_QUERY_SIZE];`
	`1703`	`+ PQExpBuffer farg = createPQExpBuffer();`
`1704`	`1704`	`int findx;`
`1705`	`1705`
`1706`	`1706`	`for (findx = 0; findx < numFuncs; findx++)`
`@@ -1786,14 +1786,13 @@ getTables(int numTables, FuncInfo finfo, int numFuncs)`
`1786`	`1786`	`break;`
`1787`	`1787`	`}`
`1788`	`1788`	`p--;`
`1789`		`- for (s = tgargs, d = &(farg[0]); s < p;)`
	`1789`	`+ for (s = tgargs; s < p;)`
`1790`	`1790`	`{`
`1791`	`1791`	`if (*s == '\'')`
`1792`		`- *d++ = '\\';`
`1793`		`- d++ = s++;`
	`1792`	`+ appendPQExpBufferChar(farg, '\\');`
	`1793`	`+ appendPQExpBufferChar(farg, *s++);`
`1794`	`1794`	`}`
`1795`		`- *d = 0;`
`1796`		`- appendPQExpBuffer(query, "'%s'%s", farg,`
	`1795`	`+ appendPQExpBuffer(query, "'%s'%s", farg->data,`
`1797`	`1796`	`(findx < tgnargs - 1) ? ", " : "");`
`1798`	`1797`	`tgargs = p + 4;`
`1799`	`1798`	`}`