Libc-1439.100.3.tar.gz

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

diff --git a/stdio/FreeBSD/printf.c b/stdio/FreeBSD/printf.c
index 86452e23b9d9058cb7ae9f929825b4368ade53cb..e65851a13fa323d5cd85b7cc81e2d1ad7baa09df 100644 (file)
--- a/stdio/FreeBSD/printf.c
+++ b/stdio/FreeBSD/printf.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.
  * 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.
  * 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[] = "@(#)printf.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)printf.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/stdio/printf.c,v 1.10 2002/09/06 11:23:55 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/printf.c,v 1.11 2007/01/09 00:28:07 imp Exp $");
+
+#include "xlocale_private.h"

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


@@ -50,7 +48,20 @@ printf(char const * __restrict fmt, ...)
        va_list ap;
 
        va_start(ap, fmt);
        va_list ap;
 
        va_start(ap, fmt);

-       ret = vfprintf(stdout, fmt, ap);
+       ret = vfprintf_l(stdout, __current_locale(), fmt, ap);
+       va_end(ap);
+       return (ret);
+}
+
+int
+printf_l(locale_t loc, char const * __restrict fmt, ...)
+{
+       int ret;
+       va_list ap;
+
+       /* no need to call NORMALIZE_LOCALE(loc) because vfprintf_l will */
+       va_start(ap, fmt);
+       ret = vfprintf_l(stdout, loc, fmt, ap);

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