[asterisk-commits] eliel: trunk r195368 - /trunk/main/manager.c

[SVN commits to the Asterisk project]

Author: eliel
Date: Mon May 18 15:44:54 2009
New Revision: 195368

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195368
Log:
Rollback commit 195367.

The CLI command 'manager show command' supports passing multiple AMI actions
at a time. The issue with this command was in another place.


Modified:
    trunk/main/manager.c

Modified: trunk/main/manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/manager.c?view=diff&rev=195368&r1=195367&r2=195368
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Mon May 18 15:44:54 2009
@@ -612,22 +612,17 @@
 			"	Shows the detailed description for a specific Asterisk manager interface command.\n";
 		return NULL;
 	case CLI_GENERATE:
-		if (a->pos == 3) {
-			/* autocomplete the action name. */
-			l = strlen(a->word);
-			which = 0;
-			AST_RWLIST_RDLOCK(&actions);
-			AST_RWLIST_TRAVERSE(&actions, cur, list) {
-				if (!strncasecmp(a->word, cur->action, l) && ++which > a->n) {
-					ret = ast_strdup(cur->action);
-					break;	/* make sure we exit even if ast_strdup() returns NULL */
-				}
-			}
-			AST_RWLIST_UNLOCK(&actions);
-			return ret;
-		}
-
-		return NULL;
+		l = strlen(a->word);
+		which = 0;
+		AST_RWLIST_RDLOCK(&actions);
+		AST_RWLIST_TRAVERSE(&actions, cur, list) {
+			if (!strncasecmp(a->word, cur->action, l) && ++which > a->n) {
+				ret = ast_strdup(cur->action);
+				break;	/* make sure we exit even if ast_strdup() returns NULL */
+			}
+		}
+		AST_RWLIST_UNLOCK(&actions);
+		return ret;
 	}
 	authority = ast_str_alloca(80);
 	if (a->argc != 4) {