kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 08:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug 8965 - Allow FIELDQTY to work with both variables and dialplan functions

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@53074 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-02-01 20:07:35 +00:00
parent bc926d7f33
commit f8bed34be9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
funcs/func_strings.c
View File

@@ -41,17 +41,18 @@
static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len)
{ {
char *varname, *varval; char *varname, *varsubst, varval[8192] = "", *varval2 = varval;
char *delim = ast_strdupa(data); char *delim = ast_strdupa(data);
int fieldcount = 0; int fieldcount = 0;
if (delim) { if (delim) {
varname = strsep(&delim, "|"); varname = strsep(&delim, "|");
varval = pbx_builtin_getvar_helper(chan, varname); varsubst = alloca(strlen(varname) + 4);
if (varval)
varval = ast_strdupa(varval); sprintf(varsubst, "${%s}", varname);
pbx_substitute_variables_helper(chan, varsubst, varval, sizeof(varval) - 1);
if (delim) { if (delim) {
while (strsep(&varval, delim)) while (strsep(&varval2, delim))
fieldcount++; fieldcount++;
} else if (!ast_strlen_zero(varval)) { } else if (!ast_strlen_zero(varval)) {
fieldcount = 1; fieldcount = 1;