when doing tab completion, iterate the list of matches to count how many there

are instead of having the list of matches generated twice (issue #6066)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Russell Bryant 20 years ago
parent 7fae5bb20e
commit 1f73717188

@ -1602,12 +1602,13 @@ static char *cli_complete(EditLine *el, int ch)
free(mbuf);
} else
matches = (char **) NULL;
} else {
nummatches = ast_cli_generatornummatches((char *)lf->buffer,ptr);
char **p;
int count = 0;
matches = ast_cli_completion_matches((char *)lf->buffer,ptr);
for (p = matches; p && *p; p++)
count++;
nummatches = count - 1; /* XXX apparently there is one dup ? */
}
if (matches) {
@ -1641,7 +1642,7 @@ static char *cli_complete(EditLine *el, int ch)
retval = CC_REFRESH;
}
}
free(matches);
free(matches);
}
return (char *)(long)retval;

Loading…
Cancel
Save