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

Unbreak expression handling from addition of function variables

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-03-05 05:21:45 +00:00
parent 0eb1f2ec44
commit d42e070073
1 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pbx.c
View File

@@ -1224,7 +1224,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, const ch
int length;
char workspace[4096];
char ltmp[4096], var[4096];
char *nextvar, *nextexp, *nextfunc;
char *nextvar, *nextexp, *nextfunc, *nextthing;
char *vars, *vare;
int pos, brackets, needsub, len, needfunc;
@@ -1234,35 +1234,23 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, const ch
while(!ast_strlen_zero(whereweare) && count) {
/* Assume we're copying the whole remaining string */
pos = strlen(whereweare);
/* Look for a variable */
nextvar = strstr(whereweare, "${");
/* Look for an expression */
nextexp = strstr(whereweare, "$[");
/* Look for a function */
nextfunc = strstr(whereweare, "$(");
/* Pick the first one only */
len = 0;
if (nextvar)
len++;
if(nextexp)
len++;
if(nextfunc)
len++;
if (len > 1) {
if(nextfunc) {
nextvar = nextexp = NULL;
} else if (nextvar) {
nextexp = nextfunc = NULL;
} else if (nextexp) {
nextvar = nextfunc = NULL;
nextvar = NULL;
nextexp = NULL;
nextfunc = NULL;
nextthing = strchr(whereweare, '$');
if (nextthing) {
switch(nextthing[1]) {
case '{':
nextvar = nextthing;
break;
case '[':
nextexp = nextthing;
break;
case '(':
nextfunc = nextthing;
break;
}
}
/* If there is one, we only go that far */
if (nextvar)
pos = nextvar - whereweare;