When returning a string that needs escaping there are two
scenarios that can happen. Firstly, user already started the
string with a quote (or double quote) in which case we don't need
to do anything - readline takes care of that. However, if they
haven't typed anything yet, we need to escape the string
ourselves.
Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
tools/vsh.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/tools/vsh.c b/tools/vsh.c
index 2a83dc475..3a9941017 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -2874,7 +2874,15 @@ vshReadlineParse(const char *text, int state)
}
}
- if (!res) {
+ if (res) {
+ if (!rl_completion_quote_character) {
+ virBuffer buf = VIR_BUFFER_INITIALIZER;
+ virBufferEscapeShell(&buf, res);
+ VIR_FREE(res);
+ if (!(res = virBufferContentAndReset(&buf)))
+ goto error;
+ }
+ } else {
VIR_FREE(sanitized_text);
VIR_FREE(ctext);
}
@@ -2900,6 +2908,16 @@ vshReadlineCompletion(const char *text,
return matches;
}
+
+static int
+vshReadlineCharIsQuoted(char *line, int index)
+{
+ return index > 0 &&
+ line[index - 1] == '\\' &&
+ !vshReadlineCharIsQuoted(line, index - 1);
+}
+
+
# define HISTSIZE_MAX 500000
static int
@@ -2924,6 +2942,8 @@ vshReadlineInit(vshControl *ctl)
rl_attempted_completion_function = vshReadlineCompletion;
rl_basic_word_break_characters = " \t\n\\`@$><=;|&{(";
+ rl_completer_quote_characters = "\"'";
+ rl_char_is_quoted_p = vshReadlineCharIsQuoted;
if (virAsprintf(&histsize_env, "%s_HISTSIZE", ctl->env_prefix) < 0)
goto cleanup;
--
2.13.6
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
