From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 28 Jun 2018 18:37:01 +0000 (+0000)
Subject: vtysh: fix autocomplete garbage printouts
X-Git-Tag: frr-6.1-dev~220^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8d70e7fe3225c6137d6bbf9cbe6b9e53b00b935b;p=matthieu%2Ffrr.git

vtysh: fix autocomplete garbage printouts

The semantics for suppressing output received from daemons changed
slightly when pipe actions were introduced, causing raw autocomplete
output to be printed where it shouldn't have been.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 0697cd8b75..b56eaa899f 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -3357,9 +3357,12 @@ static void vtysh_autocomplete(vector comps, struct cmd_token *token)
 	snprintf(accmd, sizeof(accmd), "autocomplete %d %s %s", token->type,
 		 token->text, token->varname ? token->varname : "-");
 
+	vty->of_saved = vty->of;
+	vty->of = NULL;
 	for (i = 0; i < array_size(vtysh_client); i++)
 		vtysh_client_run_all(&vtysh_client[i], accmd, 1, vtysh_ac_line,
 				     comps);
+	vty->of = vty->of_saved;
 }
 
 static const struct cmd_variable_handler vtysh_var_handler[] = {