[svn-commits] eliel: branch eliel/cli-permissions r151873 - in /team/eliel/cli-permissions:...

[SVN commits to the Digium repositories]

Author: eliel
Date: Fri Oct 24 06:16:15 2008
New Revision: 151873

URL: http://svn.digium.com/view/asterisk?view=rev&rev=151873
Log:
Testing something...

Modified:
    team/eliel/cli-permissions/   (props changed)
    team/eliel/cli-permissions/configure
    team/eliel/cli-permissions/main/cli.c

Propchange: team/eliel/cli-permissions/
------------------------------------------------------------------------------
    automerge = *

Modified: team/eliel/cli-permissions/main/cli.c
URL: http://svn.digium.com/view/asterisk/team/eliel/cli-permissions/main/cli.c?view=diff&rev=151873&r1=151872&r2=151873
==============================================================================
--- team/eliel/cli-permissions/main/cli.c (original)
+++ team/eliel/cli-permissions/main/cli.c Fri Oct 24 06:16:15 2008
@@ -592,11 +592,11 @@
 
 static struct ast_cli_entry *cli_next(struct ast_cli_entry *e)
 {
-	if (e == NULL)
-		e = AST_LIST_FIRST(&helpers);
-	if (e)
-		e = AST_LIST_NEXT(e, list);
-	return e;
+	if (e) {
+		return AST_LIST_NEXT(e, list);
+	} else {	
+		return AST_LIST_FIRST(&helpers);
+	}
 }
 
 static char * handle_showuptime(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -859,7 +859,7 @@
 			"       the next time the driver reads or writes from the channel\n";
 		return NULL;
 	case CLI_GENERATE:
-		return ast_complete_channels(a->line, a->word, a->pos, a->n, 2);
+		return ast_complete_channels(a->line, a->word, a->pos, a->n, e->args);
 	}
 	if (a->argc != 4)
 		return CLI_SHOWUSAGE;