summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-02-14 23:22:52 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-02-14 23:22:52 +0000
commit6081d770c3a2391f6cb1b7ce0cb9255bddf11ca2 (patch)
tree1e9496a6e532ac0a55d8fceec70d45b57ccb19dc
parentf1209276fd1c877e7560dcb9cddbbc71a2f5df45 (diff)
use a delimiter for 'show channels concise' that will not appear in the field contents (issue #6086, with UPGRADE.txt addition)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--UPGRADE.txt7
-rw-r--r--cli.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt
index e74835960..f0f43d402 100644
--- 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 16b606eaa..0afc66dd0 100644
--- 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"