diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-30 00:40:37 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-30 00:40:37 +0000 |
commit | 4ba8105024e42cb33d5c248de6177759decfeddb (patch) | |
tree | c17de2bc75cbe0df5f499d3ee4be429c1de6e90b /pbx/pbx_ael.c | |
parent | 7f852a6e30d45cf4c23252b993b1e84a24c903d9 (diff) |
A fix for 8661, where the CUT func needed to have comma args converted to vertical bars. I hope this change does little harm.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@49061 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/pbx_ael.c')
-rw-r--r-- | pbx/pbx_ael.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index b900ec0d2..deca33774 100644 --- 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); |