Loading...
stdio/FreeBSD/sscanf.c.patch Libc-763.11 Libc-583
--- Libc/Libc-763.11/stdio/FreeBSD/sscanf.c.patch
+++ Libc/Libc-583/stdio/FreeBSD/sscanf.c.patch
@@ -1,57 +1,44 @@
---- sscanf.c.orig	2009-11-30 16:15:30.000000000 -0800
-+++ sscanf.c	2009-12-02 16:50:00.000000000 -0800
-@@ -36,42 +36,33 @@ static char sccsid[] = "@(#)sscanf.c	8.1
+--- 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.13 2008/04/17 22:17:54 jhb Exp $");
+ __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>
- #include "local.h"
- 
--static int eofread(void *, char *, int);
--
--/* ARGSUSED */
--static int
--eofread(cookie, buf, len)
--	void *cookie;
--	char *buf;
--	int len;
+@@ -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(const char * __restrict str, char const * __restrict fmt, ...)
- {
++sscanf_l(const char * __restrict str, locale_t loc, char const * __restrict fmt, ...)
++{
 +	int ret;
 +	va_list ap;
- 
--	return (0);
++	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 = vsscanf_l(str, __current_locale(), fmt, ap);
-+	va_end(ap);
-+	return (ret);
- }
- 
- int
--sscanf(const char * __restrict str, char const * __restrict fmt, ...)
-+sscanf_l(const char * __restrict str, locale_t loc, char const * __restrict fmt, ...)
- {
- 	int ret;
- 	va_list ap;
--	FILE f;
- 
--	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._orientation = 0;
--	memset(&f._mbstate, 0, sizeof(mbstate_t));
- 	va_start(ap, fmt);
--	ret = __svfscanf(&f, fmt, ap);
-+	ret = vsscanf_l(str, loc, fmt, ap);
++	ret = __svfscanf_l(&f, loc, fmt, ap);
  	va_end(ap);
  	return (ret);
  }