diff options
| author | Matthias Klose <doko@gcc.gnu.org> | 2008-10-22 18:19:29 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2008-10-22 18:19:29 +0000 |
| commit | 58ddc179d494fd426aca184a1a5749d9fa6f81b9 (patch) | |
| tree | 577596282d00bf61e1bf433dc5d7aa0a417f5c5c /libjava/classpath/java/lang/System.java | |
| parent | 51c869cac9a2b641ee21172ea193eadef9b1f476 (diff) | |
| download | gcc-58ddc179d494fd426aca184a1a5749d9fa6f81b9.zip gcc-58ddc179d494fd426aca184a1a5749d9fa6f81b9.tar.gz gcc-58ddc179d494fd426aca184a1a5749d9fa6f81b9.tar.bz2 | |
Import GNU Classpath (libgcj-import-20081021).
2008-10-22 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20081021).
* Regenerate class and header files.
* Regenerate auto* files.
From-SVN: r141302
Diffstat (limited to 'libjava/classpath/java/lang/System.java')
| -rw-r--r-- | libjava/classpath/java/lang/System.java | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/libjava/classpath/java/lang/System.java b/libjava/classpath/java/lang/System.java index 9fd6bfe..58b1bba 100644 --- a/libjava/classpath/java/lang/System.java +++ b/libjava/classpath/java/lang/System.java @@ -546,20 +546,28 @@ public final class System SecurityManager sm = SecurityManager.current; // Be thread-safe. if (sm != null) sm.checkPermission(new RuntimePermission("getenv.*")); + if (environmentMap == null) { - List<String> environ = (List<String>)VMSystem.environ(); Map<String,String> variables = new EnvironmentMap(); - for (String pair : environ) - { - String[] parts = pair.split("="); - if (parts.length == 2) - variables.put(parts[0], parts[1]); - else - variables.put(parts[0], ""); - } - environmentMap = Collections.unmodifiableMap(variables); + List<String> environ = (List<String>)VMSystem.environ(); + for (String envEntry : environ) + { + // avoid broken and null entries + if (envEntry != null && !envEntry.endsWith("=")) + { + // it's perfectly legal that some entries may be in the form + // key=value=value=value + int equalSignIndex = envEntry.indexOf('='); + String key = envEntry.substring(0, equalSignIndex); + String value = envEntry.substring(equalSignIndex + 1); + variables.put(key, value); + } + } + + environmentMap = Collections.unmodifiableMap(variables); } + return environmentMap; } |