Fix \watch's interaction with libedit on ^C.

macdice · macdice · commit 09224a35cdaa · 2022-07-10T16:54:09.000+12:00
When you hit ^C, the terminal driver in Unix-like systems echoes "^C" as well as sending an interrupt signal (depending on stty settings). At least libedit (but maybe also libreadline) is then confused about the current cursor location, and corrupts the display if you try to scroll back. Fix, by moving to a new line before the next prompt is displayed. Back-patch to all supported released. Author: Pavel Stehule <pavel.stehule@gmail.com> Reported-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/3278793.1626198638%40sss.pgh.pa.us
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -4675,6 +4675,14 @@ do_watch(PQExpBuffer query_buf, double sleep)
 		sigint_interrupt_enabled = false;
 	}
 
+	/*
+	 * If the terminal driver echoed "^C", libedit/libreadline might be
+	 * confused about the cursor position.  Therefore, inject a newline
+	 * before the next prompt is displayed.
+	 */
+	fprintf(stdout, "\n");
+	fflush(stdout);
+
 	pg_free(title);
 	return (res >= 0);
 }

Original file line number	Diff line number	Diff line change
`@@ -4675,6 +4675,14 @@ do_watch(PQExpBuffer query_buf, double sleep)`
`4675`	`4675`	`sigint_interrupt_enabled = false;`
`4676`	`4676`	`}`
`4677`	`4677`
	`4678`	`+ /*`
	`4679`	`+ * If the terminal driver echoed "^C", libedit/libreadline might be`
	`4680`	`+ * confused about the cursor position. Therefore, inject a newline`
	`4681`	`+ * before the next prompt is displayed.`
	`4682`	`+ */`
	`4683`	`+ fprintf(stdout, "\n");`
	`4684`	`+ fflush(stdout);`
	`4685`	`+`
`4678`	`4686`	`pg_free(title);`
`4679`	`4687`	`return (res >= 0);`
`4680`	`4688`	`}`