Merged revisions 177787 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r177787 | tilghman | 2009-02-20 17:02:35 -0600 (Fri, 20 Feb 2009) | 16 lines

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

  ........
    r177786 | tilghman | 2009-02-20 16:59:52 -0600 (Fri, 20 Feb 2009) | 9 lines

    Don't print the CR-NL combination when we aren't outputting to the manager.

    An embedded CR-NL in a CLI command screws up several AMI parsers that don't
    expect to see that combination in the middle of output.

    (Closes issue #14305)
    Reported by: martins
    Patch by: tilghman
  ........
................

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

diff --git a/main/pbx.c b/main/pbx.c
index 868141b50670facd124bc7db492e0eb2aa0dc9ca..d00ba068789ffd53d031c21e80a71d647b5fbd0c 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -5148,7 +5148,7 @@ static int show_dialplan_helper(int fd, const char *context, const char *exten,
 
                /* if we print something in context, make an empty line */
                if (context_info_printed)
-                       ast_cli(fd, "\r\n");
+                       ast_cli(fd, "\n");
        }
        ast_unlock_contexts();
 
@@ -5160,15 +5160,15 @@ static int show_debug_helper(int fd, const char *context, const char *exten, str
        struct ast_context *c = NULL;
        int res = 0, old_total_exten = dpc->total_exten;
 
-       ast_cli(fd,"\r\n     In-mem exten Trie for Fast Extension Pattern Matching:\r\n\r\n");
+       ast_cli(fd,"\n     In-mem exten Trie for Fast Extension Pattern Matching:\n\n");
 
-       ast_cli(fd,"\r\n           Explanation: Node Contents Format = <char(s) to match>:<pattern?>:<specif>:[matched extension]\r\n");
-       ast_cli(fd,    "                        Where <char(s) to match> is a set of chars, any one of which should match the current character\r\n");
-       ast_cli(fd,    "                              <pattern?>: Y if this a pattern match (eg. _XZN[5-7]), N otherwise\r\n");
-       ast_cli(fd,    "                              <specif>: an assigned 'exactness' number for this matching char. The lower the number, the more exact the match\r\n");
-       ast_cli(fd,    "                              [matched exten]: If all chars matched to this point, which extension this matches. In form: EXTEN:<exten string> \r\n");
-       ast_cli(fd,    "                        In general, you match a trie node to a string character, from left to right. All possible matching chars\r\n");
-       ast_cli(fd,    "                        are in a string vertically, separated by an unbroken string of '+' characters.\r\n\r\n");
+       ast_cli(fd,"\n           Explanation: Node Contents Format = <char(s) to match>:<pattern?>:<specif>:[matched extension]\n");
+       ast_cli(fd,    "                        Where <char(s) to match> is a set of chars, any one of which should match the current character\n");
+       ast_cli(fd,    "                              <pattern?>: Y if this a pattern match (eg. _XZN[5-7]), N otherwise\n");
+       ast_cli(fd,    "                              <specif>: an assigned 'exactness' number for this matching char. The lower the number, the more exact the match\n");
+       ast_cli(fd,    "                              [matched exten]: If all chars matched to this point, which extension this matches. In form: EXTEN:<exten string>\n");
+       ast_cli(fd,    "                        In general, you match a trie node to a string character, from left to right. All possible matching chars\n");
+       ast_cli(fd,    "                        are in a string vertically, separated by an unbroken string of '+' characters.\n\n");
        ast_rdlock_contexts();
 
        /* walk all contexts ... */
@@ -5194,14 +5194,14 @@ static int show_debug_helper(int fd, const char *context, const char *exten, str
                {
                        cli_match_char_tree(c->pattern_tree, " ", fd);
                } else {
-                       ast_cli(fd,"\r\n     No Pattern Trie present. Perhaps the context is empty...or there is trouble...\r\n\r\n");
+                       ast_cli(fd,"\n     No Pattern Trie present. Perhaps the context is empty...or there is trouble...\n\n");
                }
 
                ast_unlock_context(c);
 
                /* if we print something in context, make an empty line */
                if (context_info_printed)
-                       ast_cli(fd, "\r\n");
+                       ast_cli(fd, "\n");
        }
        ast_unlock_contexts();