[asterisk-commits] tilghman: branch 1.6.0 r117901 - in /branches/1.6.0: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu May 22 13:55:20 2008
New Revision: 117901

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117901
Log:
Merged revisions 117900 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r117900 | tilghman | 2008-05-22 13:54:41 -0500 (Thu, 22 May 2008) | 10 lines

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)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/asterisk.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=117901&r1=117900&r2=117901
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Thu May 22 13:55:20 2008
@@ -1907,6 +1907,7 @@
 				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) {
@@ -1938,6 +1939,14 @@
 			}
 
 			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)