summaryrefslogtreecommitdiff
path: root/src/posix/sysExec.hpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2010-02-04 21:32:45 +0000
committerChristian Pointner <equinox@anytun.org>2010-02-04 21:32:45 +0000
commitd83412e9d4ff5a11eb128de5079c465a63709541 (patch)
tree7c1e83a2fe2c75556e9ec55d0f9917c987e4b62b /src/posix/sysExec.hpp
parentfixed build on posix (diff)
some cleanup
Diffstat (limited to 'src/posix/sysExec.hpp')
-rw-r--r--src/posix/sysExec.hpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/posix/sysExec.hpp b/src/posix/sysExec.hpp
index 359c1e4..48cd8f2 100644
--- a/src/posix/sysExec.hpp
+++ b/src/posix/sysExec.hpp
@@ -63,17 +63,17 @@ char** dupEnv(StringList const& env)
return evp;
}
-void SysExec::doExec(std::string const& script, StringVector const& args, StringList const& env)
+void SysExec::doExec(StringVector const& args, StringList const& env)
{
int pipefd[2];
if(pipe(pipefd) == -1) {
- cLog.msg(Log::PRIO_ERROR) << "executing script '" << script << "' pipe() error: " << AnytunErrno(errno);
+ cLog.msg(Log::PRIO_ERROR) << "executing script '" << script_ << "' pipe() error: " << AnytunErrno(errno);
return;
}
pid_ = fork();
if(pid_ == -1) {
- cLog.msg(Log::PRIO_ERROR) << "executing script '" << script << "' fork() error: " << AnytunErrno(errno);
+ cLog.msg(Log::PRIO_ERROR) << "executing script '" << script_ << "' fork() error: " << AnytunErrno(errno);
return;
}
@@ -99,8 +99,8 @@ void SysExec::doExec(std::string const& script, StringVector const& args, String
}
char** argv = new char*[args.size() + 2];
- argv[0] = new char[script.size() + 1];
- std::strcpy(argv[0], script.c_str());
+ argv[0] = new char[script_.size() + 1];
+ std::strcpy(argv[0], script_.c_str());
for(unsigned int i=0; i<args.size(); ++i) {
argv[i+1] = new char[args[i].size() + 1];
std::strcpy(argv[i+1], args[i].c_str());
@@ -109,7 +109,7 @@ void SysExec::doExec(std::string const& script, StringVector const& args, String
char** evp = dupEnv(env);
- execve(script.c_str(), argv, evp);
+ execve(script_.c_str(), argv, evp);
// if execve returns, an error occurred, but logging doesn't work
// because we closed all file descriptors, so just write errno to
// pipe and call exit
@@ -132,7 +132,7 @@ int SysExec::waitForScript()
if(select(pipefd_+1, &rfds, NULL, NULL, &tv) == 1) {
int err = 0;
if(read(pipefd_, (void*)(&err), sizeof(err)) >= static_cast<int>(sizeof(err))) {
- cLog.msg(Log::PRIO_NOTICE) << "script '" << script_ << "' exec() error: " << AnytunErrno(err);
+ cLog.msg(Log::PRIO_ERROR) << "script '" << script_ << "' exec() error: " << AnytunErrno(err);
close(pipefd_);
return_code_ = -1;
return return_code_;