Changeset 22183 for main/trunk/greenstone2/runtime-src/src/recpt/os_process_windows.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_windows.cpp (modified) (5 diffs)

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

@@ -45 +45 @@
 {}
 
-osprocesswindows::osprocesswindows(char* cmdline, OSProcessPipeMode mode)
+osprocesswindows::osprocesswindows(OSProcessPipeMode mode,
+                   char* prog_name, char* argv[]=NULL, 
+                   char* envp[])
   : child_stdout_read_(NULL), child_stdin_write_(NULL),
-    osprocess(cmdline,mode)
+    osprocess(mode,prog_name,argv,envp)
 {
   HANDLE child_stdin_read = NULL;
@@ -102 +104 @@
   si.hStdInput = child_stdin_read;
   
+  text_t cmd_line = "";
+  if (argv != NULL) {
+    int i=0;
+    while (argv[i] != NULL) {
+      if (i>0) {
+    cmd_line += " ";
+      }
+      cmd_line += "\"" + argv[i] + "\"";
+      i++;
+    }
+  }
+
+  char* cmd_line_cstr = cmd_line.getcstr();
+
   int rv = CreateProcess(NULL,    // no application name
-             cmdline, 
+             cmd_line_cstr, 
              NULL, 
              NULL,    // no process or thread security attribues 
@@ -112 +128 @@
              &si, 
              &pi_);    // process info filled out as a result
+
+  delete [] cmd_line_cstr;
+
   if (!rv) {
-    cerr << "os_process_windows(): Error creating process" << endl;
+    cerr << "os_process_windows(): Error creating child process" << endl;
   }
 
@@ -119 +138 @@
 
   if (!CloseHandle(child_stdout_write)) {
-    cerr <<  "os_process_windows(): Error closing StdOutWr Handle" << endl;
+    cerr <<  "os_process_windows(): Error closing child's StdOut Write Handle" << endl;
   }
 
   if (!CloseHandle(child_stdin_read)) {
-    cerr << "os_process_windows(): Error closing StdInRd Handle" << endl;
+    cerr << "os_process_windows(): Error closing child's StdIn Read Handle" << endl;
   }
 }  
@@ -170 +189 @@
 
 
+void osprocesswindows::wait()
+{
+  WaitForSingleObject(pi_.hProcess, INFINITE);
+}