diff options
| author | eliel <eliel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-18 21:31:15 +0000 |
|---|---|---|
| committer | eliel <eliel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-18 21:31:15 +0000 |
| commit | d375f47c2e9a3f9d09fcfeda86da7a10c1a60c37 (patch) | |
| tree | 3834682125aaf55fb111a833efc66212477ea7d2 | |
| parent | 27fd622049ee72ba07365c9dc51d33707141e9ee (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@195429 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/manager.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/manager.c b/main/manager.c index 526442fbc..e9f84e138 100644 --- a/main/manager.c +++ b/main/manager.c @@ -525,7 +525,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 <actionname>\n" + "Usage: manager show command <actionname> [<actionname> [<actionname> [...]]]\n" " Shows the detailed description for a specific Asterisk manager interface command.\n"; return NULL; case CLI_GENERATE: @@ -542,8 +542,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) { |