Merged revisions 63804 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63804 | russell | 2007-05-10 17:23:42 -0500 (Thu, 10 May 2007) | 4 lines

Strip terminal escape sequences from CLI command output that is going to be
sent out over the manager interface.
(issue #9659, reported by pari, fixed by me)

........

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

diff --git a/main/manager.c b/main/manager.c
index 129a8333338d5fe21239cf289ca17c2293b06997..bf0ba38981bfdcc2e78e754685c29e1e131c01e3 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -79,6 +79,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/version.h"
 #include "asterisk/threadstorage.h"
 #include "asterisk/linkedlists.h"
+#include "asterisk/term.h"
 
 /*!
  * Linked list of events.
@@ -1772,7 +1773,7 @@ static int action_command(struct mansession *s, const struct message *m)
 {
        const char *cmd = astman_get_header(m, "Command");
        const char *id = astman_get_header(m, "ActionID");
-       char *buf;
+       char *buf, *final_buf;
        char template[] = "/tmp/ast-ami-XXXXXX";        /* template for temporary file */
        int fd = mkstemp(template);
        off_t l;
@@ -1783,13 +1784,16 @@ static int action_command(struct mansession *s, const struct message *m)
        /* FIXME: Wedge a ActionID response in here, waiting for later changes */
        ast_cli_command(fd, cmd);       /* XXX need to change this to use a FILE * */
        l = lseek(fd, 0, SEEK_END);     /* how many chars available */
-       buf = alloca(l+1);
+       buf = alloca(l + 1);
+       final_buf = alloca(l + 1);
        lseek(fd, 0, SEEK_SET);
        read(fd, buf, l);
        buf[l] = '\0';
        close(fd);
        unlink(template);
-       astman_append(s, buf);
+       term_strip(final_buf, buf, l);
+       final_buf[l] = '\0';
+       astman_append(s, final_buf);
        astman_append(s, "--END COMMAND--\r\n\r\n");
        return 0;
 }