#1105

.gitattributes

@@ -1243,6 +1243,7 @@ ko.lproj/Transfer.nib/keyedobjects.nib -text
 ko.lproj/Transfer.strings -text
 lib/commons-net-1.4.1.jar -text
 lib/ext/junit.jar -text
+lib/icu4j_3_6_1.jar -text
 lib/jakarta-oro-2.0.8.jar -text
 lib/log4j-1.2.13.jar -text
 nl.lproj/Alert.nib/classes.nib -text

Info.plist

@@ -78,6 +78,7 @@
 		<string>log4j-1.2.13.jar</string>
 		<string>jakarta-oro-2.0.8.jar</string>
 		<string>commons-net-1.4.1.jar</string>
+		<string>icu4j_3_6_1.jar</string>
 	</array>
 	<key>NSJavaRoot</key>
 	<string>Contents/Resources/Java</string>

Info.plist.debug

@@ -80,6 +80,7 @@
 		<string>log4j-1.2.13.jar</string>
 		<string>jakarta-oro-2.0.8.jar</string>
 		<string>commons-net-1.4.1.jar</string>
+		<string>icu4j_3_6_1.jar</string>
 	</array>
 	<key>NSJavaRoot</key>
 	<string>Contents/Resources/Java</string>

source/ch/cyberduck/core/AbstractPath.java

@@ -1,5 +1,7 @@
 package ch.cyberduck.core;
 
+import com.ibm.icu.text.Normalizer;
+
 import com.apple.cocoa.foundation.NSObject;
 
 import java.io.IOException;
@@ -128,7 +130,7 @@ public boolean isRoot() {
     public static String normalize(final String path) {
         String normalized = path;
         if(Preferences.instance().getBoolean("path.normalize")) {
-            while(!normalized.startsWith(DELIMITER)) {
+            while(!normalized.startsWith("\\\\") && !normalized.startsWith(DELIMITER)) {
                 normalized = DELIMITER + normalized;
             }
             while(!normalized.endsWith(DELIMITER)) {
@@ -160,6 +162,9 @@ public static String normalize(final String path) {
                 normalized = normalized.substring(0, normalized.length() - 1);
             }
         }
+        if(Preferences.instance().getBoolean("path.normalize.unicode")) {
+            normalized = Normalizer.normalize(normalized, Normalizer.NFC);
+        }
         // Return the normalized path that we have completed
         return normalized;
     }