From 2a1919940771db5c85d090f2c29926eccb4ba74f Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Wed, 27 Sep 2017 11:36:22 -0400 Subject: [PATCH] vtysh: 'x not running' redux when warning about daemons that are not running, make sure to handle the multi instance case Signed-off-by: Quentin Young --- vtysh/vtysh.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 3f86f3c929..05d0ac5612 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -423,12 +423,20 @@ static int vtysh_execute_func(const char *line, int pager) } cmd_stat = CMD_SUCCESS; + struct vtysh_client *vc; for (i = 0; i < array_size(vtysh_client); i++) { if (cmd->daemon & vtysh_client[i].flag) { if (vtysh_client[i].fd < 0 && (cmd->daemon == vtysh_client[i].flag)) { - fprintf(stderr, "%s is not running\n", - vtysh_client[i].name); + bool any_inst = false; + for (vc = &vtysh_client[i]; vc; + vc = vc->next) + any_inst = any_inst + || (vc->fd > 0); + if (!any_inst) + fprintf(stderr, + "%s is not running\n", + vtysh_client[i].name); continue; } cmd_stat = vtysh_client_execute( -- 2.39.5