Loading...
string/FreeBSD/wcsxfrm.c.patch Libc-391 /dev/null
--- Libc/Libc-391/string/FreeBSD/wcsxfrm.c.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- wcsxfrm.c.orig	Thu Nov 25 11:38:47 2004
-+++ wcsxfrm.c	Fri Feb 18 15:01:58 2005
-@@ -31,31 +31,35 @@
- #endif
- __FBSDID("$FreeBSD: src/lib/libc/string/wcsxfrm.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
- 
-+#include "xlocale_private.h"
-+
- #include <stdlib.h>
- #include <string.h>
- #include <wchar.h>
- #include "collate.h"
- 
--static char *__mbsdup(const wchar_t *);
-+static char *__mbsdup(const wchar_t *, locale_t);
- 
- /*
-  * Placeholder wcsxfrm() implementation. See wcscoll.c for a description of
-  * the logic used.
-  */
- size_t
--wcsxfrm(wchar_t * __restrict dest, const wchar_t * __restrict src, size_t len)
-+wcsxfrm_l(wchar_t * __restrict dest, const wchar_t * __restrict src, size_t len,
-+    locale_t loc)
- {
- 	int prim, sec, l;
- 	size_t slen;
- 	char *mbsrc, *s, *ss;
- 
-+	NORMALIZE_LOCALE(loc);
- 	if (*src == L'\0') {
- 		if (len != 0)
- 			*dest = L'\0';
- 		return (0);
- 	}
- 
--	if (__collate_load_error || MB_CUR_MAX > 1) {
-+	if (loc->__collate_load_error || MB_CUR_MAX_L(loc) > 1) {
- 		slen = wcslen(src);
- 		if (len > 0) {
- 			if (slen < len)
-@@ -68,13 +72,13 @@
- 		return (slen);
- 	}
- 
--	mbsrc = __mbsdup(src);
-+	mbsrc = __mbsdup(src, loc);
- 	slen = 0;
- 	prim = sec = 0;
--	ss = s = __collate_substitute(mbsrc);
-+	ss = s = (char *)__collate_substitute_l((unsigned char *)mbsrc, loc);
- 	while (*s != '\0') {
- 		while (*s != '\0' && prim == 0) {
--			__collate_lookup(s, &l, &prim, &sec);
-+			__collate_lookup_l((unsigned char *)s, &l, &prim, &sec, loc);
- 			s += l;
- 		}
- 		if (prim != 0) {
-@@ -94,8 +98,14 @@
- 	return (slen);
- }
- 
-+size_t
-+wcsxfrm(wchar_t * __restrict dest, const wchar_t * __restrict src, size_t len)
-+{
-+	return wcsxfrm_l(dest, src, len, __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;
-@@ -105,12 +115,12 @@
- 
- 	wcp = ws;
- 	st = initial;
--	if ((len = wcsrtombs(NULL, &wcp, 0, &st)) == (size_t)-1)
-+	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);
-+	wcsrtombs_l(mbs, &ws, len + 1, &st, loc);
- 
- 	return (mbs);
- }