From b02fd7a66d02301fb376bd98d1cdb7234511ca96 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Tue, 29 Mar 2005 06:18:58 +0000 Subject: Make sure ExecIf stuff returns properly (bug #3864) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5297 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_exec.c | 4 ++-- apps/app_while.c | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'apps') diff --git a/apps/app_exec.c b/apps/app_exec.c index 8a46c0797..f4e156927 100755 --- a/apps/app_exec.c +++ b/apps/app_exec.c @@ -37,7 +37,7 @@ static char *exec_descrip = "Exec(appname(arguments))\n" " Allows an arbitrary application to be invoked even when not\n" "hardcoded into the dialplan. Returns whatever value the\n" -"app returns or -2 when the app cannot be found.\n"; +"app returns or a non-zero value when the app cannot be found.\n"; STANDARD_LOCAL_USER; @@ -71,7 +71,7 @@ static int exec_exec(struct ast_channel *chan, void *data) res = pbx_exec(chan, app, args, 1); } else { ast_log(LOG_WARNING, "Could not find application (%s)\n", appname); - res = -2; + res = -1; } } } else { diff --git a/apps/app_while.c b/apps/app_while.c index e33bae52f..5822c2ff5 100755 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -29,7 +29,9 @@ static char *exec_app = "ExecIf"; static char *exec_desc = " ExecIF (||)\n" -"If is true, execute and return the result of ()\n\n"; +"If is true, execute and return the result of ().\n" +"If is true, but is not found, then the application\n" +"will return a non-zero value."; static char *exec_synopsis = "ExecIF (||)"; static char *start_app = "While"; @@ -73,8 +75,13 @@ static int execif_exec(struct ast_channel *chan, void *data) { } else mydata = ""; - if(ast_true(expr) && (app = pbx_findapp(myapp))) { - res = pbx_exec(chan, app, mydata, 1); + if (ast_true(expr)) { + if ((app = pbx_findapp(myapp))) { + res = pbx_exec(chan, app, mydata, 1); + } else { + ast_log(LOG_WARNING, "Count not find application! (%s)\n", myapp); + res = -1; + } } } else { ast_log(LOG_ERROR,"Invalid Syntax.\n"); -- cgit v1.2.3