From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 10 Aug 2010 16:22:58 +0000 (+0000)
Subject: Merged revisions 281529 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e287e4090cae8eceea5667565a5edf137a35ba9d;p=thirdparty%2Fasterisk.git

Merged revisions 281529 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r281529 | russell | 2010-08-10 11:21:58 -0500 (Tue, 10 Aug 2010) | 8 lines

  Resolve a problem with channel name tab completion.

  Hitting tab without typing any part of a channel name resulted in no results.
  This now results in getting a full list of active channels, just as it did
  in previous versions of Asterisk.

  Review: https://reviewboard.asterisk.org/r/818/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@281530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/cli.c b/main/cli.c
index c9dbc6d02e..ebb7deb6d4 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -1485,7 +1485,13 @@ char *ast_complete_channels(const char *line, const char *word, int pos, int sta
 		return NULL;
 	}
 
-	if (!(iter = ast_channel_iterator_by_name_new(word, strlen(word)))) {
+	if (ast_strlen_zero(word)) {
+		iter = ast_channel_iterator_all_new();
+	} else {
+		iter = ast_channel_iterator_by_name_new(word, strlen(word));
+	}
+
+	if (!iter) {
 		return NULL;
 	}