diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-08 22:48:47 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-08 22:48:47 +0000 |
| commit | d0b2229ebdf2a6569b092d4adf4ad7a984b2ef15 (patch) | |
| tree | 9486a727b8e1260f7df7e56c9f2dbfa10936f2a4 /funcs | |
| parent | 908810e23f7815eccab97be7023a1aed15f89464 (diff) | |
merge up to branch 1.2 and re-enable automerge
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@53671 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_strings.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index 27c457dd4..00b6dd172 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -41,15 +41,18 @@ static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) { - char *varname, *varval, workspace[256]; + char *varname, *varsubst, varval[8192] = "", *varval2 = varval; char *delim = ast_strdupa(data); int fieldcount = 0; if (delim) { varname = strsep(&delim, "|"); - pbx_retrieve_variable(chan, varname, &varval, workspace, sizeof(workspace), NULL); + 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; |