[svn-commits] murf: trunk r57438 - in /trunk: ./ pbx/pbx_ael.c utils/ael_main.c

[svn-commits at lists.digium.com]

Author: murf
Date: Thu Mar  1 23:57:06 2007
New Revision: 57438

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57438
Log:
Merged revisions 57426 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57426 | murf | 2007-03-01 22:21:36 -0700 (Thu, 01 Mar 2007) | 1 line

I almost had comma escapes right, but 9184 points out the problem-- the escape is removed by pbx_config, and pbx_ael should also, before sending it down into the pbx engine. Also, you have to insert it back in, if you are generating extensions.conf code from the AEL.
........

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_ael.c
    trunk/utils/ael_main.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_ael.c?view=diff&rev=57438&r1=57437&r2=57438
==============================================================================
--- trunk/pbx/pbx_ael.c (original)
+++ trunk/pbx/pbx_ael.c Thu Mar  1 23:57:06 2007
@@ -155,11 +155,19 @@
 static void substitute_commas(char *str)
 {
 	char *p = str;
+	
 	while (p && *p)
 	{
 		if (*p == ',' && ((p != str && *(p-1) != '\\')
 				|| p == str))
 			*p = '|';
+		if (*p == '\\' && *(p+1) == ',') { /* learning experience: the '\,' is turned into just ',' by pbx_config; So we need to do the same */
+			char *q = p;
+			while (*q) {  /* move the ',' and everything after it up 1 char */
+				*q = *(q+1);
+				q++;
+			}
+		}
 		p++;
 	}
 }

Modified: trunk/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/ael_main.c?view=diff&rev=57438&r1=57437&r2=57438
==============================================================================
--- trunk/utils/ael_main.c (original)
+++ trunk/utils/ael_main.c Thu Mar  1 23:57:06 2007
@@ -181,6 +181,8 @@
 
 	if( dump_extensions && dumpfile ) {
 		struct namelist *n;
+		char *data2,*data3=0;
+		int commacount = 0;
 
 		if( FIRST_TIME ) {
 			FIRST_TIME = 0;
@@ -215,10 +217,42 @@
 			filter_newlines((char*)data);
 			filter_leading_space_from_exprs((char*)data);
 
+			/* compiling turns commas into vertical bars in the app data, and also removes the backslash from before escaped commas;
+			   we have to restore the escaping backslash in front of any commas; the vertical bars are OK to leave as-is */
+			for (data2 = data; *data2; data2++) {
+				if (*data2 == ',')
+					commacount++;  /* we need to know how much bigger the string will grow-- one backslash for each comma  */
+			}
+			if (commacount) 
+			{
+				char *d3,*d4;
+				
+				data2 = (char*)malloc(strlen(data)+commacount+1);
+				data3 = data;
+				d3 = data;
+				d4 = data2;
+				while (*d3) {
+					if (*d3 == ',') {
+						*d4++ = '\\'; /* put a backslash in front of each comma */
+						*d4++ = *d3++;
+					} else
+						*d4++ = *d3++;  /* or just copy the char */
+				}
+				*d4++ = 0;  /* cap off the new string */
+				data = data2;
+			} else
+				data2 = 0;
+			
 			if( strcmp(label,"(null)") != 0  )
 				fprintf(dumpfile,"exten => %s,%d(%s),%s(%s)\n", extension, priority, label, application, (char*)data);
 			else
 				fprintf(dumpfile,"exten => %s,%d,%s(%s)\n", extension, priority, application, (char*)data);
+
+			if (data2) {
+				free(data2);
+				data2 = 0;
+				data = data3; /* restore data to pre-messedup state */
+			}
 
 		} else {