| | 1 | --- vscanf.c.orig 2003-05-20 15:22:44.000000000 -0700 |
| | 2 | +++ vscanf.c 2005-02-23 19:11:44.000000000 -0800 |
| | 3 | @@ -40,6 +40,8 @@ |
| | 4 | #include <sys/cdefs.h> |
| | 5 | __FBSDID("$FreeBSD: src/lib/libc/stdio/vscanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $"); |
| | 6 | |
| | 7 | +#include "xlocale_private.h" |
| | 8 | + |
| | 9 | #include "namespace.h" |
| | 10 | #include <stdio.h> |
| | 11 | #include "un-namespace.h" |
| | 12 | @@ -54,7 +56,22 @@ |
| | 13 | int retval; |
| | 14 | |
| | 15 | FLOCKFILE(stdin); |
| | 16 | - retval = __svfscanf(stdin, fmt, ap); |
| | 17 | + retval = __svfscanf_l(stdin, __current_locale(), fmt, ap); |
| | 18 | + FUNLOCKFILE(stdin); |
| | 19 | + return (retval); |
| | 20 | +} |
| | 21 | + |
| | 22 | +int |
| | 23 | +vscanf_l(loc, fmt, ap) |
| | 24 | + locale_t loc; |
| | 25 | + const char * __restrict fmt; |
| | 26 | + __va_list ap; |
| | 27 | +{ |
| | 28 | + int retval; |
| | 29 | + |
| | 30 | + NORMALIZE_LOCALE(loc); |
| | 31 | + FLOCKFILE(stdin); |
| | 32 | + retval = __svfscanf_l(stdin, loc, fmt, ap); |
| | 33 | FUNLOCKFILE(stdin); |
| | 34 | return (retval); |
| | 35 | } |
projects / apple / libc.git / blame_incremental