psql: Fix %w length in PROMPT2 when PROMPT1 contains a newline.

macdice · macdice · commit 1713a0013f90 · 2020-02-10T13:21:26.000+13:00
The width of the invisible PROMPT2 must take into account, in order for user input to be aligned with the first line, that PROMPT1 can contain newlines. Author: Maxence Ahlouche Reviewed-by: Tom Lane Discussion: https://postgr.es/m/CAJeaomVyLSP_Wj%3D0FtYNTuoopWHyFarhUtYKDHs0HHv%2Bb%3DN9sA%40mail.gmail.com
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
@@ -373,7 +373,10 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)
 				if (visible)
 				{
 					chwidth = PQdsplen(p, pset.encoding);
-					if (chwidth > 0)
+
+					if (*p == '\n')
+						last_prompt1_width = 0;
+					else if (chwidth > 0)
 						last_prompt1_width += chwidth;
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,10 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)`
`373`	`373`	`if (visible)`
`374`	`374`	`{`
`375`	`375`	`chwidth = PQdsplen(p, pset.encoding);`
`376`		`- if (chwidth > 0)`
	`376`	`+`
	`377`	`+ if (*p == '\n')`
	`378`	`+ last_prompt1_width = 0;`
	`379`	`+ else if (chwidth > 0)`
`377`	`380`	`last_prompt1_width += chwidth;`
`378`	`381`	`}`
`379`	`382`