Loading...
--- Libc/Libc-1725.40.4/stdio/FreeBSD/snprintf.c
+++ Libc/Libc-583/stdio/FreeBSD/snprintf.c
@@ -13,6 +13,10 @@
* 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.
@@ -34,9 +38,7 @@
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.22 2008/04/17 22:17:54 jhb Exp $");
-
-#include "xlocale_private.h"
+__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.20 2002/09/06 11:23:55 tjr Exp $");
#include <limits.h>
#include <stdio.h>
@@ -47,24 +49,27 @@
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);
- ret = vsnprintf_l(str, n, __current_locale(), fmt, ap);
+ 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';
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);
-}