kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 11:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix execiftime and include some code cleanup while we're at it (bug #4380)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6343 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-08-19 07:12:53 +00:00
parent 47334c3193
commit 6e9eaaf217
1 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
pbx.c
View File

@@ -5319,6 +5319,7 @@ static int pbx_builtin_execiftime(struct ast_channel *chan, void *data)
int res = 0; int res = 0;
char *ptr1, *ptr2; char *ptr1, *ptr2;
struct ast_timing timing; struct ast_timing timing;
struct ast_app *app;
const char *usage = "ExecIfTime requires an argument:\n <time range>|<days of week>|<days of month>|<months>?<appname>[|<appargs>]"; const char *usage = "ExecIfTime requires an argument:\n <time range>|<days of week>|<days of month>|<months>?<appname>[|<appargs>]";
if (!data || ast_strlen_zero(data)) { if (!data || ast_strlen_zero(data)) {
@@ -5326,38 +5327,41 @@ static int pbx_builtin_execiftime(struct ast_channel *chan, void *data)
return -1; return -1;
} }
if ((ptr1 = ast_strdupa((char *) data))) { ptr1 = ast_strdupa(data);
ptr2 = ptr1;
/* Separate the Application data ptr1 is the time spec ptr2 is the app|data*/
strsep(&ptr2,"?");
if(!(res = ast_build_timing(&timing, ptr1))) {
ast_log(LOG_WARNING, "Invalid Time Spec: %s\nCorrect usage: %s\n", ptr1, usage);
res = -1;
}
if (!res && ast_check_timing(&timing)) { if (!ptr1) {
if (ptr2) { ast_log(LOG_ERROR, "Out of Memory!\n");
/* ptr2 is now the app name return -1;
we're done with ptr1 now so recycle it and use it to point to the app args*/ }
struct ast_app *app;
if((ptr1 = strchr(ptr2, '|'))) { ptr2 = ptr1;
*ptr1 = '\0'; /* Separate the Application data ptr1 is the time spec ptr2 is the app|data */
ptr1++; strsep(&ptr2,"?");
} if(!ast_build_timing(&timing, ptr1)) {
if ((app = pbx_findapp(ptr2))) { ast_log(LOG_WARNING, "Invalid Time Spec: %s\nCorrect usage: %s\n", ptr1, usage);
res = pbx_exec(chan, app, ptr1 ? ptr1 : "", 1);
} else {
ast_log(LOG_WARNING, "Cannot locate application %s\n", ptr2);
res = -1;
}
} else {
ast_log(LOG_WARNING, "%s\n", usage);
}
}
} else {
ast_log(LOG_ERROR, "Memory Error!\n");
res = -1; res = -1;
} }
if (!res && ast_check_timing(&timing)) {
if (!ptr2) {
ast_log(LOG_WARNING, "%s\n", usage);
}
/* ptr2 is now the app name
we're done with ptr1 now so recycle it and use it to point to the app args */
if((ptr1 = strchr(ptr2, '|'))) {
*ptr1 = '\0';
ptr1++;
}
if ((app = pbx_findapp(ptr2))) {
res = pbx_exec(chan, app, ptr1 ? ptr1 : "", 1);
} else {
ast_log(LOG_WARNING, "Cannot locate application %s\n", ptr2);
res = -1;
}
}
return res; return res;
} }