From b9f8e799b49f76184dc6bedbc7b6521ad81a9892 Mon Sep 17 00:00:00 2001 From: tilghman Date: Thu, 22 May 2008 18:54:41 +0000 Subject: Merged revisions 117899 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r117899 | tilghman | 2008-05-22 13:53:53 -0500 (Thu, 22 May 2008) | 2 lines Also remove preamble from asynchronous events (reported by jsmith on #asterisk-dev) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117900 f38db490-d61c-443f-a65b-d21fe96a405b --- main/asterisk.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main/asterisk.c b/main/asterisk.c index d28e55665..a6bc0e465 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -1907,6 +1907,7 @@ static int ast_el_read_char(EditLine *el, char *cp) return (num_read); } if (fds[0].revents) { + char *tmp; res = read(ast_consock, buf, sizeof(buf) - 1); /* if the remote side disappears exit */ if (res < 1) { @@ -1939,6 +1940,14 @@ static int ast_el_read_char(EditLine *el, char *cp) buf[res] = '\0'; + /* Strip preamble from asynchronous events, too */ + for (tmp = buf; *tmp; tmp++) { + if (*tmp == 127) { + memmove(tmp, tmp + 1, strlen(tmp)); + tmp--; + } + } + /* Write over the CLI prompt */ if (!ast_opt_exec && !lastpos) write(STDOUT_FILENO, "\r", 1); -- cgit v1.2.3