Merged revisions 117519 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 21 May 2008 18:43:26 +0000 (18:43 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 21 May 2008 18:43:26 +0000 (18:43 +0000)
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)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@117520 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/asterisk.c

index c8a4b26..4b67c04 100644 (file)
@@ -2480,6 +2480,14 @@ static void ast_remotecontrol(char * data)
                        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));