Loading...
stdio/FreeBSD/fgetws.c.patch Libc-498 /dev/null
--- Libc/Libc-498/stdio/FreeBSD/fgetws.c.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- fgetws.c.orig	2004-11-25 11:38:34.000000000 -0800
-+++ fgetws.c	2005-02-24 16:20:29.000000000 -0800
-@@ -27,6 +27,8 @@
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefanf Exp $");
- 
-+#include "xlocale_private.h"
-+
- #include "namespace.h"
- #include <errno.h>
- #include <stdio.h>
-@@ -38,13 +40,18 @@
- #include "mblocal.h"
- 
- wchar_t *
--fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
-+fgetws_l(wchar_t * __restrict ws, int n, FILE * __restrict fp, locale_t loc)
- {
- 	wchar_t *wsp;
- 	size_t nconv;
- 	const char *src;
- 	unsigned char *nl;
-+	struct __xlocale_st_runelocale *rl;
-+	size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict, size_t, size_t, __darwin_mbstate_t * __restrict, locale_t);
- 
-+	NORMALIZE_LOCALE(loc);
-+	rl = loc->__lc_ctype;
-+	__mbsnrtowcs = rl->__mbsnrtowcs;
- 	FLOCKFILE(fp);
- 	ORIENT(fp, 1);
- 
-@@ -58,11 +65,11 @@
- 		goto error;
- 	wsp = ws;
- 	do {
--		src = fp->_p;
-+		src = (const char *)fp->_p;
- 		nl = memchr(fp->_p, '\n', fp->_r);
- 		nconv = __mbsnrtowcs(wsp, &src,
- 		    nl != NULL ? (nl - fp->_p + 1) : fp->_r,
--		    n - 1, &fp->_extra->mbstate);
-+		    n - 1, &fp->_extra->mbstate, loc);
- 		if (nconv == (size_t)-1)
- 			/* Conversion error */
- 			goto error;
-@@ -86,7 +93,7 @@
- 	if (wsp == ws)
- 		/* EOF */
- 		goto error;
--	if (!__mbsinit(&fp->_extra->mbstate))
-+	if (!rl->__mbsinit(&fp->_extra->mbstate, loc))
- 		/* Incomplete character */
- 		goto error;
- 	*wsp++ = L'\0';
-@@ -98,3 +105,9 @@
- 	FUNLOCKFILE(fp);
- 	return (NULL);
- }
-+
-+wchar_t *
-+fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
-+{
-+	return fgetws_l(ws, n, fp, __current_locale());
-+}