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

Allow the PUSH and UNSHIFT functions to set inheritable channel variables.

Browse Source 
........

Merged revisions 416500 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 416501 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 416502 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@416503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2014-06-17 18:45:11 +00:00
parent 351db2033c
commit fc52fd8884
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
funcs/func_strings.c
View File

@@ -1610,6 +1610,7 @@ static int unshift_push(struct ast_channel *chan, const char *cmd, char *data, c
AST_APP_ARG(var); AST_APP_ARG(var);
AST_APP_ARG(delimiter); AST_APP_ARG(delimiter);
); );
const char *stripped_var;
if (!(buf = ast_str_thread_get(&result_buf, 16)) || if (!(buf = ast_str_thread_get(&result_buf, 16)) ||
!(previous_value = ast_str_thread_get(&tmp_buf, 16))) { !(previous_value = ast_str_thread_get(&tmp_buf, 16))) {
@@ -1627,8 +1628,15 @@ static int unshift_push(struct ast_channel *chan, const char *cmd, char *data, c
ast_get_encoded_char(args.delimiter, delimiter, &unused); ast_get_encoded_char(args.delimiter, delimiter, &unused);
} }
varsubst = ast_alloca(strlen(args.var) + 4); /* UNSHIFT and PUSH act as ways of setting a variable, so we need to be
sprintf(varsubst, "${%s}", args.var); * sure to skip leading underscores if they appear. However, we only want
* to skip up to two since that is the maximum number that can be used to
* indicate variable inheritance. Any further underscores are part of the
* variable name.
*/
stripped_var = args.var + MIN(strspn(args.var, "_"), 2);
varsubst = ast_alloca(strlen(stripped_var) + 4);
sprintf(varsubst, "${%s}", stripped_var);
ast_str_substitute_variables(&previous_value, 0, chan, varsubst); ast_str_substitute_variables(&previous_value, 0, chan, varsubst);
if (!ast_str_strlen(previous_value)) { if (!ast_str_strlen(previous_value)) {