Fix tab completion when you just do a plain tab without entering anything, and also...

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

diff --git a/cli.c b/cli.c
index 0c5e840884a75f7e133819ee640136087124570d..49147223106bd04ee32fe95d9b8ddf2d9b865952 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1313,7 +1313,7 @@ static char *__ast_cli_generator(const char *text, const char *word, int state,
        int matchnum=0;
        char *ret = NULL;
        char matchstr[80] = "";
-       int tws;
+       int tws = 0;
        char *dup = parse_args(text, &x, argv, sizeof(argv) / sizeof(argv[0]), &tws);
 
        if (!dup)       /* error */
@@ -1321,9 +1321,12 @@ static char *__ast_cli_generator(const char *text, const char *word, int state,
        argindex = (!ast_strlen_zero(word) && x>0) ? x-1 : x;
        /* rebuild the command, ignore tws */
        ast_join(matchstr, sizeof(matchstr)-1, argv);
-       if (tws)
-               strcat(matchstr, " "); /* XXX */
        matchlen = strlen(matchstr);
+       if (tws) {
+               strcat(matchstr, " "); /* XXX */
+               if (matchlen)
+                       matchlen++;
+       }
        if (lock)
                AST_LIST_LOCK(&helpers);
        while( !ret && (e = cli_next(&i)) ) {

diff --git a/pbx.c b/pbx.c
index 1a5f6f4c449397a9fb1914bb6c068e1ef36fa0c0..d1e202866a311a3a6829be06fb13601127efd975 100644 (file)
--- a/pbx.c
+++ b/pbx.c
@@ -2864,8 +2864,10 @@ static char *complete_show_application(const char *line, const char *word, int p
        /* return the n-th [partial] matching entry */
        AST_LIST_LOCK(&apps);
        AST_LIST_TRAVERSE(&apps, a, list) {
-               if (!strncasecmp(word, a->name, wordlen) && ++which > state)
+               if (!strncasecmp(word, a->name, wordlen) && ++which > state) {
                        ret = strdup(a->name);
+                       break;
+               }
        }
        AST_LIST_UNLOCK(&apps);