mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-30 20:35:38 +02:00
Code Issues Wiki Activity

2005-03-30 Alain Magloire

Browse source 
Patch from Alex Chapiro, tentative fix for PR 89662
	* utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
This commit is contained in:
Alain Magloire 2005-03-31 19:38:31 +00:00
parent 6c97bf5a19
commit 9a6a9c9350
2 changed files with 107 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/ChangeLog
View file

@ -1,3 +1,7 @@
2005-03-30 Alain Magloire
Patch from Alex Chapiro, tentative fix for PR 89662
* utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
2005-03-30 Alain Magloire 2005-03-30 Alain Magloire
Delay the processing/parsing of the WorkingCopy when creating the workingcopy Delay the processing/parsing of the WorkingCopy when creating the workingcopy
This should speed the opening of the CEditor. This should speed the opening of the CEditor.

13
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
View file

@ -13,8 +13,9 @@ package org.eclipse.cdt.utils.spawner;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.ByteOrder;
import java.util.Properties; import java.util.Properties;
import java.util.Vector; import java.util.Vector;
@ -35,6 +36,7 @@ public class EnvironmentReader {
InputStream in = null; InputStream in = null;
boolean check_ready = false; boolean check_ready = false;
boolean isWin32 = false; boolean isWin32 = false;
String charSet = null;
if (OS.startsWith("windows 9") || OS.startsWith("windows me")) { // 95, 98, me //$NON-NLS-1$ //$NON-NLS-2$ if (OS.startsWith("windows 9") || OS.startsWith("windows me")) { // 95, 98, me //$NON-NLS-1$ //$NON-NLS-2$
command = "command.com /c set"; //$NON-NLS-1$ command = "command.com /c set"; //$NON-NLS-1$
//The buffered stream doesn't always like windows 98 //The buffered stream doesn't always like windows 98
@ -42,13 +44,18 @@ public class EnvironmentReader {
isWin32 = true; isWin32 = true;
} else } else
if (OS.startsWith("windows ")) { //$NON-NLS-1$ if (OS.startsWith("windows ")) { //$NON-NLS-1$
command = "cmd.exe /c set"; //$NON-NLS-1$ command = "cmd.exe /u /c set"; //$NON-NLS-1$
isWin32 = true; isWin32 = true;
charSet = "UTF-16" + (ByteOrder.BIG_ENDIAN.equals(ByteOrder.nativeOrder()) ? "BE" : "LE"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
} }
try { try {
p = ProcessFactory.getFactory().exec(command); p = ProcessFactory.getFactory().exec(command);
in = p.getInputStream(); in = p.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(in)); BufferedReader br;
if(null == charSet)
br = new BufferedReader(new InputStreamReader(in));
else
br = new BufferedReader(new InputStreamReader(in, charSet));
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
rawVars.add(line); rawVars.add(line);