From 28c515cac5cb7537086db70ede42ea47ff6a1508 Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@malleable.com>
Date: Fri, 3 Oct 2008 22:12:02 +0000
Subject: [PATCH] Merged revisions 146198 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
r146198 | seanbright | 2008-10-03 18:10:18 -0400 (Fri, 03 Oct 2008) | 7 lines

Resolve a subtle bug where we would never successfully be able to get
the first item in the CLI entry list.  This was preventing '!' from
showing up in either 'help' or in tab completion.

(closes issue #13578)
Reported by: mvanbaak

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@146199 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/cli.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main/cli.c b/main/cli.c
index 70d26e1c8f..b5ff643ddc 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -1255,11 +1255,11 @@ void ast_builtins_init(void)
 
 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);
+	}
 }
 
 /*!