kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 53075 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/trunk@53076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-02-01 20:12:56 +00:00
parent 721c7b3372
commit 0e209d5e1c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
funcs/func_strings.c
View File

@@ -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 {