Libc-997.1.1.tar.gz

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

diff --git a/stdio/FreeBSD/scanf.c b/stdio/FreeBSD/scanf.c
index b4fb1a3c2e6ea1d31144fba6006960899b84a336..c2992ece1bd85c2ad1d65ed60364cea9334043de 100644 (file)
--- a/stdio/FreeBSD/scanf.c
+++ b/stdio/FreeBSD/scanf.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[] = "@(#)scanf.c    8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/scanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/scanf.c,v 1.13 2007/01/09 00:28:07 imp Exp $");
+
+#include "xlocale_private.h"
 
 #include "namespace.h"
 #include <stdio.h>
@@ -55,7 +53,22 @@ scanf(char const * __restrict fmt, ...)
 
        va_start(ap, fmt);
        FLOCKFILE(stdin);
-       ret = __svfscanf(stdin, fmt, ap);
+       ret = __svfscanf_l(stdin, __current_locale(), fmt, ap);
+       FUNLOCKFILE(stdin);
+       va_end(ap);
+       return (ret);
+}
+
+int
+scanf_l(locale_t loc, char const * __restrict fmt, ...)
+{
+       int ret;
+       va_list ap;
+
+       NORMALIZE_LOCALE(loc);
+       va_start(ap, fmt);
+       FLOCKFILE(stdin);
+       ret = __svfscanf_l(stdin, loc, fmt, ap);
        FUNLOCKFILE(stdin);
        va_end(ap);
        return (ret);