From 91b11ad2a3a68c77516faba2b00db360f4c6ff90 Mon Sep 17 00:00:00 2001 From: "Eliel C. Sardanons" Date: Mon, 18 May 2009 21:37:00 +0000 Subject: [PATCH] Merged revisions 195369 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r195369 | eliel | 2009-05-18 16:49:20 -0400 (Mon, 18 May 2009) | 8 lines Fix the CLI command 'manager show command' documentation and functionality. The CLI command 'manager show command' supports passing multiple action names in the same line, but it was not allowing that because of a incorrect check in the argumentes counter. Also the documentation was updated to show that this usage of the command is possible. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@195442 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/manager.c b/main/manager.c index 34eded8ce2..ccf95d7359 100644 --- a/main/manager.c +++ b/main/manager.c @@ -517,7 +517,7 @@ static char *handle_showmancmd(struct ast_cli_entry *e, int cmd, struct ast_cli_ case CLI_INIT: e->command = "manager show command"; e->usage = - "Usage: manager show command \n" + "Usage: manager show command [ [ [...]]]\n" " Shows the detailed description for a specific Asterisk manager interface command.\n"; return NULL; case CLI_GENERATE: @@ -534,8 +534,9 @@ static char *handle_showmancmd(struct ast_cli_entry *e, int cmd, struct ast_cli_ return ret; } authority = ast_str_alloca(80); - if (a->argc != 4) + if (a->argc < 4) { return CLI_SHOWUSAGE; + } AST_RWLIST_RDLOCK(&actions); AST_RWLIST_TRAVERSE(&actions, cur, list) {