Libc-825.24.tar.gz

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

diff --git a/stdio/FreeBSD/vsprintf.c b/stdio/FreeBSD/vsprintf.c
index 698f7527c5505f77c21d436186944c6cda4bc3c9..9b85352cb44617cec43a34b34d46b0ca75f264e6 100644 (file)
--- a/stdio/FreeBSD/vsprintf.c
+++ b/stdio/FreeBSD/vsprintf.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -38,26 +34,37 @@
 static char sccsid[] = "@(#)vsprintf.c 8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vsprintf.c,v 1.14 2002/09/06 11:23:56 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vsprintf.c,v 1.16 2008/04/17 22:17:54 jhb Exp $");
+
+#include "xlocale_private.h"
 
 #include <stdio.h>
 #include <limits.h>
 #include "local.h"
 
 int
-vsprintf(char * __restrict str, const char * __restrict fmt, __va_list ap)
+vsprintf_l(char * __restrict str, locale_t loc, const char * __restrict fmt, __va_list ap)
 {
        int ret;
        FILE f;
        struct __sFILEX ext;
+       f._extra = &ext;
+       INITEXTRA(&f);
 
+       NORMALIZE_LOCALE(loc);
        f._file = -1;
        f._flags = __SWR | __SSTR;
        f._bf._base = f._p = (unsigned char *)str;
        f._bf._size = f._w = INT_MAX;
-       f._extra = &ext;
-       INITEXTRA(&f);
-       ret = __vfprintf(&f, fmt, ap);
+       f._orientation = 0;
+       memset(&f._mbstate, 0, sizeof(mbstate_t));
+       ret = __vfprintf(&f, loc, fmt, ap);
        *f._p = 0;
        return (ret);
 }
+
+int
+vsprintf(char * __restrict str, const char * __restrict fmt, __va_list ap)
+{
+       return vsprintf_l(str, __current_locale(), fmt, ap);
+}