Loading...
--- Libc/Libc-391.5.21/stdio/FreeBSD/vfwscanf.c.patch
+++ Libc/Libc-763.12/stdio/FreeBSD/vfwscanf.c.patch
@@ -1,35 +1,35 @@
---- vfwscanf.c.orig 2004-11-25 11:38:36.000000000 -0800
-+++ vfwscanf.c 2005-02-23 16:25:00.000000000 -0800
-@@ -42,6 +42,8 @@
+Index: vfwscanf.c
+===================================================================
+--- vfwscanf.c (revision 55443)
++++ vfwscanf.c (working copy)
+@@ -38,6 +38,8 @@
#include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/stdio/vfwscanf.c,v 1.12 2004/05/02 20:13:29 obrien Exp $");
+ __FBSDID("$FreeBSD: src/lib/libc/stdio/vfwscanf.c,v 1.17 2009/01/19 06:19:51 das Exp $");
+#include "xlocale_private.h"
+
#include "namespace.h"
#include <ctype.h>
#include <inttypes.h>
-@@ -98,7 +100,9 @@
- #define CT_INT 3 /* %[dioupxX] conversion */
+@@ -96,7 +98,7 @@
#define CT_FLOAT 4 /* %[efgEFG] conversion */
+ #ifndef NO_FLOATING_POINT
-static int parsefloat(FILE *, wchar_t *, wchar_t *);
-+#ifndef NO_FLOATING_POINT
+static int parsefloat(FILE *, wchar_t **, size_t, locale_t loc);
-+#endif /* !NO_FLOATING_POINT */
-
- extern int __scanfdebug;
-
-@@ -116,7 +120,21 @@
+ #endif
+
+ #define INCCL(_c) \
+@@ -115,16 +117,31 @@
FLOCKFILE(fp);
ORIENT(fp, 1);
- ret = __vfwscanf(fp, fmt, ap);
+ ret = __vfwscanf(fp, __current_locale(), fmt, ap);
-+ FUNLOCKFILE(fp);
-+ return (ret);
-+}
-+
+ FUNLOCKFILE(fp);
+ return (ret);
+ }
+
+int
+vfwscanf_l(FILE * __restrict fp, locale_t loc, const wchar_t * __restrict fmt,
+ va_list ap)
@@ -40,10 +40,10 @@
+ FLOCKFILE(fp);
+ ORIENT(fp, 1);
+ ret = __vfwscanf(fp, loc, fmt, ap);
- FUNLOCKFILE(fp);
- return (ret);
- }
-@@ -124,8 +142,9 @@
++ FUNLOCKFILE(fp);
++ return (ret);
++}
++
/*
* Non-MT-safe version.
*/
@@ -55,7 +55,7 @@
{
wint_t c; /* character from format, or conversion */
size_t width; /* field width, or 0 */
-@@ -134,7 +153,6 @@
+@@ -133,7 +150,6 @@
int flags; /* flags as defined above */
wchar_t *p0; /* saves original value of p when necessary */
int nassigned; /* number of fields assigned */
@@ -63,13 +63,12 @@
int nread; /* number of characters consumed from fp */
int base; /* base argument to conversion function */
wchar_t buf[BUF]; /* buffer for numeric conversions */
-@@ -145,27 +163,30 @@
+@@ -144,30 +160,36 @@
char *mbp; /* multibyte string pointer for %c %s %[ */
size_t nconv; /* number of bytes in mb. conversion */
char mbbuf[MB_LEN_MAX]; /* temporary mb. character buffer */
+ int index; /* for %index$ */
+ va_list ap_orig; /* to reset ap to first argument */
- static const mbstate_t initial;
mbstate_t mbs;
+ int mb_cur_max = MB_CUR_MAX_L(loc);
@@ -98,18 +97,35 @@
+ __ungetwc(c, fp, loc);
continue;
}
- if (c != '%')
-@@ -180,15 +201,27 @@
+- if (c != '%')
++ if (c != '%') {
++ if ((wi = __fgetwc(fp, loc)) == WEOF)
++ goto input_failure;
+ goto literal;
++ }
+ width = 0;
+ flags = 0;
+ /*
+@@ -177,16 +199,34 @@
+ again: c = *fmt++;
switch (c) {
case '%':
++ /* Consume leading white space */
++ for(;;) {
++ if ((wi = __fgetwc(fp, loc)) == WEOF)
++ goto input_failure;
++ if (!iswspace_l(wi, loc))
++ break;
++ nread++;
++ }
literal:
- if ((wi = __fgetwc(fp)) == WEOF)
-+ if ((wi = __fgetwc(fp, loc)) == WEOF)
- goto input_failure;
+- goto input_failure;
if (wi != c) {
- __ungetwc(wi, fp);
+- goto input_failure;
+ __ungetwc(wi, fp, loc);
- goto input_failure;
++ goto match_failure;
}
nread++;
continue;
@@ -129,15 +145,48 @@
case '*':
flags |= SUPPRESS;
goto again;
-@@ -307,7 +340,6 @@
+@@ -305,27 +345,28 @@
break;
case 'n':
- nconversions++;
- if (flags & SUPPRESS) /* ??? */
+- if (flags & SUPPRESS) /* ??? */
++ {
++ void *ptr = va_arg(ap, void *);
++ if ((ptr == NULL) || (flags & SUPPRESS)) /* ??? */
continue;
- if (flags & SHORTSHORT)
-@@ -343,11 +375,11 @@
+- if (flags & SHORTSHORT)
+- *va_arg(ap, char *) = nread;
++ else if (flags & SHORTSHORT)
++ *(char *)ptr = nread;
+ else if (flags & SHORT)
+- *va_arg(ap, short *) = nread;
++ *(short *)ptr = nread;
+ else if (flags & LONG)
+- *va_arg(ap, long *) = nread;
++ *(long *)ptr = nread;
+ else if (flags & LONGLONG)
+- *va_arg(ap, long long *) = nread;
++ *(long long *)ptr = nread;
+ else if (flags & INTMAXT)
+- *va_arg(ap, intmax_t *) = nread;
++ *(intmax_t *)ptr = nread;
+ else if (flags & SIZET)
+- *va_arg(ap, size_t *) = nread;
++ *(size_t *)ptr = nread;
+ else if (flags & PTRDIFFT)
+- *va_arg(ap, ptrdiff_t *) = nread;
++ *(ptrdiff_t *)ptr = nread;
+ else
+- *va_arg(ap, int *) = nread;
++ *(int *)ptr = nread;
+ continue;
+-
++ }
+ default:
+ goto match_failure;
+
+@@ -341,11 +382,11 @@
* that suppress this.
*/
if ((flags & NOSKIP) == 0) {
@@ -151,7 +200,7 @@
}
/*
-@@ -364,7 +396,7 @@
+@@ -362,7 +403,7 @@
p = va_arg(ap, wchar_t *);
n = 0;
while (width-- != 0 &&
@@ -160,9 +209,9 @@
if (!(flags & SUPPRESS))
*p++ = (wchar_t)wi;
n++;
-@@ -380,19 +412,19 @@
+@@ -378,19 +419,19 @@
n = 0;
- mbs = initial;
+ mbs = initial_mbs;
while (width != 0 &&
- (wi = __fgetwc(fp)) != WEOF) {
- if (width >= MB_CUR_MAX &&
@@ -186,7 +235,7 @@
break;
}
if (!(flags & SUPPRESS))
-@@ -410,7 +442,6 @@
+@@ -408,7 +449,6 @@
if (!(flags & SUPPRESS))
nassigned++;
}
@@ -194,7 +243,7 @@
break;
case CT_CCL:
-@@ -420,20 +451,20 @@
+@@ -418,20 +458,20 @@
/* take only those things in the class */
if ((flags & SUPPRESS) && (flags & LONG)) {
n = 0;
@@ -219,10 +268,10 @@
n = p - p0;
if (n == 0)
goto match_failure;
-@@ -444,16 +475,16 @@
+@@ -442,16 +482,16 @@
mbp = va_arg(ap, char *);
n = 0;
- mbs = initial;
+ mbs = initial_mbs;
- while ((wi = __fgetwc(fp)) != WEOF &&
+ while ((wi = __fgetwc(fp, loc)) != WEOF &&
width != 0 && INCCL(wi)) {
@@ -241,7 +290,7 @@
if (nconv == (size_t)-1)
goto input_failure;
if (nconv > width)
-@@ -468,14 +499,15 @@
+@@ -466,14 +506,15 @@
n++;
}
if (wi != WEOF)
@@ -259,7 +308,7 @@
break;
case CT_STRING:
-@@ -483,39 +515,39 @@
+@@ -481,39 +522,39 @@
if (width == 0)
width = (size_t)~0;
if ((flags & SUPPRESS) && (flags & LONG)) {
@@ -290,7 +339,7 @@
} else {
if (!(flags & SUPPRESS))
mbp = va_arg(ap, char *);
- mbs = initial;
+ mbs = initial_mbs;
- while ((wi = __fgetwc(fp)) != WEOF &&
+ while ((wi = __fgetwc(fp, loc)) != WEOF &&
width != 0 &&
@@ -311,7 +360,7 @@
if (nconv == (size_t)-1)
goto input_failure;
if (nconv > width)
-@@ -530,13 +562,12 @@
+@@ -528,13 +569,12 @@
nread++;
}
if (wi != WEOF)
@@ -326,7 +375,7 @@
continue;
case CT_INT:
-@@ -546,7 +577,7 @@
+@@ -544,7 +584,7 @@
width = sizeof(buf) / sizeof(*buf) - 1;
flags |= SIGNOK | NDIGITS | NZDIGITS;
for (p = buf; width; width--) {
@@ -335,7 +384,7 @@
/*
* Switch on the character; `goto ok'
* if we accept it as a part of number.
-@@ -630,7 +661,7 @@
+@@ -628,7 +668,7 @@
* for a number. Stop accumulating digits.
*/
if (c != WEOF)
@@ -344,7 +393,7 @@
break;
ok:
/*
-@@ -646,22 +677,22 @@
+@@ -644,22 +684,22 @@
*/
if (flags & NDIGITS) {
if (p > buf)
@@ -371,7 +420,7 @@
if (flags & POINTER)
*va_arg(ap, void **) =
(void *)(uintptr_t)res;
-@@ -684,47 +715,49 @@
+@@ -682,45 +722,45 @@
nassigned++;
}
nread += p - buf;
@@ -387,11 +436,8 @@
- sizeof(*buf) - 1)
- width = sizeof(buf) / sizeof(*buf) - 1;
- if ((width = parsefloat(fp, buf, buf + width)) == 0)
-+ if ((width = parsefloat(fp, &pbuf, width, loc)) == 0) {
-+ if (pbuf)
-+ free(pbuf);
++ if ((width = parsefloat(fp, &pbuf, width, loc)) == 0)
goto match_failure;
-+ }
if ((flags & SUPPRESS) == 0) {
if (flags & LONGDBL) {
- long double res = wcstold(buf, &p);
@@ -406,14 +452,10 @@
+ float res = wcstof_l(pbuf, &p, loc);
*va_arg(ap, float *) = res;
}
-- if (__scanfdebug && p - buf != width)
-+ if (__scanfdebug && p - pbuf != width)
- abort();
nassigned++;
}
nread += width;
- nconversions++;
-+ free(pbuf);
break;
+ }
#endif /* !NO_FLOATING_POINT */
@@ -427,25 +469,32 @@
}
#ifndef NO_FLOATING_POINT
++extern char *__parsefloat_buf(size_t s); /* see vfscanf-fbsd.c */
++
static int
-parsefloat(FILE *fp, wchar_t *buf, wchar_t *end)
+parsefloat(FILE *fp, wchar_t **buf, size_t width, locale_t loc)
{
- wchar_t *commit, *p;
- int infnanpos = 0;
-@@ -733,9 +766,18 @@
- S_DIGITS, S_FRAC, S_EXP, S_EXPDIGITS
- } state = S_START;
+ mbstate_t mbs;
+ size_t nconv;
+@@ -733,12 +773,22 @@
wchar_t c;
-- wchar_t decpt = (wchar_t)(unsigned char)*localeconv()->decimal_point;
-+ wchar_t decpt = (wchar_t)(unsigned char)*localeconv_l(loc)->decimal_point;
+ wchar_t decpt;
_Bool gotmantdig = 0, ishex = 0;
-+ wchar_t *b, *e;
++ wchar_t *b;
++ wchar_t *e;
+ size_t s;
-+ s = (width == 0 ? BUF : width + 1);
-+ b = (wchar_t *)malloc(s * sizeof(wchar_t));
-+ if (b == NULL) {
+ mbs = initial_mbs;
+- nconv = mbrtowc(&decpt, localeconv()->decimal_point, MB_CUR_MAX, &mbs);
++
++ nconv = mbrtowc_l(&decpt, localeconv()->decimal_point, MB_CUR_MAX_L(loc), &mbs, loc);
+ if (nconv == (size_t)-1 || nconv == (size_t)-2)
+- decpt = '.'; /* failsafe */
++ decpt = '.'; /* failsafe */
+
++ s = (width == 0 ? BUF : (width + 1));
++ if ((b = (wchar_t *)__parsefloat_buf(s * sizeof(wchar_t))) == NULL) {
+ *buf = NULL;
+ return 0;
+ }
@@ -453,7 +502,7 @@
/*
* We set commit = p whenever the string we have read so far
* constitutes a valid representation of a floating point
-@@ -745,10 +787,10 @@
+@@ -748,10 +798,10 @@
* always necessary to read at least one character that doesn't
* match; thus, we can't short-circuit "infinity" or "nan(...)".
*/
@@ -467,16 +516,16 @@
break;
reswitch:
switch (state) {
-@@ -808,7 +850,7 @@
+@@ -809,7 +859,7 @@
if (c == ')') {
commit = p;
- infnanpos = -2;
+ state = S_DONE;
- } else if (!iswalnum(c) && c != '_')
+ } else if (!iswalnum_l(c, loc) && c != '_')
goto parsedone;
break;
}
-@@ -824,7 +866,7 @@
+@@ -827,7 +877,7 @@
goto reswitch;
}
case S_DIGITS:
@@ -485,7 +534,7 @@
gotmantdig = 1;
else {
state = S_FRAC;
-@@ -841,7 +883,7 @@
+@@ -844,7 +894,7 @@
goto parsedone;
else
state = S_EXP;
@@ -494,7 +543,7 @@
commit = p;
gotmantdig = 1;
} else
-@@ -854,7 +896,7 @@
+@@ -857,24 +907,38 @@
else
goto reswitch;
case S_EXPDIGITS:
@@ -503,20 +552,23 @@
commit = p;
else
goto parsedone;
-@@ -862,16 +904,28 @@
+ break;
default:
- abort();
+- abort();
++ LIBC_ABORT("unknown state %d", state);
}
+ if (p >= e) {
-+ size_t diff = (p - b);
++ ssize_t diff = (p - b);
++ ssize_t com = (commit - b);
+ s += BUF;
-+ b = (wchar_t *)reallocf(b, s * sizeof(wchar_t));
++ b = (wchar_t *)__parsefloat_buf(s * sizeof(wchar_t));
+ if (b == NULL) {
+ *buf = NULL;
+ return 0;
+ }
+ e = b + (s - 1);
+ p = b + diff;
++ commit = b + com;
+ }
*p++ = c;
c = WEOF;