From e8d17f9402b1c9a063767c85a6b3141752787e04 Mon Sep 17 00:00:00 2001
From: "Charles.Forsyth" <devnull@localhost>
Date: Sat, 22 Mar 2008 00:19:14 +0000
Subject: 20080322-0027

---
 emu/Nt/os.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'emu/Nt/os.c')

diff --git a/emu/Nt/os.c b/emu/Nt/os.c
index e3d2c663..4e527371 100644
--- a/emu/Nt/os.c
+++ b/emu/Nt/os.c
@@ -19,6 +19,7 @@ DWORD			consolestate;
 static			char*	path;
 static			HANDLE	kbdh = INVALID_HANDLE_VALUE;
 static			HANDLE	conh = INVALID_HANDLE_VALUE;
+static			HANDLE	errh = INVALID_HANDLE_VALUE;
 static			int sleepers = 0;
 
 	wchar_t	*widen(char *s);
@@ -359,6 +360,7 @@ termset(void)
 		return;
 	conh = GetStdHandle(STD_OUTPUT_HANDLE);
 	kbdh = GetStdHandle(STD_INPUT_HANDLE);
+	errh = GetStdHandle(STD_ERROR_HANDLE);
 
 	// The following will fail if kbdh not from console (e.g. a pipe)
 	// in which case we don't care
@@ -497,13 +499,19 @@ read(int fd, void *buf, uint n)
 int
 write(int fd, void *buf, uint n)
 {
+	HANDLE h;
+
 	if(fd == 1 || fd == 2){
-		if(conh == INVALID_HANDLE_VALUE){
-			termset();
-			if(conh == INVALID_HANDLE_VALUE)
-				return -1;
-		}
-		if(!WriteFile(conh, buf, n, &n, NULL))
+		if(fd == 1){
+			if(conh == INVALID_HANDLE_VALUE){
+				termset();
+			}
+			h = conh;
+		}else
+			h = errh;
+		if(h == INVALID_HANDLE_VALUE)
+			return -1;
+		if(!WriteFile(h, buf, n, &n, NULL))
 			return -1;
 		return n;
 	}
-- 
cgit v1.2.3