diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-01 20:07:35 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-01 20:07:35 +0000 |
| commit | ea9323864a06e481e6c2b26ae68f62c07bb00b55 (patch) | |
| tree | 72ef36caca36201682e000a4773dd0d4651970b3 /funcs | |
| parent | d1cbba26808852d22f9e2a4077a7286167d5654b (diff) | |
Bug 8965 - Allow FIELDQTY to work with both variables and dialplan functions
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@53074 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_strings.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index 6da95b54c..00b6dd172 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -41,17 +41,18 @@ static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) { - char *varname, *varval; + char *varname, *varsubst, varval[8192] = "", *varval2 = varval; char *delim = ast_strdupa(data); int fieldcount = 0; if (delim) { varname = strsep(&delim, "|"); - varval = pbx_builtin_getvar_helper(chan, varname); - if (varval) - varval = ast_strdupa(varval); + varsubst = alloca(strlen(varname) + 4); + + sprintf(varsubst, "${%s}", varname); + pbx_substitute_variables_helper(chan, varsubst, varval, sizeof(varval) - 1); if (delim) { - while (strsep(&varval, delim)) + while (strsep(&varval2, delim)) fieldcount++; } else if (!ast_strlen_zero(varval)) { fieldcount = 1; |