Merged revisions 117479 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 21 May 2008 18:12:19 +0000 (18:12 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 21 May 2008 18:12:19 +0000 (18:12 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r117479 | russell | 2008-05-21 13:11:51 -0500 (Wed, 21 May 2008) | 6 lines

Don't display the verbose marker for calls to ast_verbose() that do not include
a VERBOSE_PREFIX in front of the message.
(closes issue #12702)
Reported by: johnlange
Patched by me

........

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

main/asterisk.c

index 46ef1d9..c8a4b26 100644 (file)
@@ -1445,8 +1445,12 @@ static void console_verboser(const char *s)
            (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_1))) {
                fputs(tmp, stdout);
                fputs(c, stdout);
            (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_1))) {
                fputs(tmp, stdout);
                fputs(c, stdout);
-       } else
+       } else {
+               if (*s == 127) {
+                       s++;
+               }
                fputs(s, stdout);
                fputs(s, stdout);
+       }
 
        fflush(stdout);
        
 
        fflush(stdout);