From d6c817f2f15db9338670382eab859acd22d9cb2f Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 20 Feb 2009 23:04:33 +0000 Subject: [PATCH] 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.0@177788 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/main/pbx.c b/main/pbx.c index 1554beac7a..5e897da669 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5069,15 +5069,15 @@ static int show_dialplan_helper(int fd, const char *context, const char *exten, if (option_debug && c->pattern_tree) { - 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 = :::[matched extension]\r\n"); - ast_cli(fd, " Where is a set of chars, any one of which should match the current character\r\n"); - ast_cli(fd, " : Y if this a pattern match (eg. _XZN[5-7]), N otherwise\r\n"); - ast_cli(fd, " : 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: \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 = :::[matched extension]\n"); + ast_cli(fd, " Where is a set of chars, any one of which should match the current character\n"); + ast_cli(fd, " : Y if this a pattern match (eg. _XZN[5-7]), N otherwise\n"); + ast_cli(fd, " : 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:\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"); cli_match_char_tree(c->pattern_tree, " ", fd); } @@ -5085,7 +5085,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();