Systemcalls::Systemcalls(Starttype how, string const & what, Callbackfct cback)
{
- start = how;
- command = what;
- cbk = cback;
- pid = static_cast<pid_t>(0);
- retval = 0;
- startscript();
+ startscript(how, what, cback);
}
Systemcalls::~Systemcalls() {
switch (start) {
case System:
case SystemDontWait:
- retval = system(command.c_str());
+ retval = ::system(command.c_str());
callback();
break;
case Wait:
if (wait_for_death) {
// Here, we should add the PID to a list of
// waiting processes to kill if they are not
- // dead without tolerance seconds
+ // dead within tolerance seconds
// CHECK Implement this using the timer of
// the singleton systemcontroller (Asger)
{
pid_t cpid= ::fork();
if (cpid == 0) { // child
+ // TODO: Consider doing all of this before the fork, otherwise me
+ // might have troubles with multi-threaded access. (Baruch 20010228)
string childcommand(command); // copy
string rest = split(command, childcommand, ' ');
const int MAX_ARGV = 255;
char *syscmd = 0;
char *argv[MAX_ARGV];
int index = 0;
- bool more;
- do {
+ bool more = true;
+ while (more) {
childcommand = frontStrip(childcommand);
if (syscmd == 0) {
syscmd = new char[childcommand.length() + 1];
more = !rest.empty();
if (more)
rest = split(rest, childcommand, ' ');
- } while (more);
+ }
argv[index] = 0;
// replace by command. Expand using PATH-environment-var.
execvp(syscmd, argv);
// Reuse of instance
int Systemcalls::startscript(Starttype how, string const & what,
- Callbackfct cback)
+ Callbackfct cback)
{
start = how;
command = what;
int SimulateTimer;
void back(string cmd, int retval)
{
- printf("Done: %s gave %d\n", cmd.c_str(), retval);
+ ::printf("Done: %s gave %d\n", cmd.c_str(), retval);
SimulateTimer = 0;
}