aboutsummaryrefslogtreecommitdiffstats
path: root/funcs
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-02-01 20:12:56 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-02-01 20:12:56 +0000
commit9fdb2806c1b50f6c6e687dbd9d752b407f15634d (patch)
treea04fc0d3188dfc0f30925ca3660aa19040335788 /funcs
parent2ee8d12958d15a9e3c87ca7d99f91e8b9a4458fe (diff)
Merged revisions 53075 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r53075 | tilghman | 2007-02-01 14:09:52 -0600 (Thu, 01 Feb 2007) | 10 lines Merged revisions 53074 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r53074 | tilghman | 2007-02-01 14:07:35 -0600 (Thu, 01 Feb 2007) | 2 lines Bug 8965 - Allow FIELDQTY to work with both variables and dialplan functions ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@53076 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r--funcs/func_strings.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index c7fc485fd..ff3e577c5 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -48,8 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
static int function_fieldqty(struct ast_channel *chan, const char *cmd,
char *parse, char *buf, size_t len)
{
- const char *varval;
- char *varval2 = NULL;
+ char *varname, *varsubst, varval[8192] = "", *varval2 = varval;
int fieldcount = 0;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(varname);
@@ -68,9 +67,10 @@ static int function_fieldqty(struct ast_channel *chan, const char *cmd,
else
ast_copy_string(args.delim, "-", 2);
}
- varval = pbx_builtin_getvar_helper(chan, args.varname);
- if (varval)
- varval2 = ast_strdupa(varval);
+ varsubst = alloca(strlen(varname) + 4);
+
+ sprintf(varsubst, "${%s}", varname);
+ pbx_substitute_variables_helper(chan, varsubst, varval, sizeof(varval) - 1);
while (strsep(&varval2, args.delim))
fieldcount++;
} else {