Changeset 22183 for main/trunk/greenstone2/runtime-src/src/recpt/os_process_unix.cpp

Timestamp:

2010-05-27T11:32:46+12:00 (14 years ago)

Author:

davidb

Message:

Further expansion of functionality (and testing) or os_process classes

File:

• main/trunk/greenstone2/runtime-src/src/recpt/os_process_unix.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/os_process_unix.cpp

@@ -38 +38 @@
 
 #include <unistd.h>
+#include <sys/wait.h>
 
 #include "os_process_unix.h"
 
-osprocessunix::osprocessunix(char* cmdline, OSProcessPipeMode mode)
+osprocessunix::osprocessunix(OSProcessPipeMode mode,
+                 char* prog_name, char* argv[], char* envp[])
   : child_stdout_read_(-1), child_stdin_write_(-1),
-    osprocess(cmdline,mode)
+    osprocess(mode,prog_name,argv,envp)
 {
   
@@ -112 +114 @@
 
     
-    // execvp?
-    execve(cmdline, NULL, NULL);
-
+    // Used to be execve(), but this would appear not to search path for
+    // 'prog_name'. The alternative execvp() does search PATH and so is
+    // more compatible with how CreateProcess works for Windows
+
+    // Need to connect envp with externally defined '**environ' ??
+
+    execvp(prog_name,argv);
     
   }
@@ -178 +184 @@
 
 
-  
+void osprocessunix::wait()
+{
+  int child_status;
+  //cerr << "**** waiting ..." << endl;
+  ::waitpid(pid_,&child_status,0);
+
+  //cerr << "*** exit status = " << WEXITSTATUS(child_status) << endl;
+
+  //cerr << "**** done" << endl;
+}
+
+
 bool osprocessunix::close_write_pipe(OSProcessWarnStatus warn_status)
 {