[svn-commits] eliel: branch 1.6.1 r195429 - in /branches/1.6.1: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: eliel
Date: Mon May 18 16:31:15 2009
New Revision: 195429

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195429
Log:
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.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/manager.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/manager.c?view=diff&rev=195429&r1=195428&r2=195429
==============================================================================
--- branches/1.6.1/main/manager.c (original)
+++ branches/1.6.1/main/manager.c Mon May 18 16:31:15 2009
@@ -525,7 +525,7 @@
 	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 @@
 		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) {