--- Libc/Libc-1725.40.4/stdio/FreeBSD/fgetws.c
+++ Libc/Libc-583/stdio/FreeBSD/fgetws.c
@@ -25,9 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.8 2009/11/25 04:45:45 wollman Exp $");
-
-#include "xlocale_private.h"
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefanf Exp $");
 
 #include "namespace.h"
 #include <errno.h>
@@ -40,18 +38,13 @@
 #include "mblocal.h"
 
 wchar_t *
-fgetws_l(wchar_t * __restrict ws, int n, FILE * __restrict fp, locale_t loc)
+fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
 {
 	wchar_t *wsp;
 	size_t nconv;
 	const char *src;
 	unsigned char *nl;
-	struct xlocale_ctype *rl;
-	size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict, size_t, size_t, __darwin_mbstate_t * __restrict, locale_t);
 
-	NORMALIZE_LOCALE(loc);
-	rl = XLOCALE_CTYPE(loc);
-	__mbsnrtowcs = rl->__mbsnrtowcs;
 	FLOCKFILE(fp);
 	ORIENT(fp, 1);
 
@@ -65,11 +58,11 @@
 		goto error;
 	wsp = ws;
 	do {
-		src = (const char *)fp->_p;
+		src = fp->_p;
 		nl = memchr(fp->_p, '\n', fp->_r);
 		nconv = __mbsnrtowcs(wsp, &src,
 		    nl != NULL ? (nl - fp->_p + 1) : fp->_r,
-		    n - 1, &fp->_mbstate, loc);
+		    n - 1, &fp->_extra->mbstate);
 		if (nconv == (size_t)-1)
 			/* Conversion error */
 			goto error;
@@ -93,10 +86,10 @@
 	if (wsp == ws)
 		/* EOF */
 		goto error;
-	if (!rl->__mbsinit(&fp->_mbstate, loc))
+	if (!__mbsinit(&fp->_extra->mbstate))
 		/* Incomplete character */
 		goto error;
-	*wsp = L'\0';
+	*wsp++ = L'\0';
 	FUNLOCKFILE(fp);
 
 	return (ws);
@@ -105,9 +98,3 @@
 	FUNLOCKFILE(fp);
 	return (NULL);
 }
-
-wchar_t *
-fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
-{
-	return fgetws_l(ws, n, fp, __current_locale());
-}