From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 25 Apr 2024 08:15:53 +0000 (+0200)
Subject: vshReadlineInit: Initialize only once
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=dbf7b727fb7ec5dd806c216f49a1ee87d64fa09f;p=libvirt.git

vshReadlineInit: Initialize only once

'vshReadlineInit' is called when interactive virsh is started but also
on each call to 'cmdComplete'. Calling it repeatedly (using the
'complete' command interactively, or multiple times in batch mode) leaks
the buffers for history file configuration.

Avoid multiple setups of this function by returning success in case the
history file config is already present.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tools/vsh.c b/tools/vsh.c
index 05de54b5b0..f954f7af77 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -2908,6 +2908,10 @@ vshReadlineInit(vshControl *ctl)
     const char *break_characters = " \t\n`@$><=;|&{(";
     const char *quote_characters = "\"'";
 
+    /* initialize readline stuff only once */
+    if (ctl->historydir)
+        return 0;
+
     /* Opaque data for autocomplete callbacks. */
     autoCompleteOpaque = ctl;