--- Libc/Libc-1725.40.4/stdio/FreeBSD/fgetwc.c
+++ Libc/Libc-320/stdio/FreeBSD/fgetwc.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,9 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.13 2008/04/17 22:17:53 jhb Exp $");
-
-#include "xlocale_private.h"
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.6 2002/10/16 12:09:43 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
@@ -37,7 +35,28 @@
 #include "un-namespace.h"
 #include "libc_private.h"
 #include "local.h"
-#include "mblocal.h"
+
+static __inline wint_t	__fgetwc_nbf(FILE *);
+
+/*
+ * Non-MT-safe version.
+ */
+wint_t
+__fgetwc(FILE *fp)
+{
+	wint_t wc;
+
+	if (MB_CUR_MAX == 1) {
+		/*
+		 * Assume we're using a single-byte locale. A safer test
+		 * might be to check _CurrentRuneLocale->encoding.
+		 */
+		wc = (wint_t)__sgetc(fp);
+	} else
+		wc = __fgetwc_nbf(fp);
+
+	return (wc);
+}
 
 /*
  * MT-safe version.
@@ -49,66 +68,42 @@
 
 	FLOCKFILE(fp);
 	ORIENT(fp, 1);
-	r = __fgetwc(fp, __current_locale());
+	r = __fgetwc(fp);
 	FUNLOCKFILE(fp);
 
 	return (r);
 }
 
-wint_t
-fgetwc_l(FILE *fp, locale_t loc)
+static __inline wint_t
+__fgetwc_nbf(FILE *fp)
 {
-	wint_t r;
+	char buf[MB_LEN_MAX];
+	mbstate_t mbs;
+	size_t n, nconv;
+	int c;
+	wchar_t wc;
 
-	NORMALIZE_LOCALE(loc);
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	r = __fgetwc(fp, loc);
-	FUNLOCKFILE(fp);
+	n = 0;
+	while (n < MB_CUR_MAX) {
+		if ((c = __sgetc(fp)) == EOF) {
+			if (n == 0)
+				return (WEOF);
+			break;
+		}
+		buf[n++] = (char)c;
+		memset(&mbs, 0, sizeof(mbs));
+		nconv = mbrtowc(&wc, buf, n, &mbs);
+		if (nconv == n)
+			return (wc);
+		else if (nconv == 0)
+			return (L'\0');
+		else if (nconv == (size_t)-1)
+			break;
+	}
 
-	return (r);
-}
-
-/*
- * Non-MT-safe version.
- */
-wint_t
-__fgetwc(FILE *fp, locale_t loc)
-{
-	wchar_t wc;
-	size_t nconv;
-	struct xlocale_ctype *xrl = XLOCALE_CTYPE(loc);
-	size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict, locale_t) = xrl->__mbrtowc;
-
-	if (fp->_r <= 0 && __srefill(fp))
-		return (WEOF);
-	if (xrl->__mb_cur_max == 1) {
-		/* Fast path for single-byte encodings. */
-		wc = *fp->_p++;
-		fp->_r--;
-		return (wc);
-	}
-	do {
-		nconv = __mbrtowc(&wc, (char*)fp->_p, fp->_r, &fp->_mbstate, loc);
-		if (nconv == (size_t)-1)
-			break;
-		else if (nconv == (size_t)-2)
-			continue;
-		else if (nconv == 0) {
-			/*
-			 * Assume that the only valid representation of
-			 * the null wide character is a single null byte.
-			 */
-			fp->_p++;
-			fp->_r--;
-			return (L'\0');
-		} else {
-			fp->_p += nconv;
-			fp->_r -= nconv;
-			return (wc);
-		}
-	} while (__srefill(fp) == 0);
+	while (n-- != 0)
+		__ungetc((unsigned char)buf[n], fp);
+	errno = EILSEQ;
 	fp->_flags |= __SERR;
-	errno = EILSEQ;
 	return (WEOF);
 }