Libc-997.1.1.tar.gz

[apple/libc.git] / stdio / FreeBSD / fgetws.c

diff --git a/stdio/FreeBSD/fgetws.c b/stdio/FreeBSD/fgetws.c
index be180c9f4771add62f3987c7298a4dee4c66a92e..278e8091c37e1089735b1aef5d1a12fa4942b90f 100644 (file)
--- a/stdio/FreeBSD/fgetws.c
+++ b/stdio/FreeBSD/fgetws.c
@@ -25,7 +25,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.8 2009/11/25 04:45:45 wollman Exp $");
+
+#include "xlocale_private.h"
 
 #include "namespace.h"
 #include <errno.h>
@@ -38,13 +40,18 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefan
 #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 @@ fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
                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->_mbstate, loc);
                if (nconv == (size_t)-1)
                        /* Conversion error */
                        goto error;
@@ -86,10 +93,10 @@ fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
        if (wsp == ws)
                /* EOF */
                goto error;
-       if (!__mbsinit(&fp->_extra->mbstate))
+       if (!rl->__mbsinit(&fp->_mbstate, loc))
                /* Incomplete character */
                goto error;
-       *wsp++ = L'\0';
+       *wsp = L'\0';
        FUNLOCKFILE(fp);
 
        return (ws);
@@ -98,3 +105,9 @@ error:
        FUNLOCKFILE(fp);
        return (NULL);
 }
+
+wchar_t *
+fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
+{
+       return fgetws_l(ws, n, fp, __current_locale());
+}