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 b381852818c370f98d77ba3e1f522b9b39e33e5f..55f01cf22feb7e3565a42a5a1e929ae74b2f8e58 100644 (file)
--- a/stdio/FreeBSD/snprintf.c
+++ b/stdio/FreeBSD/snprintf.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,7 +34,9 @@
 static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.20 2002/09/06 11:23:55 tjr Exp $");
+__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>
@@ -49,27 +47,24 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.20 2002/09/06 11:23:55 tjr
 int
 snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...)
 {
-       size_t on;
        int ret;
        va_list ap;
-       FILE f;
-       struct __sFILEX ext;
 
-       on = n;
-       if (n != 0)
-               n--;
-       if (n > INT_MAX)
-               n = INT_MAX;
        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._extra = &ext;
-       INITEXTRA(&f);
-       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);
 }