From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 1 Feb 2007 20:09:52 +0000 (+0000)
Subject: Merged revisions 53074 via svnmerge from
X-Git-Tag: 1.4.1~161
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a94d8f5bd8f18879974a37ae808d2265cc45c8d1;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.4@53075 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index c90d047e12..d4db30adfc 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 {