kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure tab-completion works even when we have typed a fully

Browse Source 
matching word (e.g. "sip<TAB>"); this is implemented by this one-line change

-               for (;; dst++, src += n) {
+               for (;src < argindex; dst++, src += n) {

However this code is not exactly trivial to understand, so
i am also adding some comments to help figuring out what it does.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-12-12 09:40:45 +00:00
parent 00a02844ba
commit 33cbc5e55e
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/cli.c
View File

@@ -1598,12 +1598,16 @@ static char *__ast_cli_generator(const char *text, const char *word, int state,
char *ret = NULL; char *ret = NULL;
char matchstr[80] = ""; char matchstr[80] = "";
int tws = 0; int tws = 0;
/* Split the argument into an array of words */
char *dup = parse_args(text, &x, argv, sizeof(argv) / sizeof(argv[0]), &tws); char *dup = parse_args(text, &x, argv, sizeof(argv) / sizeof(argv[0]), &tws);
if (!dup) /* malloc error */ if (!dup) /* malloc error */
return NULL; return NULL;
/* Compute the index of the last argument (could be an empty string) */
argindex = (!ast_strlen_zero(word) && x>0) ? x-1 : x; argindex = (!ast_strlen_zero(word) && x>0) ? x-1 : x;
/* rebuild the command, ignore tws */
/* rebuild the command, ignore terminating white space and flatten space */
ast_join(matchstr, sizeof(matchstr)-1, argv); ast_join(matchstr, sizeof(matchstr)-1, argv);
matchlen = strlen(matchstr); matchlen = strlen(matchstr);
if (tws) { if (tws) {
@@ -1616,7 +1620,12 @@ static char *__ast_cli_generator(const char *text, const char *word, int state,
while ( (e = cli_next(&i)) ) { while ( (e = cli_next(&i)) ) {
/* XXX repeated code */ /* XXX repeated code */
int src = 0, dst = 0, n = 0; int src = 0, dst = 0, n = 0;
for (;; dst++, src += n) {
/*
* Try to match words, up to and excluding the last word, which
* is either a blank or something that we want to extend.
*/
for (;src < argindex; dst++, src += n) {
n = word_match(argv[src], e->cmda[dst]); n = word_match(argv[src], e->cmda[dst]);
if (n < 0) if (n < 0)
break; break;
@@ -1627,12 +1636,17 @@ static char *__ast_cli_generator(const char *text, const char *word, int state,
ret = is_prefix(argv[src], e->cmda[dst], state - matchnum, &n); ret = is_prefix(argv[src], e->cmda[dst], state - matchnum, &n);
matchnum += n; /* this many matches here */ matchnum += n; /* this many matches here */
if (ret) { if (ret) {
/*
* argv[src] is a valid prefix of the next word in this
* command. If this is also the correct entry, return it.
*/
if (matchnum > state) if (matchnum > state)
break; break;
free(ret); free(ret);
ret = NULL; ret = NULL;
} else if (ast_strlen_zero(e->cmda[dst])) { } else if (ast_strlen_zero(e->cmda[dst])) {
/* This entry is a prefix of the command string entered /*
* This entry is a prefix of the command string entered
* (only one entry in the list should have this property). * (only one entry in the list should have this property).
* Run the generator if one is available. In any case we are done. * Run the generator if one is available. In any case we are done.
*/ */