diff options
| author | eliel <eliel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-25 14:12:54 +0000 |
|---|---|---|
| committer | eliel <eliel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-25 14:12:54 +0000 |
| commit | c2743976092e3ec485a03e13290442bf42cdee91 (patch) | |
| tree | 57f1980ba6da216b08e53d6de739cc75fe8f2d7a /main | |
| parent | 1c0316797731dcd45414a072079d0be63738fe3c (diff) | |
Avoid destroying the CLI line when moving the cursor backward and trying to autocomplete.
When moving the cursor backward and pressing TAB to autocomplete, a NULL is put
in the line and we are loosing what we have already wrote after the actual
cursor position.
(closes issue #14373)
Reported by: eliel
Patches:
asterisk.c.patch uploaded by eliel (license 64)
Tested by: lmadsen
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@184188 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 2cabfc272..eb79e71a1 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2121,11 +2121,12 @@ static char *cli_complete(EditLine *el, int ch) int nummatches = 0; char **matches; int retval = CC_ERROR; - char buf[2048]; + char buf[2048], savechr; int res; LineInfo *lf = (LineInfo *)el_line(el); + savechr = *(char *)lf->cursor; *(char *)lf->cursor = '\0'; ptr = (char *)lf->cursor; if (ptr) { @@ -2151,8 +2152,10 @@ static char *cli_complete(EditLine *el, int ch) char *mbuf; int mlen = 0, maxmbuf = 2048; /* Start with a 2048 byte buffer */ - if (!(mbuf = ast_malloc(maxmbuf))) + if (!(mbuf = ast_malloc(maxmbuf))) { + lf->cursor[0] = savechr; return (char *)(CC_ERROR); + } snprintf(buf, sizeof(buf),"_COMMAND MATCHESARRAY \"%s\" \"%s\"", lf->buffer, ptr); fdsend(ast_consock, buf); res = 0; @@ -2161,8 +2164,10 @@ static char *cli_complete(EditLine *el, int ch) if (mlen + 1024 > maxmbuf) { /* Every step increment buffer 1024 bytes */ maxmbuf += 1024; - if (!(mbuf = ast_realloc(mbuf, maxmbuf))) + if (!(mbuf = ast_realloc(mbuf, maxmbuf))) { + lf->cursor[0] = savechr; return (char *)(CC_ERROR); + } } /* Only read 1024 bytes at a time */ res = read(ast_consock, mbuf + mlen, 1024); @@ -2222,6 +2227,8 @@ static char *cli_complete(EditLine *el, int ch) free(matches); } + lf->cursor[0] = savechr; + return (char *)(long)retval; } |