Libc-1439.100.3.tar.gz

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

diff --git a/stdio/FreeBSD/snprintf.c b/stdio/FreeBSD/snprintf.c
index 61d9c8a31ea65e479c13afa0362be71a6c8a30f7..55f01cf22feb7e3565a42a5a1e929ae74b2f8e58 100644 (file)
--- a/stdio/FreeBSD/snprintf.c
+++ b/stdio/FreeBSD/snprintf.c
@@ -36,6 +36,8 @@ static char sccsid[] = "@(#)snprintf.c        8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.22 2008/04/17 22:17:54 jhb Exp $");
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.22 2008/04/17 22:17:54 jhb Exp $");
 

+#include "xlocale_private.h"
+

 #include <limits.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdarg.h>


@@ -45,26 +47,24 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.22 2008/04/17 22:17:54 jhb
 int
 snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...)
 {
 int
 snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...)
 {

-       size_t on;

        int ret;
        va_list ap;
        int ret;
        va_list ap;

-       FILE f;

 
 

-       on = n;
-       if (n != 0)
-               n--;
-       if (n > INT_MAX)
-               n = INT_MAX;

        va_start(ap, fmt);
        va_start(ap, fmt);

-       f._file = -1;
-       f._flags = __SWR | __SSTR;
-       f._bf._base = f._p = (unsigned char *)str;
-       f._bf._size = f._w = n;
-       f._orientation = 0;
-       memset(&f._mbstate, 0, sizeof(mbstate_t));
-       ret = __vfprintf(&f, fmt, ap);
-       if (on > 0)
-               *f._p = '\0';
+       ret = vsnprintf_l(str, n, __current_locale(), fmt, ap);
+       va_end(ap);
+       return (ret);
+}
+
+int
+snprintf_l(char * __restrict str, size_t n, locale_t loc,
+    char const * __restrict fmt, ...)
+{
+       int ret;
+       va_list ap;
+
+       va_start(ap, fmt);
+       ret = vsnprintf_l(str, n, loc, fmt, ap);

        va_end(ap);
        return (ret);
 }
        va_end(ap);
        return (ret);
 }