kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

use ast_app_separate_args to split arguments (issue #5686)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7251 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-12-01 02:33:58 +00:00
parent a32f75b800
commit 0a4d7e5068
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/app_externalivr.c
View File

@@ -43,6 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h" #include "asterisk/pbx.h"
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/linkedlists.h" #include "asterisk/linkedlists.h"
#include "asterisk/app.h"
static const char *tdesc = "External IVR Interface Application"; static const char *tdesc = "External IVR Interface Application";
@@ -250,10 +251,9 @@ static int app_exec(struct ast_channel *chan, void *data)
int res = -1; int res = -1;
int gen_active = 0; int gen_active = 0;
int pid; int pid;
char *command;
char *argv[32]; char *argv[32];
int argc = 1; int argc = 1;
char *buf; char *buf, *command;
FILE *child_commands = NULL; FILE *child_commands = NULL;
FILE *child_errors = NULL; FILE *child_errors = NULL;
FILE *child_events = NULL; FILE *child_events = NULL;
@@ -270,11 +270,13 @@ static int app_exec(struct ast_channel *chan, void *data)
} }
buf = ast_strdupa(data); buf = ast_strdupa(data);
command = strsep(&buf, "|"); if (!buf) {
memset(argv, 0, sizeof(argv) / sizeof(argv[0])); ast_log(LOG_ERROR, "Out of memory!\n");
argv[0] = command; LOCAL_USER_REMOVE(u);
while ((argc < 31) && (argv[argc++] = strsep(&buf, "|"))); return -1;
argv[argc] = NULL; }
argc = ast_app_separate_args(buf, '|', argv, sizeof(argv) / sizeof(argv[0]));
if (pipe(child_stdin)) { if (pipe(child_stdin)) {
ast_chan_log(LOG_WARNING, chan, "Could not create pipe for child input: %s\n", strerror(errno)); ast_chan_log(LOG_WARNING, chan, "Could not create pipe for child input: %s\n", strerror(errno));
@@ -316,8 +318,8 @@ static int app_exec(struct ast_channel *chan, void *data)
dup2(child_stderr[1], STDERR_FILENO); dup2(child_stderr[1], STDERR_FILENO);
for (i = STDERR_FILENO + 1; i < 1024; i++) for (i = STDERR_FILENO + 1; i < 1024; i++)
close(i); close(i);
execv(command, argv); execv(argv[0], argv);
fprintf(stderr, "Failed to execute '%s': %s\n", command, strerror(errno)); fprintf(stderr, "Failed to execute '%s': %s\n", argv[0], strerror(errno));
exit(1); exit(1);
} else { } else {
/* parent process */ /* parent process */