Skip to content

Instantly share code, notes, and snippets.

@simonc
Created June 11, 2010 12:27
Show Gist options
  • Save simonc/434424 to your computer and use it in GitHub Desktop.
Save simonc/434424 to your computer and use it in GitHub Desktop.
Subversion Unicode Path Patch
diff --git a/subversion/libsvn_subr/path.c b/subversion/libsvn_subr/path.c
===================================================================
--- a/subversion/libsvn_subr/path.c
+++ b/subversion/libsvn_subr/path.c
@@ -35,6 +35,10 @@
#include "private_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
libraries. */
@@ -1073,6 +1073,36 @@
apr_pool_t *pool)
{
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)
{
@@ -1081,6 +1114,7 @@
}
else
return svn_utf_cstring_to_utf8(path_utf8, path_apr, pool);
+#endif
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment