From e8b3830bf1091c3930cc7f624b0e6cef5e588b67 Mon Sep 17 00:00:00 2001
From: "Charles.Forsyth" <devnull@localhost>
Date: Tue, 15 Apr 2008 14:04:39 +0000
Subject: 20080415-1504

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

(limited to 'emu/Nt')

diff --git a/emu/Nt/os.c b/emu/Nt/os.c
index 4e527371..db93f642 100644
--- a/emu/Nt/os.c
+++ b/emu/Nt/os.c
@@ -12,15 +12,16 @@ int	SYS_SLEEP = 2;
 int SOCK_SELECT = 3;
 #define	MAXSLEEPERS	1500
 
-extern			int	cflag;
+extern	int	cflag;
 
-DWORD			PlatformId;
-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;
+DWORD	PlatformId;
+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	donetermset = 0;
+static	int sleepers = 0;
 
 	wchar_t	*widen(char *s);
 	char		*narrowen(wchar_t *ws);
@@ -356,11 +357,14 @@ termset(void)
 {
 	DWORD flag;
 
-	if(conh != INVALID_HANDLE_VALUE)
+	if(donetermset)
 		return;
+	donetermset = 1;
 	conh = GetStdHandle(STD_OUTPUT_HANDLE);
 	kbdh = GetStdHandle(STD_INPUT_HANDLE);
 	errh = GetStdHandle(STD_ERROR_HANDLE);
+	if(errh == INVALID_FILE_HANDLE)
+		errh = conh;
 
 	// The following will fail if kbdh not from console (e.g. a pipe)
 	// in which case we don't care
@@ -502,12 +506,11 @@ write(int fd, void *buf, uint n)
 	HANDLE h;
 
 	if(fd == 1 || fd == 2){
-		if(fd == 1){
-			if(conh == INVALID_HANDLE_VALUE){
-				termset();
-			}
+		if(!donetermset)
+			termset();
+		if(fd == 1)
 			h = conh;
-		}else
+		else
 			h = errh;
 		if(h == INVALID_HANDLE_VALUE)
 			return -1;
-- 
cgit v1.2.3