X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/9385eb3d10ebe5eb398c52040ec3dbfba9b0cdcf..refs/heads/master:/stdio/FreeBSD/vswprintf.c?ds=sidebyside

diff --git a/stdio/FreeBSD/vswprintf.c b/stdio/FreeBSD/vswprintf.c
index fdea252..9129639 100644
--- a/stdio/FreeBSD/vswprintf.c
+++ b/stdio/FreeBSD/vswprintf.c
@@ -31,7 +31,9 @@
 #if 0
 __FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp ");
 #endif
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.3 2003/01/07 06:20:47 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.7 2008/04/17 22:17:54 jhb Exp $");
+
+#include "xlocale_private.h"
 
 #include <errno.h>
 #include <stdio.h>
@@ -40,15 +42,20 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.3 2003/01/07 06:20:47 tjr
 #include "local.h"
 
 int
-vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
-    __va_list ap)
+vswprintf_l(wchar_t * __restrict s, size_t n, locale_t loc,
+    const wchar_t * __restrict fmt, __va_list ap)
 {
-	FILE f;
-	struct __sFILEX ext;
+	static const mbstate_t initial;
 	mbstate_t mbs;
+	FILE f;
 	char *mbp;
 	int ret, sverrno;
+	size_t nwc;
+	struct __sFILEX ext;
+	f._extra = &ext;
+	INITEXTRA(&f);
 
+	NORMALIZE_LOCALE(loc);
 	if (n == 0) {
 		errno = EINVAL;
 		return (-1);
@@ -62,9 +69,9 @@ vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
 		return (-1);
 	}
 	f._bf._size = f._w = 127;		/* Leave room for the NUL */
-	f._extra = &ext;
-	INITEXTRA(&f);
-	ret = __vfwprintf(&f, fmt, ap);
+	f._orientation = 0;
+	memset(&f._mbstate, 0, sizeof(mbstate_t));
+	ret = __vfwprintf(&f, loc, fmt, ap);
 	if (ret < 0) {
 		sverrno = errno;
 		free(f._bf._base);
@@ -72,19 +79,19 @@ vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
 		return (-1);
 	}
 	*f._p = '\0';
-	mbp = f._bf._base;
-	memset(&mbs, 0, sizeof(mbs));
+	mbp = (char*)f._bf._base;
 	/*
 	 * XXX Undo the conversion from wide characters to multibyte that
 	 * fputwc() did in __vfwprintf().
 	 */
-	if (mbsrtowcs(s, (const char **)&mbp, n, &mbs) == (size_t)-1) {
-		free(f._bf._base);
+	mbs = initial;
+	nwc = mbsrtowcs_l(s, (const char **)&mbp, n, &mbs, loc);
+	free(f._bf._base);
+	if (nwc == (size_t)-1) {
 		errno = EILSEQ;
 		return (-1);
 	}
-	free(f._bf._base);
-	if (s[n - 1] != L'\0') {
+	if (nwc == n) {
 		s[n - 1] = L'\0';
 		errno = EOVERFLOW;
 		return (-1);
@@ -92,3 +99,10 @@ vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
 
 	return (ret);
 }
+
+int
+vswprintf(wchar_t * __restrict s, size_t n,
+    const wchar_t * __restrict fmt, __va_list ap)
+{
+	return vswprintf_l(s, n, __current_locale(), fmt, ap);
+}