Don't elide blank lines when accumulating psql command history.

robertmhaas · robertmhaas · commit ff4fd4bf53c5 · 2011-11-15T20:34:47.000-05:00
This can change the meaning of queries, if the blank line happens to
occur in the middle of a quoted literal, as per complaint from Tomas Vondra.

Back-patch to all supported branches.
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
@@ -95,10 +95,10 @@ void
 pg_append_history(const char *s, PQExpBuffer history_buf)
 {
 #ifdef USE_READLINE
-	if (useHistory && s && s[0])
+	if (useHistory && s)
 	{
 		appendPQExpBufferStr(history_buf, s);
-		if (s[strlen(s) - 1] != '\n')
+		if (!s[0] || s[strlen(s) - 1] != '\n')
 			appendPQExpBufferChar(history_buf, '\n');
 	}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -95,10 +95,10 @@ void`
`95`	`95`	`pg_append_history(const char *s, PQExpBuffer history_buf)`
`96`	`96`	`{`
`97`	`97`	`#ifdef USE_READLINE`
`98`		`- if (useHistory && s && s[0])`
	`98`	`+ if (useHistory && s)`
`99`	`99`	`{`
`100`	`100`	`appendPQExpBufferStr(history_buf, s);`
`101`		`- if (s[strlen(s) - 1] != '\n')`
	`101`	`+ if (!s[0] \|\| s[strlen(s) - 1] != '\n')`
`102`	`102`	`appendPQExpBufferChar(history_buf, '\n');`
`103`	`103`	`}`
`104`	`104`	`#endif`