Changeset 207

Timestamp:

Dec 9, 2010, 3:34:37 PM (15 years ago)

Author:

dmik

Message:

jdk: FontConfiguration: Replace / and \ in the "os.name" property with "_" when building the platform-specific fontconfig file name.

File:

• trunk/openjdk/jdk/src/share/classes/sun/awt/FontConfiguration.java (modified) (1 diff)

trunk/openjdk/jdk/src/share/classes/sun/awt/FontConfiguration.java

@@ -212 +212 @@
         String baseName = javaLib + File.separator + "fontconfig";
         File configFile;
-        if (osVersion != null && osName != null) {
-            configFile = findImpl(baseName + "." + osName + "." + osVersion);
+        /* osName may contain \ and / chars that we certainly don't want to be
+           interpreted as path separators in the code below, fix it */
+        String osNameFixed = null;
+        if (osName != null) {
+            osNameFixed = osName.replace('\\', '_').replace('/', '_');
+        }
+        if (osVersion != null && osNameFixed != null) {
+            configFile = findImpl(baseName + "." + osNameFixed + "." + osVersion);
             if (configFile != null) {
                 return configFile;
             }
         }
-        if (osName != null) {
-            configFile = findImpl(baseName + "." + osName);
+        if (osNameFixed != null) {
+            configFile = findImpl(baseName + "." + osNameFixed);
             if (configFile != null) {
                 return configFile;