Permalink
Browse files

Fix for failing to weak link wcsncasecmp - binary dies on SnowLeopard

  • Loading branch information...
1 parent 7d9b0a0 commit 77ec902ca70b4da4556ececcf7ef2024955b0e63 @ridiculousfish ridiculousfish committed May 17, 2013
Showing with 33 additions and 19 deletions.
  1. +30 −18 fallback.cpp
  2. +3 −1 fallback.h
View
48 fallback.cpp
@@ -817,7 +817,7 @@ static wchar_t *wcsdup_fallback(const wchar_t *in)
return out;
}
-int wcscasecmp_fallback(const wchar_t *a, const wchar_t *b)
+static int wcscasecmp_fallback(const wchar_t *a, const wchar_t *b)
{
if (*a == 0)
{
@@ -834,6 +834,26 @@ int wcscasecmp_fallback(const wchar_t *a, const wchar_t *b)
return wcscasecmp_fallback(a+1,b+1);
}
+static int wcsncasecmp_fallback(const wchar_t *a, const wchar_t *b, size_t count)
+{
+ if (count == 0)
+ return 0;
+
+ if (*a == 0)
+ {
+ return (*b==0)?0:-1;
+ }
+ else if (*b == 0)
+ {
+ return 1;
+ }
+ int diff = towlower(*a)-towlower(*b);
+ if (diff != 0)
+ return diff;
+ else
+ return wcsncasecmp_fallback(a+1,b+1, count-1);
+}
+
#if __APPLE__ && __DARWIN_C_LEVEL >= 200809L
/* Note parens avoid the macro expansion */
@@ -851,6 +871,13 @@ int wcscasecmp_use_weak(const wchar_t *a, const wchar_t *b)
return wcscasecmp_fallback(a, b);
}
+int wcsncasecmp_use_weak(const wchar_t *s1, const wchar_t *s2, size_t n)
+{
+ if (wcsncasecmp != NULL)
+ return (wcsncasecmp)(s1, s2, n);
+ return wcsncasecmp_fallback(s1, s2, n);
+}
+
#else //__APPLE__
#ifndef HAVE_WCSDUP
@@ -881,24 +908,9 @@ size_t wcslen(const wchar_t *in)
#endif
#ifndef HAVE_WCSNCASECMP
-int wcsncasecmp(const wchar_t *a, const wchar_t *b, int count)
+int wcsncasecmp(const wchar_t *a, const wchar_t *b, size_t count)
{
- if (count == 0)
- return 0;
-
- if (*a == 0)
- {
- return (*b==0)?0:-1;
- }
- else if (*b == 0)
- {
- return 1;
- }
- int diff = towlower(*a)-towlower(*b);
- if (diff != 0)
- return diff;
- else
- return wcsncasecmp(a+1,b+1, count-1);
+ return wcsncasecmp_fallback(a, b, count);
}
#endif
View
4 fallback.h
@@ -217,8 +217,10 @@ int wcwidth(wchar_t c);
#if __APPLE__ && __DARWIN_C_LEVEL >= 200809L
wchar_t *wcsdup_use_weak(const wchar_t *);
int wcscasecmp_use_weak(const wchar_t *, const wchar_t *);
+int wcsncasecmp_use_weak(const wchar_t *s1, const wchar_t *s2, size_t n);
#define wcsdup(a) wcsdup_use_weak((a))
#define wcscasecmp(a, b) wcscasecmp_use_weak((a), (b))
+#define wcsncasecmp(a, b, c) wcsncasecmp_use_weak((a), (b), (c))
#else
@@ -273,7 +275,7 @@ size_t wcslen(const wchar_t *in);
fish and guaranteed to be a sane, english word. Using wcsncasecmp on
a user-supplied string should be considered a bug.
*/
-int wcsncasecmp(const wchar_t *a, const wchar_t *b, int count);
+int wcsncasecmp(const wchar_t *a, const wchar_t *b, size_t count);
/**
Returns a newly allocated wide character string wich is a copy of

0 comments on commit 77ec902

Please sign in to comment.