--- Libc/Libc-583/stdio/FreeBSD/vswprintf.c.patch
+++ Libc/Libc-763.11/stdio/FreeBSD/vswprintf.c.patch
@@ -1,110 +1,63 @@
---- vswprintf.c.orig	2004-11-25 11:38:36.000000000 -0800
-+++ vswprintf.c	2005-02-24 15:20:20.000000000 -0800
-@@ -33,6 +33,8 @@
+--- vswprintf.c.orig	2009-11-30 16:15:30.000000000 -0800
++++ vswprintf.c	2009-12-03 15:21:59.000000000 -0800
+@@ -33,6 +33,8 @@ __FBSDID("FreeBSD: src/lib/libc/stdio/va
  #endif
- __FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.5 2004/04/07 09:55:05 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>
  #include <stdlib.h>
-@@ -49,7 +51,66 @@
- 	struct __sFILEX ext;
+@@ -40,8 +42,8 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/v
+ #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)
+ {
+ 	static const mbstate_t initial;
+ 	mbstate_t mbs;
+@@ -49,7 +51,11 @@ vswprintf(wchar_t * __restrict s, size_t
  	char *mbp;
  	int ret, sverrno;
-+	size_t conv;
-+	locale_t loc = __current_locale();
-+
-+	if (n == 0) {
-+		errno = EINVAL;
-+		return (-1);
-+	}
-+
-+	f._file = -1;
-+	f._flags = __SWR | __SSTR | __SALC;
-+	f._bf._base = f._p = (unsigned char *)malloc(128);
-+	if (f._bf._base == NULL) {
-+		errno = ENOMEM;
-+		return (-1);
-+	}
-+	f._bf._size = f._w = 127;		/* Leave room for the NUL */
+ 	size_t nwc;
++	struct __sFILEX ext;
 +	f._extra = &ext;
 +	INITEXTRA(&f);
-+	ret = __vfwprintf(&f, loc, fmt, ap);
-+	if (ret < 0) {
-+		sverrno = errno;
-+		free(f._bf._base);
-+		errno = sverrno;
-+		return (-1);
-+	}
-+	*f._p = '\0';
-+	mbp = (char *)f._bf._base;
-+	/*
-+	 * XXX Undo the conversion from wide characters to multibyte that
-+	 * fputwc() did in __vfwprintf().
-+	 */
-+	mbs = initial;
-+	if ((conv = mbsrtowcs_l(s, (const char **)&mbp, n, &mbs, loc)) == (size_t)-1) {
-+		free(f._bf._base);
-+		errno = EILSEQ;
-+		return (-1);
-+	}
-+	free(f._bf._base);
-+	if (conv >= n) {
-+		s[n - 1] = L'\0';
-+		errno = EOVERFLOW;
-+		return (-1);
-+	}
-+
-+	return (ret);
-+}
-+
-+int
-+vswprintf_l(wchar_t * __restrict s, size_t n, locale_t loc,
-+    const wchar_t * __restrict fmt, __va_list ap)
-+{
-+	static const mbstate_t initial;
-+	mbstate_t mbs;
-+	FILE f;
-+	struct __sFILEX ext;
-+	char *mbp;
-+	int ret, sverrno;
-+	size_t conv;
  
 +	NORMALIZE_LOCALE(loc);
  	if (n == 0) {
  		errno = EINVAL;
  		return (-1);
-@@ -65,7 +126,7 @@
+@@ -65,7 +71,7 @@ vswprintf(wchar_t * __restrict s, size_t
  	f._bf._size = f._w = 127;		/* Leave room for the NUL */
- 	f._extra = &ext;
- 	INITEXTRA(&f);
+ 	f._orientation = 0;
+ 	memset(&f._mbstate, 0, sizeof(mbstate_t));
 -	ret = __vfwprintf(&f, fmt, ap);
 +	ret = __vfwprintf(&f, loc, fmt, ap);
  	if (ret < 0) {
  		sverrno = errno;
  		free(f._bf._base);
-@@ -73,19 +134,19 @@
- 		return (-1);
- 	}
- 	*f._p = '\0';
--	mbp = f._bf._base;
-+	mbp = (char *)f._bf._base;
- 	/*
- 	 * XXX Undo the conversion from wide characters to multibyte that
+@@ -79,7 +85,7 @@ vswprintf(wchar_t * __restrict s, size_t
  	 * fputwc() did in __vfwprintf().
  	 */
  	mbs = initial;
--	if (mbsrtowcs(s, (const char **)&mbp, n, &mbs) == (size_t)-1) {
-+	if ((conv = mbsrtowcs_l(s, (const char **)&mbp, n, &mbs, loc)) == (size_t)-1) {
- 		free(f._bf._base);
+-	nwc = mbsrtowcs(s, (const char **)&mbp, n, &mbs);
++	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 (conv >= n) {
- 		s[n - 1] = L'\0';
- 		errno = EOVERFLOW;
- 		return (-1);
+@@ -93,3 +99,10 @@ vswprintf(wchar_t * __restrict s, size_t
+ 
+ 	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);
++}