[asterisk-commits] trunk r10085 - in /trunk: UPGRADE.txt cli.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Feb 14 17:22:52 2006
New Revision: 10085

URL: http://svn.digium.com/view/asterisk?rev=10085&view=rev
Log:
use a delimiter for 'show channels concise' that will not appear in the field contents (issue #6086, with UPGRADE.txt addition)

Modified:
    trunk/UPGRADE.txt
    trunk/cli.c

Modified: trunk/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/trunk/UPGRADE.txt?rev=10085&r1=10084&r2=10085&view=diff
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Tue Feb 14 17:22:52 2006
@@ -1,5 +1,12 @@
 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:
 

Modified: trunk/cli.c
URL: http://svn.digium.com/view/asterisk/trunk/cli.c?rev=10085&r1=10084&r2=10085&view=diff
==============================================================================
--- trunk/cli.c (original)
+++ trunk/cli.c Tue Feb 14 17:22:52 2006
@@ -379,7 +379,7 @@
 {
 #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"