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

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed May 21 13:44:07 2008
New Revision: 117522

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

................
r117520 | tilghman | 2008-05-21 13:43:26 -0500 (Wed, 21 May 2008) | 11 lines

Merged revisions 117519 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r117519 | tilghman | 2008-05-21 13:40:14 -0500 (Wed, 21 May 2008) | 3 lines

Strip the preamble from the output also when -rx is not being used
(Related to issue #12702)

........

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

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=117522&r1=117521&r2=117522
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Wed May 21 13:44:07 2008
@@ -2480,6 +2480,14 @@
 			if (ebuf[strlen(ebuf)-1] == '\n')
 				ebuf[strlen(ebuf)-1] = '\0';
 			if (!remoteconsolehandler(ebuf)) {
+				/* Strip preamble from output */
+				char *tmp;
+				for (tmp = ebuf; *tmp; tmp++) {
+					if (*tmp == 127) {
+						memmove(tmp, tmp + 1, strlen(tmp));
+						tmp--;
+					}
+				}
 				res = write(ast_consock, ebuf, strlen(ebuf) + 1);
 				if (res < 1) {
 					ast_log(LOG_WARNING, "Unable to write: %s\n", strerror(errno));