xyzzy.src : fix call-process.

southly · Aug 31, 2010 · 8ee48de · 8ee48de
1 parent 827c5ca
commit 8ee48de
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,9 @@
+2010-08-31  NANRI Masaoki  <southly@gmail.com>
+
+	* src : fix call-process.
+	call-processの標準入力・標準出力等の指定がうまく設定されない現象がおき
+	ていたのを修正。
+
 2010-07-14  NANRI Masaoki  <southly@gmail.com>
 
 	* src : fix format "~T".

diff --git a/src/process.cc b/src/process.cc
@@ -243,11 +243,11 @@ Fcall_process (lisp cmd, lisp keys)
   if (!no_std_handles)
     {
       si.dwFlags |= STARTF_USESTDHANDLES;
-      si.hStdInput = hin.valid () ? hin : GetStdHandle (STD_INPUT_HANDLE);
-      si.hStdOutput = hout.valid () ? hout : GetStdHandle (STD_OUTPUT_HANDLE);
+      si.hStdInput = hin.valid () ? (HANDLE)hin : GetStdHandle (STD_INPUT_HANDLE);
+      si.hStdOutput = hout.valid () ? (HANDLE)hout : GetStdHandle (STD_OUTPUT_HANDLE);
       si.hStdError = (lstdout != lstderr
-                      ? herr.valid () ? herr : GetStdHandle (STD_ERROR_HANDLE)
-                      : hout.valid () ? hout : GetStdHandle (STD_ERROR_HANDLE));
+                      ? herr.valid () ? (HANDLE)herr : GetStdHandle (STD_ERROR_HANDLE)
+                      : hout.valid () ? (HANDLE)hout : GetStdHandle (STD_ERROR_HANDLE));
     }
 
   WINFS::SetCurrentDirectory (dir);