From 4b19845983f7f66290d261eaa390d2a1191c0c4f Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 1 Feb 2007 20:09:52 +0000
Subject: 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/branches/1.4@53075 f38db490-d61c-443f-a65b-d21fe96a405b
---
 funcs/func_strings.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'funcs/func_strings.c')

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index c90d047e1..d4db30adf 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -46,8 +46,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 static int function_fieldqty(struct ast_channel *chan, char *cmd,
 			     char *parse, char *buf, size_t len)
 {
-	const char *varval;
-	char *varval2 = NULL;
+	char *varname, *varsubst, varval[8192] = "", *varval2 = varval;
+	char *delim = ast_strdupa(data);
 	int fieldcount = 0;
 	AST_DECLARE_APP_ARGS(args,
 			     AST_APP_ARG(varname);
@@ -56,9 +56,10 @@ static int function_fieldqty(struct ast_channel *chan, char *cmd,
 
 	AST_STANDARD_APP_ARGS(args, parse);
 	if (args.delim) {
-		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 {
-- 
cgit v1.2.3