Libc-594.9.5.tar.gz

[apple/libc.git] / stdio / FreeBSD / sscanf.c.patch

--- sscanf.c.orig	2003-05-20 15:22:44.000000000 -0700
+++ sscanf.c	2005-02-23 16:42:49.000000000 -0800
@@ -40,6 +40,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.11 2002/10/12 16:13:41 mike Exp $");
 
+#include "xlocale_private.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -76,7 +78,31 @@
 	f._extra = &extra;
 	INITEXTRA(&f);
 	va_start(ap, fmt);
-	ret = __svfscanf(&f, fmt, ap);
+	ret = __svfscanf_l(&f, __current_locale(), fmt, ap);
+	va_end(ap);
+	return (ret);
+}
+
+int
+sscanf_l(const char * __restrict str, locale_t loc, char const * __restrict fmt, ...)
+{
+	int ret;
+	va_list ap;
+	struct __sFILEX extra;
+	FILE f;
+
+	NORMALIZE_LOCALE(loc);
+	f._file = -1;
+	f._flags = __SRD;
+	f._bf._base = f._p = (unsigned char *)str;
+	f._bf._size = f._r = strlen(str);
+	f._read = eofread;
+	f._ub._base = NULL;
+	f._lb._base = NULL;
+	f._extra = &extra;
+	INITEXTRA(&f);
+	va_start(ap, fmt);
+	ret = __svfscanf_l(&f, loc, fmt, ap);
 	va_end(ap);
 	return (ret);
 }