Libc-391.tar.gz

[apple/libc.git] / stdio / FreeBSD / fgetwc.c.patch

diff --git a/stdio/FreeBSD/fgetwc.c.patch b/stdio/FreeBSD/fgetwc.c.patch
new file mode 100644 (file)
index 0000000..af467f5
--- /dev/null
+++ b/stdio/FreeBSD/fgetwc.c.patch
@@ -0,0 +1,61 @@
+--- fgetwc.c.orig      2004-11-25 11:38:34.000000000 -0800
++++ fgetwc.c   2005-02-23 17:15:00.000000000 -0800
+@@ -27,6 +27,8 @@
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.12 2004/07/20 08:27:27 tjr Exp $");
+ 
++#include "xlocale_private.h"
++
+ #include "namespace.h"
+ #include <errno.h>
+ #include <stdio.h>
+@@ -47,7 +49,21 @@
+ 
+       FLOCKFILE(fp);
+       ORIENT(fp, 1);
+-      r = __fgetwc(fp);
++      r = __fgetwc(fp, __current_locale());
++      FUNLOCKFILE(fp);
++
++      return (r);
++}
++
++wint_t
++fgetwc_l(FILE *fp, locale_t loc)
++{
++      wint_t r;
++
++      NORMALIZE_LOCALE(loc);
++      FLOCKFILE(fp);
++      ORIENT(fp, 1);
++      r = __fgetwc(fp, loc);
+       FUNLOCKFILE(fp);
+ 
+       return (r);
+@@ -57,21 +73,23 @@
+  * Non-MT-safe version.
+  */
+ wint_t
+-__fgetwc(FILE *fp)
++__fgetwc(FILE *fp, locale_t loc)
+ {
+       wchar_t wc;
+       size_t nconv;
++      struct __xlocale_st_runelocale *xrl = loc->__lc_ctype;
++      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 (MB_CUR_MAX == 1) {
++      if (xrl->__mb_cur_max == 1) {
+               /* Fast path for single-byte encodings. */
+               wc = *fp->_p++;
+               fp->_r--;
+               return (wc);
+       }
+       do {
+-              nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate);
++              nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate, loc);
+               if (nconv == (size_t)-1)
+                       break;
+               else if (nconv == (size_t)-2)