A fix for 8661, where the CUT func needed to have comma args converted to vertical...

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

diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index b900ec0d27e41a4974fe0c6373fca7015d4095ca..deca337742caedb32b27098694f72212f2e3d7ce 100644 (file)
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -145,6 +145,20 @@ static void fix_gotos_in_extensions(struct ael_extension *exten);
 static pval *get_extension_or_contxt(pval *p);
 static pval *get_contxt(pval *p);
 static void remove_spaces_before_equals(char *str);
+static void substitute_commas(char *str);
+
+/* I am adding this code to substitute commas with vertbars in the args to apps */
+static void substitute_commas(char *str)
+{
+       char *p = str;
+       while (p && *p)
+       {
+               if (*p == ',' && ((p != str && *(p-1) != '\\')
+                               || p == str))
+                       *p = '|';
+               p++;
+       }
+}
 
 
 /* PRETTY PRINTER FOR AEL:  ============================================================================= */
@@ -204,7 +218,7 @@ static void print_pval(FILE *fin, pval *item, int depth)
                fprintf(fin,"%s(", item->u1.str);
                for (lp=item->u2.arglist; lp; lp=lp->next) {
                        if ( lp != item->u2.arglist )
-                               fprintf(fin,", ");
+                               fprintf(fin,",");
                        fprintf(fin,"%s", lp->u1.str);
                }
                fprintf(fin,");\n");
@@ -3244,6 +3258,7 @@ static void gen_prios(struct ael_extension *exten, char *label, pval *statement,
                        for (p2 = p->u2.arglist; p2; p2 = p2->next) {
                                if (p2 != p->u2.arglist )
                                        strcat(buf1,"|");
+                               substitute_commas(p2->u1.str);
                                strcat(buf1,p2->u1.str);
                        }
                        pr->app = strdup(p->u1.str);