use a delimiter for 'show channels concise' that will not appear in the field content...

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

diff --git a/UPGRADE.txt b/UPGRADE.txt
index e74835960982f4538c8054bbf053dadcd8ff5962..f0f43d4029f0d211bcec4c776a146069a02ec425 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -1,6 +1,13 @@
 Information for Upgrading From Previous Asterisk Releases
 =========================================================
 
+Command Line Interface:
+
+* 'show channels concise', designed to be used by applications that will parse
+  its output, previously used ':' characters to separate fields. However, some
+  of those fields can easily contain that character, making the output not
+  parseable. The delimiter has been changed to '!'.
+
 Applications:
 
 * In previous Asterisk releases, many applications would jump to priority n+101

diff --git a/cli.c b/cli.c
index 16b606eaa46d842805cf7c79f3e3b4298421c3ef..0afc66dd0d9bab14b4d235757ba88e13e35111a4 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -379,7 +379,7 @@ static int handle_chanlist(int fd, int argc, char *argv[])
 {
 #define FORMAT_STRING  "%-20.20s %-20.20s %-7.7s %-30.30s\n"
 #define FORMAT_STRING2 "%-20.20s %-20.20s %-7.7s %-30.30s\n"
-#define CONCISE_FORMAT_STRING  "%s:%s:%s:%d:%s:%s:%s:%s:%s:%d:%s:%s\n"
+#define CONCISE_FORMAT_STRING  "%s!%s!%s!%d!%s!%s!%s!%s!%s!%d!%s!%s\n"
 #define VERBOSE_FORMAT_STRING  "%-20.20s %-20.20s %-16.16s %4d %-7.7s %-12.12s %-25.25s %-15.15s %8.8s %-11.11s %-20.20s\n"
 #define VERBOSE_FORMAT_STRING2 "%-20.20s %-20.20s %-16.16s %-4.4s %-7.7s %-12.12s %-25.25s %-15.15s %8.8s %-11.11s %-20.20s\n"