diff options
Diffstat (limited to 'funcs/func_logic.c')
| -rw-r--r-- | funcs/func_logic.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/funcs/func_logic.c b/funcs/func_logic.c index daf50142f..0463f8e73 100644 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -91,27 +91,30 @@ static int iftime(struct ast_channel *chan, char *cmd, char *data, char *buf, static int acf_if(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) { - char *expr; - char *iftrue; - char *iffalse; - - data = ast_strip_quoted(data, "\"", "\""); - expr = strsep(&data, "?"); - iftrue = strsep(&data, ":"); - iffalse = data; - - if (ast_strlen_zero(expr) || !(iftrue || iffalse)) { + AST_DECLARE_APP_ARGS(args1, + AST_APP_ARG(expr); + AST_APP_ARG(remainder); + ); + AST_DECLARE_APP_ARGS(args2, + AST_APP_ARG(iftrue); + AST_APP_ARG(iffalse); + ); + + AST_NONSTANDARD_APP_ARGS(args1, data, '?'); + AST_NONSTANDARD_APP_ARGS(args2, args1.remainder, ':'); + + if (ast_strlen_zero(args1.expr) || !(args2.iftrue || args2.iffalse)) { ast_log(LOG_WARNING, "Syntax IF(<expr>?[<true>][:<false>])\n"); return -1; } - expr = ast_strip(expr); - if (iftrue) - iftrue = ast_strip_quoted(iftrue, "\"", "\""); - if (iffalse) - iffalse = ast_strip_quoted(iffalse, "\"", "\""); + args1.expr = ast_strip(args1.expr); + if (args2.iftrue) + args2.iftrue = ast_strip(args2.iftrue); + if (args2.iffalse) + args2.iffalse = ast_strip(args2.iffalse); - ast_copy_string(buf, pbx_checkcondition(expr) ? (S_OR(iftrue, "")) : (S_OR(iffalse, "")), len); + ast_copy_string(buf, pbx_checkcondition(args1.expr) ? (S_OR(args2.iftrue, "")) : (S_OR(args2.iffalse, "")), len); return 0; } |