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

For the purpose of making the changed syntax to ExecIf easier to transition,

Browse Source 
allow the deprecated syntax (fixed for jmls on -dev).


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@120904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-06-06 17:34:21 +00:00
parent d0384ab3aa
commit 15dd5c0a50
1 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
apps/app_exec.c
View File

@@ -148,7 +148,7 @@ static int tryexec_exec(struct ast_channel *chan, void *data)
static int execif_exec(struct ast_channel *chan, void *data) static int execif_exec(struct ast_channel *chan, void *data)
{ {
int res = 0; int res = 0;
char *truedata = NULL, *falsedata = NULL, *end; char *truedata = NULL, *falsedata = NULL, *end, *firstcomma, *firstquestion;
struct ast_app *app = NULL; struct ast_app *app = NULL;
AST_DECLARE_APP_ARGS(expr, AST_DECLARE_APP_ARGS(expr,
AST_APP_ARG(expr); AST_APP_ARG(expr);
@@ -160,24 +160,49 @@ static int execif_exec(struct ast_channel *chan, void *data)
); );
char *parse = ast_strdupa(data); char *parse = ast_strdupa(data);
AST_NONSTANDARD_APP_ARGS(expr, parse, '?'); firstcomma = strchr(parse, ',');
if (ast_strlen_zero(expr.remainder)) { firstquestion = strchr(parse, '?');
ast_log(LOG_ERROR, "Usage: ExecIf(<expr>?<appiftrue>(<args>)[:<appiffalse>(<args)])\n");
return -1;
}
AST_NONSTANDARD_APP_ARGS(apps, expr.remainder, ':'); if ((firstcomma != NULL && firstquestion != NULL && firstcomma < firstquestion) || (firstquestion == NULL)) {
/* Deprecated syntax */
AST_DECLARE_APP_ARGS(depr,
AST_APP_ARG(expr);
AST_APP_ARG(appname);
AST_APP_ARG(appargs);
);
AST_STANDARD_APP_ARGS(depr, parse);
if (apps.t && (truedata = strchr(apps.t, '('))) { ast_log(LOG_WARNING, "Deprecated syntax found. Please upgrade to using ExecIf(<expr>?%s(%s))\n", depr.appname, depr.appargs);
*truedata++ = '\0';
if ((end = strrchr(truedata, ')')))
*end = '\0';
}
if (apps.f && (falsedata = strchr(apps.f, '('))) { /* Make the two syntaxes look the same */
*falsedata++ = '\0'; expr.expr = depr.expr;
if ((end = strrchr(falsedata, ')'))) apps.t = depr.appname;
*end = '\0'; apps.f = NULL;
truedata = depr.appargs;
} else {
/* Preferred syntax */
AST_NONSTANDARD_APP_ARGS(expr, parse, '?');
if (ast_strlen_zero(expr.remainder)) {
ast_log(LOG_ERROR, "Usage: ExecIf(<expr>?<appiftrue>(<args>)[:<appiffalse>(<args)])\n");
return -1;
}
AST_NONSTANDARD_APP_ARGS(apps, expr.remainder, ':');
if (apps.t && (truedata = strchr(apps.t, '('))) {
*truedata++ = '\0';
if ((end = strrchr(truedata, ')'))) {
*end = '\0';
}
}
if (apps.f && (falsedata = strchr(apps.f, '('))) {
*falsedata++ = '\0';
if ((end = strrchr(falsedata, ')'))) {
*end = '\0';
}
}
} }
if (pbx_checkcondition(expr.expr)) { if (pbx_checkcondition(expr.expr)) {