subversion18-utf8.diff

subversion-utf8.diff

--- subversion/libsvn_subr/path.c	2015-08-12 13:59:32.000000000 +0900
+++ subversion/libsvn_subr/path.c.new	2015-08-12 13:59:16.000000000 +0900
@@ -40,6 +40,9 @@
 
 #include "dirent_uri.h"
 
+#if defined(DARWIN)
+#include <CoreFoundation/CoreFoundation.h>
+#endif /* DARWIN */
 
 /* The canonical empty path.  Can this be changed?  Well, change the empty
    test below and the path library will work, not so sure about the fs/wc
@@ -1148,19 +1151,47 @@
                          const char *path_apr,
                          apr_pool_t *pool)
 {
-#if !defined(WIN32) && !defined(DARWIN)
   svn_boolean_t path_is_utf8;
+
+  #if defined(DARWIN)
+    svn_error_t *err;
+    /*
+      Compose any decomposed unicode characters precomposed one.
+      This will solve the problem that the 'svn status' command sometime
+      cannot recognize as same file when files suppose to be comtain
+      comopsed characters, like umlaut in some European language or
+      'Daku-ten' in Japanese, and the files are added on windows machines
+      then you use svn on Mac OS X checking out the files.
+    */
+    CFMutableStringRef cfmsr = CFStringCreateMutable(NULL, 0);
+    CFStringAppendCString(cfmsr, path_apr, kCFStringEncodingUTF8);
+    CFStringNormalize(cfmsr, kCFStringNormalizationFormC);
+    CFIndex path_buff_size = 1 + CFStringGetMaximumSizeForEncoding(
+      CFStringGetLength(cfmsr), kCFStringEncodingUTF8);
+    char *path = apr_palloc(pool, path_buff_size);
+    CFStringGetCString(cfmsr, path, path_buff_size, kCFStringEncodingUTF8);
+
+    SVN_ERR(get_path_encoding(&path_is_utf8, pool));
+
+    if (path_is_utf8)
+      {
+        *path_utf8 = apr_pstrdup(pool, path);
+        err = SVN_NO_ERROR;
+      }
+    else
+      err = svn_utf_cstring_to_utf8(path_utf8, path, pool);
+    CFRelease(cfmsr);
+    return err;
+  #else
+
   SVN_ERR(get_path_encoding(&path_is_utf8, pool));
   if (path_is_utf8)
-#endif
     {
       *path_utf8 = apr_pstrdup(pool, path_apr);
       return SVN_NO_ERROR;
     }
-#if !defined(WIN32) && !defined(DARWIN)
   else
     return svn_utf_cstring_to_utf8(path_utf8, path_apr, pool);
-#endif
 }