--- Libc/Libc-498.1.7/string/FreeBSD/wcscoll.c.patch
+++ Libc/Libc-391.2.5/string/FreeBSD/wcscoll.c.patch
@@ -1,6 +1,6 @@
 --- wcscoll.c.orig	2004-11-25 11:38:47.000000000 -0800
-+++ wcscoll.c	2005-04-11 15:44:35.000000000 -0700
-@@ -27,72 +27,222 @@
++++ wcscoll.c	2005-02-18 18:17:11.000000000 -0800
+@@ -27,13 +27,15 @@
  #include <sys/cdefs.h>
  __FBSDID("$FreeBSD: src/lib/libc/string/wcscoll.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
  
@@ -13,259 +13,72 @@
  #include "collate.h"
  
 -static char *__mbsdup(const wchar_t *);
-+#define NOTFORWARD	(DIRECTIVE_BACKWARD | DIRECTIVE_POSITION)
++static char *__mbsdup(const wchar_t *, locale_t);
  
--/*
-- * Placeholder implementation of wcscoll(). Attempts to use the single-byte
-- * collation ordering where possible, and falls back on wcscmp() in locales
-- * with extended character sets.
-- */
+ /*
+  * Placeholder implementation of wcscoll(). Attempts to use the single-byte
+@@ -41,12 +43,13 @@
+  * with extended character sets.
+  */
  int
 -wcscoll(const wchar_t *ws1, const wchar_t *ws2)
 +wcscoll_l(const wchar_t *ws1, const wchar_t *ws2, locale_t loc)
  {
--	char *mbs1, *mbs2;
--	int diff, sverrno;
-+	int sverrno;
-+	int len, len2, prim, prim2, sec, sec2, ret, ret2;
-+	const wchar_t *t, *t2;
-+	wchar_t *tt = NULL, *tt2 = NULL;
-+	wchar_t *tr = NULL, *tr2 = NULL;
-+	wchar_t w, w2;
-+	struct __collate_st_info *info;
+ 	char *mbs1, *mbs2;
+ 	int diff, sverrno;
  
 -	if (__collate_load_error || MB_CUR_MAX > 1)
 +	NORMALIZE_LOCALE(loc);
-+	if (loc->__collate_load_error)
++	if (loc->__collate_load_error || MB_CUR_MAX_L(loc) > 1)
  		/*
--		 * Locale has no special collating order, could not be
--		 * loaded, or has an extended character set; do a fast binary
--		 * comparison.
-+		 * Locale has no special collating order or could not be
-+		 * loaded, do a fast binary comparison.
+ 		 * Locale has no special collating order, could not be
+ 		 * loaded, or has an extended character set; do a fast binary
+@@ -54,7 +57,7 @@
  		 */
  		return (wcscmp(ws1, ws2));
  
 -	if ((mbs1 = __mbsdup(ws1)) == NULL || (mbs2 = __mbsdup(ws2)) == NULL) {
--		/*
--		 * Out of memory or illegal wide chars; fall back to wcscmp()
--		 * but leave errno indicating the error. Callers that don't
--		 * check for error will get a reasonable but often slightly
--		 * incorrect result.
--		 */
--		sverrno = errno;
--		free(mbs1);
--		errno = sverrno;
--		return (wcscmp(ws1, ws2));
-+	info = &loc->__lc_collate->__info;
-+	len = len2 = 1;
-+	ret = ret2 = 0;
-+
-+	if ((info->directive[0] & NOTFORWARD) ||
-+	    (info->directive[1] & NOTFORWARD) ||
-+	    (!(info->flags && COLLATE_SUBST_DUP) &&
-+	    (info->subst_count[0] > 0 || info->subst_count[1] > 0))) {
-+		int direc, pass;
-+		for(pass = 0; pass < info->directive_count; pass++) {
-+			direc = info->directive[pass];
-+			if (pass == 0 || !(info->flags & COLLATE_SUBST_DUP)) {
-+				free(tt);
-+				tt = __collate_substitute(ws1, pass, loc);
-+				free(tt2);
-+				tt2 = tt ? __collate_substitute(ws2, pass, loc) : NULL;
-+			}
-+			if (direc & DIRECTIVE_BACKWARD) {
-+				wchar_t *bp, *fp, c;
-+				tr = __collate_wcsdup(tt ? tt : ws1);
-+				bp = tr;
-+				fp = tr + wcslen(tr) - 1;
-+				while(bp < fp) {
-+					c = *bp;
-+					*bp++ = *fp;
-+					*fp-- = c;
-+				}
-+				tr2 = __collate_wcsdup(tt2 ? tt2 : ws2);
-+				bp = tr2;
-+				fp = tr2 + wcslen(tr2) - 1;
-+				while(bp < fp) {
-+					c = *bp;
-+					*bp++ = *fp;
-+					*fp-- = c;
-+				}
-+				t = (const wchar_t *)tr;
-+				t2 = (const wchar_t *)tr2;
-+			} else if (tt) {
-+				t = (const wchar_t *)tt;
-+				t2 = (const wchar_t *)tt2;
-+			} else {
-+				t = (const wchar_t *)ws1;
-+				t2 = (const wchar_t *)ws2;
-+			}
-+			if(direc & DIRECTIVE_POSITION) {
-+				while(*t && *t2) {
-+					prim = prim2 = 0;
-+					__collate_lookup_which(t, &len, &prim, pass, loc);
-+					if (prim <= 0) {
-+						if (prim < 0) {
-+							errno = EINVAL;
-+							ret = -1;
-+							goto end;
-+						}
-+						prim = COLLATE_MAX_PRIORITY;
-+					}
-+					__collate_lookup_which(t2, &len2, &prim2, pass, loc);
-+					if (prim2 <= 0) {
-+						if (prim2 < 0) {
-+							errno = EINVAL;
-+							ret = -1;
-+							goto end;
-+						}
-+						prim2 = COLLATE_MAX_PRIORITY;
-+					}
-+					if(prim != prim2) {
-+						ret = prim - prim2;
-+						goto end;
-+					}
-+					t += len;
-+					t2 += len2;
-+				}
-+			} else {
-+				while(*t && *t2) {
-+					prim = prim2 = 0;
-+					while(*t) {
-+						__collate_lookup_which(t, &len, &prim, pass, loc);
-+						if(prim > 0)
-+							break;
-+						if (prim < 0) {
-+							errno = EINVAL;
-+							ret = -1;
-+							goto end;
-+						}
-+						t += len;
-+					}
-+					while(*t2) {
-+						__collate_lookup_which(t2, &len2, &prim2, pass, loc);
-+						if(prim2 > 0)
-+							break;
-+						if (prim2 < 0) {
-+							errno = EINVAL;
-+							ret = -1;
-+							goto end;
-+						}
-+						t2 += len2;
-+					}
-+					if(!prim || !prim2)
-+						break;
-+					if(prim != prim2) {
-+						ret = prim - prim2;
-+						goto end;
-+					}
-+					t += len;
-+					t2 += len2;
-+				}
-+			}
-+			if(!*t) {
-+				if(*t2) {
-+					ret = -(int)*t2;
-+					goto end;
-+				}
-+			} else {
-+				ret = *t;
-+				goto end;
-+			}
-+		}
-+		ret = 0;
-+		goto end;
++	if ((mbs1 = __mbsdup(ws1, loc)) == NULL || (mbs2 = __mbsdup(ws2, loc)) == NULL) {
+ 		/*
+ 		 * Out of memory or illegal wide chars; fall back to wcscmp()
+ 		 * but leave errno indicating the error. Callers that don't
+@@ -67,7 +70,7 @@
+ 		return (wcscmp(ws1, ws2));
  	}
  
 -	diff = strcoll(mbs1, mbs2);
-+	/* optimized common case: order_start forward;forward and duplicate
-+	 * (or no) substitute tables */
-+	tt = __collate_substitute(ws1, 0, loc);
-+	if (tt == NULL) {
-+		tt2 = NULL;
-+		t = (const wchar_t *)ws1;
-+		t2 = (const wchar_t *)ws2;
-+	} else {
-+		tt2 = __collate_substitute(ws2, 0, loc);
-+		t = (const wchar_t *)tt;
-+		t2 = (const wchar_t *)tt2;
-+	}
-+	while(*t && *t2) {
-+		prim = prim2 = 0;
-+		while(*t) {
-+			__collate_lookup_l(t, &len, &prim, &sec, loc);
-+			if (prim > 0)
-+				break;
-+			if (prim < 0) {
-+				errno = EINVAL;
-+				ret = -1;
-+				goto end;
-+			}
-+			t += len;
-+		}
-+		while(*t2) {
-+			__collate_lookup_l(t2, &len2, &prim2, &sec2, loc);
-+			if (prim2 > 0)
-+				break;
-+			if (prim2 < 0) {
-+				errno = EINVAL;
-+				ret = -1;
-+				goto end;
-+			}
-+			t2 += len2;
-+		}
-+		if(!prim || !prim2)
-+			break;
-+		if(prim != prim2) {
-+			ret = prim - prim2;
-+			goto end;
-+		}
-+		if(!ret2)
-+			ret2 = sec - sec2;
-+		t += len;
-+		t2 += len2;
-+	}
-+	if(!*t && *t2)
-+		ret = -(int)*t2;
-+	else if(*t && !*t2)
-+		ret = *t;
-+	else if(!*t && !*t2)
-+		ret = ret2;
-+  end:
++	diff = strcoll_l(mbs1, mbs2, loc);
  	sverrno = errno;
--	free(mbs1);
--	free(mbs2);
-+	free(tt);
-+	free(tt2);
-+	free(tr);
-+	free(tr2);
- 	errno = sverrno;
- 
--	return (diff);
-+	return ret;
+ 	free(mbs1);
+ 	free(mbs2);
+@@ -76,8 +79,14 @@
+ 	return (diff);
  }
  
--static char *
--__mbsdup(const wchar_t *ws)
 +int
 +wcscoll(const wchar_t *ws1, const wchar_t *ws2)
++{
++	return wcscoll_l(ws1, ws2, __current_locale());
++}
++
+ static char *
+-__mbsdup(const wchar_t *ws)
++__mbsdup(const wchar_t *ws, locale_t loc)
  {
--	static const mbstate_t initial;
--	mbstate_t st;
--	const wchar_t *wcp;
--	size_t len;
--	char *mbs;
--
--	wcp = ws;
--	st = initial;
+ 	static const mbstate_t initial;
+ 	mbstate_t st;
+@@ -87,12 +96,12 @@
+ 
+ 	wcp = ws;
+ 	st = initial;
 -	if ((len = wcsrtombs(NULL, &wcp, 0, &st)) == (size_t)-1)
--		return (NULL);
--	if ((mbs = malloc(len + 1)) == NULL)
--		return (NULL);
--	st = initial;
++	if ((len = wcsrtombs_l(NULL, &wcp, 0, &st, loc)) == (size_t)-1)
+ 		return (NULL);
+ 	if ((mbs = malloc(len + 1)) == NULL)
+ 		return (NULL);
+ 	st = initial;
 -	wcsrtombs(mbs, &ws, len + 1, &st);
--
--	return (mbs);
-+	return wcscoll_l(ws1, ws2, __current_locale());
++	wcsrtombs_l(mbs, &ws, len + 1, &st, loc);
+ 
+ 	return (mbs);
  }