mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-03 22:35:43 +02:00
Code Issues Wiki Activity

Fix handling of exported bash functions in environment

Browse source
This commit is contained in:
Anton Leherbauer 2015-12-16 09:34:00 +01:00
parent 44f0083f72
commit e7939cc360
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/utils/Env.java
View file

@ -78,8 +78,10 @@ public class Env {
// The full provided variable in form "name=value"
String envpPart = envp[i];
// Split the variable
String[] parts = envpPart.split("=");//$NON-NLS-1$
String name = parts[0].trim();
int eqIdx = envpPart.indexOf('=');
if (eqIdx < 1)
continue;
String name = envpPart.substring(0, eqIdx);
// Map the variable name to the real environment name (Windows only)
if (Platform.OS_WIN32.equals(Platform.getOS())) {
if (k2n.containsKey(name.toLowerCase())) {
@ -88,12 +90,12 @@ public class Env {
name = candidate;
}
// Filter out environment variables with bad names
if ("".equals(name.trim()) || name.contains("=") || name.contains(":")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if ("".equals(name.trim()) || name.contains(":")) { //$NON-NLS-1$ //$NON-NLS-2$
continue;
}
}
// Get the variable value
String value = parts.length > 1 ? parts[1].trim() : ""; //$NON-NLS-1$
String value = envpPart.substring(eqIdx+1);
// Don't overwrite the TERM variable if in terminal mode
if (terminal && "TERM".equals(name)) continue; //$NON-NLS-1$
// If a variable with the name does not exist, just append it
@ -172,21 +174,22 @@ public class Env {
BufferedReader reader = new BufferedReader(isreader);
try {
String line = reader.readLine();
String key = null;
String value = null;
while (line != null) {
String key = null;
String value = null;
int func = line.indexOf("=()"); //$NON-NLS-1$
if (func > 0) {
key = line.substring(0, func);
// scan until we find the closing '}' with no following chars
value = "'" + line.substring(func + 1); //$NON-NLS-1$
while (line != null && !line.equals("}")) { //$NON-NLS-1$
value = line.substring(func + 1);
do {
line = reader.readLine();
if (line != null) {
value += " " + line; //$NON-NLS-1$
}
}
value += "'"; //$NON-NLS-1$
if (line == null)
break;
if (line.equals("}")) //$NON-NLS-1$
value += ';';
value += ' ' + line;
} while (!line.equals("}")); //$NON-NLS-1$
line = reader.readLine();
} else {
int separator = line.indexOf('=');
@ -214,8 +217,6 @@ public class Env {
}
if (key != null) {
cache.put(key, value);
key = null;
value = null;
} else {
line = reader.readLine();
}