--- Libc/Libc-1725.40.4/stdio/FreeBSD/fgetws.c
+++ Libc/Libc-320/stdio/FreeBSD/fgetws.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
+ * Copyright (c) 2002 Tim J. Robbins.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,33 +25,22 @@
  */
 
 #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.4 2002/09/20 13:25:40 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include <wchar.h>
 #include "un-namespace.h"
 #include "libc_private.h"
 #include "local.h"
-#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);
+	wint_t wc;
 
-	NORMALIZE_LOCALE(loc);
-	rl = XLOCALE_CTYPE(loc);
-	__mbsnrtowcs = rl->__mbsnrtowcs;
 	FLOCKFILE(fp);
 	ORIENT(fp, 1);
 
@@ -60,43 +49,22 @@
 		goto error;
 	}
 
-	if (fp->_r <= 0 && __srefill(fp))
-		/* EOF */
-		goto error;
 	wsp = ws;
-	do {
-		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->_mbstate, loc);
-		if (nconv == (size_t)-1)
-			/* Conversion error */
+	while (n-- > 1) {
+		/* XXX Inefficient */
+		if ((wc = __fgetwc(fp)) == WEOF && errno == EILSEQ)
 			goto error;
-		if (src == NULL) {
-			/*
-			 * We hit a null byte. Increment the character count,
-			 * since mbsnrtowcs()'s return value doesn't include
-			 * the terminating null, then resume conversion
-			 * after the null.
-			 */
-			nconv++;
-			src = memchr(fp->_p, '\0', fp->_r);
-			src++;
+		if (wc == WEOF) {
+			if (wsp == ws)
+				/* EOF/error, no characters read yet. */
+				goto error;
+			break;
 		}
-		fp->_r -= (unsigned char *)src - fp->_p;
-		fp->_p = (unsigned char *)src;
-		n -= nconv;
-		wsp += nconv;
-	} while (wsp[-1] != L'\n' && n > 1 && (fp->_r > 0 ||
-	    __srefill(fp) == 0));
-	if (wsp == ws)
-		/* EOF */
-		goto error;
-	if (!rl->__mbsinit(&fp->_mbstate, loc))
-		/* Incomplete character */
-		goto error;
-	*wsp = L'\0';
+		*wsp++ = (wchar_t)wc;
+		if (wc == L'\n')
+			break;
+	}
+	*wsp++ = L'\0';
 	FUNLOCKFILE(fp);
 
 	return (ws);
@@ -105,9 +73,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());
-}