Changeset 22188 for main/trunk/greenstone2/runtime-src/src/recpt/os_process_windows.cpp

Timestamp:

2010-05-27T23:56:02+12:00 (14 years ago)

Author:

davidb

Message:

Some refinement of the testing framework for the os_process class

File:

• main/trunk/greenstone2/runtime-src/src/recpt/os_process_windows.cpp (modified) (6 diffs)

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

@@ -37 +37 @@
 #endif
 
+#include "text_t.h"
 #include "os_process_windows.h"
 
-//#include <stdio.h>
-
-osprocesswindows::osprocesswindows(char* cmdline)
-  : osprocess(cmdline)
-{}
 
 osprocesswindows::osprocesswindows(OSProcessPipeMode mode,
-                   char* prog_name, char* argv[]=NULL, 
+                   char* prog_name, char* argv[], 
                    char* envp[])
   : child_stdout_read_(NULL), child_stdin_write_(NULL),
@@ -91 +87 @@
   
   si.dwFlags |= STARTF_USESTDHANDLES;
-  
-  // any error messages in child process to to same place as parent process
+
+  
+  // any error messages in the child process goes to same place as parent
   // e.g. in the case of running as a CGI script, the Web server error log
   si.hStdError  = GetStdHandle(STD_ERROR_HANDLE); 
   
-  // Output from the child process comes to the parent process, down the
-  // OUT pipe
-  si.hStdOutput = child_stdout_write;
-  
-  // Input to the child process can be sent from the parent process, down the
-  // In pipe
-  si.hStdInput = child_stdin_read;
-  
-  text_t cmd_line = "";
+  if ((mode==uniRead) || (mode==biReadWrite)) {
+    // Output from the child process comes to the parent process, down the
+    // OUT pipe
+    si.hStdOutput = child_stdout_write;
+  }
+  else {
+    // uniWrite
+    // Output from the chlid process goes to the same place as parent
+    si.hStdOutput  = GetStdHandle(STD_OUTPUT_HANDLE); 
+  }
+  
+  if ((mode==uniWrite) || (mode==biReadWrite)) {
+    // Input to the child process can be sent from the parent process, down the
+    // In pipe
+    si.hStdInput = child_stdin_read;
+  }
+  else {
+    // uniRead
+
+    // Input to the child process comes from same place as parent ?!?
+    si.hStdInput  = GetStdHandle(STD_INPUT_HANDLE); 
+  }
+  
+  text_t cmd_line = prog_name;
   if (argv != NULL) {
-    int i=0;
+    int i=1;
     while (argv[i] != NULL) {
-      if (i>0) {
-    cmd_line += " ";
-      }
-      cmd_line += "\"" + argv[i] + "\"";
+      cmd_line += " \"";
+      cmd_line += argv[i];
+      cmd_line += "\"";
       i++;
     }
@@ -162 +173 @@
 
 
-int osprocesswindows::write(const char* buffer, const int buffer_len) 
+int osprocesswindows::write(char* buffer, const int buffer_len) 
 { 
   DWORD actual_write_len;
@@ -195 +206 @@
 
   
-bool osprocessunix::close_write_pipe(OSProcessWarnStatus warn_status)
+bool osprocesswindows::close_write_pipe(OSProcessWarnStatus warn_status)
 {
   bool write_close_ok = true;
 
-  if (child_stdout_read_ != NULL) {
+  if (child_stdin_write_ != NULL) {
 
     write_close_ok = CloseHandle(child_stdin_write_);
@@ -211 +222 @@
     }
   }
-  else if (warning_status == withWarning) {
+  else if (warn_status == withWarning) {
     cerr << "osprocesswindows::close_write_pipe(): Warning - Tried to close already closed pipe" << endl;
   }
@@ -219 +230 @@
 
 
-bool osprocessunix::close_read_pipe(OSProcessWarnStatus warn_status)
+bool osprocesswindows::close_read_pipe(OSProcessWarnStatus warn_status)
 {
   bool read_close_ok = true;