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

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 <[email protected]>
Reported-by: Tom Lane <[email protected]>
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
index 6b7d78edf767a7677f828927a48e161960fd4275..99be3018f930a8a24b4ba169e387bd5184747468 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -4660,6 +4660,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);
 }