Libc-825.24.tar.gz

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

diff --git a/stdio/FreeBSD/fputws.c.patch b/stdio/FreeBSD/fputws.c.patch
deleted file mode 100644 (file)
index 4b2e29a..0000000
--- a/stdio/FreeBSD/fputws.c.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- fputws.c.orig      2010-03-18 18:11:42.000000000 -0700
-+++ fputws.c   2010-03-18 18:17:53.000000000 -0700
-@@ -27,6 +27,8 @@
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/stdio/fputws.c,v 1.8 2009/01/15 18:53:52 rdivacky Exp $");
- 
-+#include "xlocale_private.h"
-+
- #include "namespace.h"
- #include <errno.h>
- #include <limits.h>
-@@ -39,14 +41,18 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/f
- #include "mblocal.h"
- 
- int
--fputws(const wchar_t * __restrict ws, FILE * __restrict fp)
-+fputws_l(const wchar_t * __restrict ws, FILE * __restrict fp, locale_t loc)
- {
-       size_t nbytes;
-       char buf[BUFSIZ];
-       struct __suio uio;
-       struct __siov iov;
--      const wchar_t *wsp;
-+      const wchar_t *wsp = ws;
-+      size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
-+          size_t, size_t, mbstate_t * __restrict, locale_t);
- 
-+      NORMALIZE_LOCALE(loc);
-+      __wcsnrtombs = loc->__lc_ctype->__wcsnrtombs;
-       FLOCKFILE(fp);
-       ORIENT(fp, 1);
-       if (prepwrite(fp) != 0)
-@@ -55,15 +61,14 @@ fputws(const wchar_t * __restrict ws, FI
-       uio.uio_iovcnt = 1;
-       iov.iov_base = buf;
-       do {
--              wsp = ws;
-               nbytes = __wcsnrtombs(buf, &wsp, SIZE_T_MAX, sizeof(buf),
--                  &fp->_mbstate);
-+                  &fp->_mbstate, loc);
-               if (nbytes == (size_t)-1)
-                       goto error;
-               iov.iov_len = uio.uio_resid = nbytes;
-               if (__sfvwrite(fp, &uio) != 0)
-                       goto error;
--      } while (ws != NULL);
-+      } while (wsp != NULL);
-       FUNLOCKFILE(fp);
-       return (0);
- 
-@@ -71,3 +76,9 @@ error:
-       FUNLOCKFILE(fp);
-       return (-1);
- }
-+
-+int
-+fputws(const wchar_t * __restrict ws, FILE * __restrict fp)
-+{
-+      return fputws_l(ws, fp, __current_locale());
-+}