Libc-1439.100.3.tar.gz

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

diff --git a/stdio/FreeBSD/fscanf.c b/stdio/FreeBSD/fscanf.c
index 27b6849af9bb1a4695cd33b0ef6ae7901c7861df..2db747e8af6c0a74c6d403180c4ec353c8d5ecf3 100644 (file)
--- a/stdio/FreeBSD/fscanf.c
+++ b/stdio/FreeBSD/fscanf.c
@@ -36,6 +36,8 @@ static char sccsid[] = "@(#)fscanf.c  8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.13 2007/01/09 00:28:06 imp Exp $");
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.13 2007/01/09 00:28:06 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 @@ fscanf(FILE * __restrict fp, char const * __restrict fmt, ...)
 
        va_start(ap, fmt);
        FLOCKFILE(fp);
 
        va_start(ap, fmt);
        FLOCKFILE(fp);

-       ret = __svfscanf(fp, fmt, ap);
+       ret = __svfscanf_l(fp, __current_locale(), fmt, ap);
+       va_end(ap);
+       FUNLOCKFILE(fp);
+       return (ret);
+}
+
+int
+fscanf_l(FILE * __restrict fp, locale_t loc, char const * __restrict fmt, ...)
+{
+       int ret;
+       va_list ap;
+
+       NORMALIZE_LOCALE(loc);
+       va_start(ap, fmt);
+       FLOCKFILE(fp);
+       ret = __svfscanf_l(fp, loc, fmt, ap);

        va_end(ap);
        FUNLOCKFILE(fp);
        return (ret);
        va_end(ap);
        FUNLOCKFILE(fp);
        return (ret);