From 0ddf06d9e64c4a0a6509a17e4e56c0ea16dfb321 Mon Sep 17 00:00:00 2001
From: Sebastien Marineau <sebastien@qnx.com>
Date: Fri, 9 Aug 2002 02:39:11 +0000
Subject: [PATCH] Patch from Thomas Fletcher to fix environment reading on
 win98

---
 .../org/eclipse/cdt/utils/spawner/EnvironmentReader.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
index 8a3f0903468..475b307e8e9 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
@@ -28,9 +28,13 @@ public class EnvironmentReader {
 		rawVars = new Vector(32);
 		String command = "env";
 		InputStream	in = null;
+		boolean check_ready = false;
 		try {
 			if (OS.indexOf("windows 9") > -1) {
 				command = "command.com /c set";
+				//The buffered stream doesn't always like windows 98
+				check_ready = true;
+ 
 			} else if ((OS.indexOf("nt") > -1) || (OS.indexOf("windows 2000") > -1)) {
 				command = "cmd.exe /c set";
 			}
@@ -48,6 +52,9 @@ public class EnvironmentReader {
 				} else {
 					envVars.setProperty(line, "");
 				}
+				if(check_ready && br.ready() == false) {
+					break;
+				}
 			}
 		} catch (IOException e) {
 		} finally {