Libc-1439.100.3.tar.gz

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

diff --git a/stdio/FreeBSD/scanf.c b/stdio/FreeBSD/scanf.c
index 794149989c7ed177615dcd4b17e4b6d75e5f17b9..c2992ece1bd85c2ad1d65ed60364cea9334043de 100644 (file)
--- a/stdio/FreeBSD/scanf.c
+++ b/stdio/FreeBSD/scanf.c
@@ -36,6 +36,8 @@ static char sccsid[] = "@(#)scanf.c   8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdio/scanf.c,v 1.13 2007/01/09 00:28:07 imp Exp $");
 
 #include <sys/cdefs.h>
 __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>
 #include <stdarg.h>
 #include "namespace.h"
 #include <stdio.h>
 #include <stdarg.h>


@@ -51,7 +53,22 @@ scanf(char const * __restrict fmt, ...)
 
        va_start(ap, fmt);
        FLOCKFILE(stdin);
 
        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);
        FUNLOCKFILE(stdin);
        va_end(ap);
        return (ret);