Fix ancient oversight in psql's \d pattern processing code: when seeing two

tglsfdc · tglsfdc · commit 06290309622e · 2006-10-07T22:21:38.000Z
quote chars inside quote marks, should emit one quote *and stay in inquotes
mode*.  No doubt the lack of reports of this have something to do with the
poor documentation of the feature ...
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.145 2006/10/04 00:30:05 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.146 2006/10/07 22:21:38 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -1869,34 +1869,37 @@ processNamePattern(PQExpBuffer buf, const char *pattern,
 
 	while (*cp)
 	{
-		if (*cp == '"')
+		char	ch = *cp;
+
+		if (ch == '"')
 		{
 			if (inquotes && cp[1] == '"')
 			{
-				/* emit one quote */
+				/* emit one quote, stay in inquotes mode */
 				appendPQExpBufferChar(&namebuf, '"');
 				cp++;
 			}
-			inquotes = !inquotes;
+			else
+				inquotes = !inquotes;
 			cp++;
 		}
-		else if (!inquotes && isupper((unsigned char) *cp))
+		else if (!inquotes && isupper((unsigned char) ch))
 		{
 			appendPQExpBufferChar(&namebuf,
-								  pg_tolower((unsigned char) *cp));
+								  pg_tolower((unsigned char) ch));
 			cp++;
 		}
-		else if (!inquotes && *cp == '*')
+		else if (!inquotes && ch == '*')
 		{
 			appendPQExpBuffer(&namebuf, ".*");
 			cp++;
 		}
-		else if (!inquotes && *cp == '?')
+		else if (!inquotes && ch == '?')
 		{
 			appendPQExpBufferChar(&namebuf, '.');
 			cp++;
 		}
-		else if (!inquotes && *cp == '.')
+		else if (!inquotes && ch == '.')
 		{
 			/* Found schema/name separator, move current pattern to schema */
 			resetPQExpBuffer(&schemabuf);
@@ -1917,7 +1920,7 @@ processNamePattern(PQExpBuffer buf, const char *pattern,
 			 * that are more powerful than shell-style patterns.
 			 */
 			if ((inquotes || force_escape) &&
-				strchr("|*+?()[]{}.^$\\", *cp))
+				strchr("|*+?()[]{}.^$\\", ch))
 				appendPQExpBufferChar(&namebuf, '\\');
 			i = PQmblen(cp, pset.encoding);
 			while (i-- && *cp)

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2006, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.145 2006/10/04 00:30:05 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.146 2006/10/07 22:21:38 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "describe.h"`
`@@ -1869,34 +1869,37 @@ processNamePattern(PQExpBuffer buf, const char *pattern,`
`1869`	`1869`
`1870`	`1870`	`while (*cp)`
`1871`	`1871`	`{`
`1872`		`- if (*cp == '"')`
	`1872`	`+ char ch = *cp;`
	`1873`	`+`
	`1874`	`+ if (ch == '"')`
`1873`	`1875`	`{`
`1874`	`1876`	`if (inquotes && cp[1] == '"')`
`1875`	`1877`	`{`
`1876`		`- /* emit one quote */`
	`1878`	`+ /* emit one quote, stay in inquotes mode */`
`1877`	`1879`	`appendPQExpBufferChar(&namebuf, '"');`
`1878`	`1880`	`cp++;`
`1879`	`1881`	`}`
`1880`		`- inquotes = !inquotes;`
	`1882`	`+ else`
	`1883`	`+ inquotes = !inquotes;`
`1881`	`1884`	`cp++;`
`1882`	`1885`	`}`
`1883`		`- else if (!inquotes && isupper((unsigned char) *cp))`
	`1886`	`+ else if (!inquotes && isupper((unsigned char) ch))`
`1884`	`1887`	`{`
`1885`	`1888`	`appendPQExpBufferChar(&namebuf,`
`1886`		`- pg_tolower((unsigned char) *cp));`
	`1889`	`+ pg_tolower((unsigned char) ch));`
`1887`	`1890`	`cp++;`
`1888`	`1891`	`}`
`1889`		`- else if (!inquotes && cp == '')`
	`1892`	`+ else if (!inquotes && ch == '*')`
`1890`	`1893`	`{`
`1891`	`1894`	`appendPQExpBuffer(&namebuf, ".*");`
`1892`	`1895`	`cp++;`
`1893`	`1896`	`}`
`1894`		`- else if (!inquotes && *cp == '?')`
	`1897`	`+ else if (!inquotes && ch == '?')`
`1895`	`1898`	`{`
`1896`	`1899`	`appendPQExpBufferChar(&namebuf, '.');`
`1897`	`1900`	`cp++;`
`1898`	`1901`	`}`
`1899`		`- else if (!inquotes && *cp == '.')`
	`1902`	`+ else if (!inquotes && ch == '.')`
`1900`	`1903`	`{`
`1901`	`1904`	`/* Found schema/name separator, move current pattern to schema */`
`1902`	`1905`	`resetPQExpBuffer(&schemabuf);`
`@@ -1917,7 +1920,7 @@ processNamePattern(PQExpBuffer buf, const char *pattern,`
`1917`	`1920`	`* that are more powerful than shell-style patterns.`
`1918`	`1921`	`*/`
`1919`	`1922`	`if ((inquotes \|\| force_escape) &&`
`1920`		`- strchr("\|+?()[]{}.^$\\", cp))`
	`1923`	`+ strchr("\|*+?()[]{}.^$\\", ch))`
`1921`	`1924`	`appendPQExpBufferChar(&namebuf, '\\');`
`1922`	`1925 3FA1`	`i = PQmblen(cp, pset.encoding);`
`1923`	`1926`	`while (i-- && *cp)`