#include "program.h"
#include <vector>
#include <string.h>
+#include <stdio.h>
+
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+
using namespace std;
{
-
+ /*
vector<char*> args;
if (executablePath[0] != '"')
args.push_back((char*)executablePath);
}
while (token != NULL);
- char ** arguments = new char*[args.size()+2];
- for (unsigned int i=0; i < args.size(); ++i)
- arguments[i] = args[i];
-
+ char ** arguments = NULL;
+ if (args.size() > 0)
+ {
+ arguments = new char*[args.size()];
+ for (unsigned int i=0; i < args.size(); ++i)
+ arguments[i] = args[i];
+ }
+ */
//See if file exists and is executable...
if (access(executablePath, X_OK) != 0)
{
if (access(executablePath, X_OK) == 0) //Check we STILL have permissions to start the file
- execv(executablePath,arguments); ///Replace process with desired executable
-
+ {
+ execl(executablePath, executablePath, (char*)(NULL)); ///Replace process with desired executable
+ //execv(executablePath,arguments); ///Replace process with desired executable
+ }
+ perror("execv error:\n");
fprintf(stderr, "Program::Program - Could not run program \"%s\"!\n", executablePath);
exit(EXIT_FAILURE); //We will probably have to terminate the whole program if this happens
}
if (!Running() || timeout == 0)
return false;
+ struct timeval tv;
+ fd_set readfds;
+
+ tv.tv_sec = (int)(timeout);
+ tv.tv_usec = (timeout - (double)((int)timeout)) * 1000000;
+
+ int fd = fileno(input);
+
+ FD_ZERO(&readfds);
+ FD_SET(fd, &readfds);
+
+ select(fd+1, &readfds, NULL, NULL, &tv);
+
+ if (!FD_ISSET(fd, &readfds))
+ return false; //Timed out
+ //fprintf(stderr, "Got message!\n");
+ for (char c = fgetc(input); c != '\n' && (int)(c) != EOF; c = fgetc(input))
+ {
+ //fprintf(stderr, "%c", c);
+ buffer += c;
+ }
+ //fprintf(stderr, "%s\n", buffer.c_str());
+ return true;
+
+ /* Old way, using threads, which apparently is terrible
assert(&buffer != NULL);
GetterThread getterThread(input, buffer);
assert(&(getterThread.buffer) != NULL);
if (buffer.size() == 1 && buffer[0] == EOF)
return false;
return true;
-
+ */
}