diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-01-03 11:15:26 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-01-03 11:15:26 -0500 |
| commit | ddd87d564508bb1c80aac0a4439cfe74a3c203a9 (patch) | |
| tree | 3115f3d7275e2174941761486463788c6766e29a | |
| parent | 04334fde69132f335d9d70cfefe419bd1276b232 (diff) | |
| download | postgresql-ddd87d564508bb1c80aac0a4439cfe74a3c203a9.tar.gz postgresql-ddd87d564508bb1c80aac0a4439cfe74a3c203a9.zip | |
Add an ugly workaround for a bug in some recent libedit versions.
Debian unstable is shipping a broken version of libedit: it de-escapes
words before passing them to the application's tab completion function,
preventing us from recognizing backslash commands. Fortunately,
we have enough information available to dig the original text out of
rl_line_buffer, so ignore the string argument and do that.
I view this as a temporary workaround to get the affected buildfarm
members back to green in the wake of 7c015045b. I hope we can get
rid of it once somebody fixes Debian's libedit; hence, no back-patch,
at least for now.
Discussion: https://postgr.es/m/20200103110128.GA28967@msg.df7cb.de
| -rw-r--r-- | src/bin/psql/tab-complete.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 22717914c73..2fd88866c9f 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -1447,7 +1447,13 @@ psql_completion(const char *text, int start, int end) NULL }; - (void) end; /* "end" is not used */ + /* + * Temporary workaround for a bug in recent (2019) libedit: it incorrectly + * de-escapes the input "text", causing us to fail to recognize backslash + * commands. So get the string to look at from rl_line_buffer instead. + */ + char *text_copy = pnstrdup(rl_line_buffer + start, end - start); + text = text_copy; #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER rl_completion_append_character = ' '; @@ -3859,6 +3865,7 @@ psql_completion(const char *text, int start, int end) /* free storage */ free(previous_words); free(words_buffer); + free(text_copy); /* Return our Grand List O' Matches */ return matches; |