Loading...
--- Libc/Libc-763.11/stdio/FreeBSD/vfscanf.c.patch
+++ Libc/Libc-391.2.7/stdio/FreeBSD/vfscanf.c.patch
@@ -1,45 +1,48 @@
---- vfscanf.c.orig 2010-07-15 10:03:36.000000000 -0700
-+++ vfscanf.c 2010-07-15 10:18:58.000000000 -0700
-@@ -36,6 +36,8 @@ static char sccsid[] = "@(#)vfscanf.c 8.
+--- vfscanf.c.orig 2004-11-25 11:38:35.000000000 -0800
++++ vfscanf.c 2005-02-23 19:24:50.000000000 -0800
+@@ -40,6 +40,8 @@
#include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.43 2009/01/19 06:19:51 das Exp $");
+ __FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.37 2004/05/02 10:55:05 das Exp $");
+#include "xlocale_private.h"
+
#include "namespace.h"
#include <ctype.h>
#include <inttypes.h>
-@@ -46,6 +48,7 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/v
- #include <string.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <pthread.h>
- #include "un-namespace.h"
-
- #include "collate.h"
-@@ -93,9 +96,9 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/v
+@@ -97,10 +99,21 @@
#define CT_INT 3 /* %[dioupxX] conversion */
#define CT_FLOAT 4 /* %[efgEFG] conversion */
-static const u_char *__sccl(char *, const u_char *);
+-static int parsefloat(FILE *, char *, char *);
+static const u_char *__sccl(char *, const u_char *, locale_t);
- #ifndef NO_FLOATING_POINT
--static int parsefloat(FILE *, char *, char *);
++#ifndef NO_FLOATING_POINT
+static int parsefloat(FILE *, char **, size_t, locale_t);
- #endif
++#endif /* !NO_FLOATING_POINT */
+
++/*
++ * For ppc, we need to have the 64-bit long double version defining storage for
++ * __scanfdebug, to be compatible with 10.3. For ppc64 and i386, we want the
++ * storage defined in the only version.
++ */
++#if defined(__ppc__) && !defined(BUILDING_VARIANT)
++extern int __scanfdebug;
++#else /* !__ppc__ || BUILDING_VARIANT */
+ int __scanfdebug = 0;
++#endif /* __ppc__ && !BUILDING_VARIANT */
__weak_reference(__vfscanf, vfscanf);
-@@ -104,12 +107,24 @@ __weak_reference(__vfscanf, vfscanf);
+
+@@ -108,12 +121,24 @@
* __vfscanf - MT-safe version
*/
int
-__vfscanf(FILE *fp, char const *fmt0, va_list ap)
+__vfscanf(FILE * __restrict fp, char const * __restrict fmt0, va_list ap)
- {
- int ret;
-
- FLOCKFILE(fp);
-- ret = __svfscanf(fp, fmt0, ap);
++{
++ int ret;
++
++ FLOCKFILE(fp);
+ ret = __svfscanf_l(fp, __current_locale(), fmt0, ap);
+ FUNLOCKFILE(fp);
+ return (ret);
@@ -47,16 +50,17 @@
+
+int
+vfscanf_l(FILE * __restrict fp, locale_t loc, char const * __restrict fmt0, va_list ap)
-+{
-+ int ret;
-+
+ {
+ int ret;
+
+ NORMALIZE_LOCALE(loc);
-+ FLOCKFILE(fp);
+ FLOCKFILE(fp);
+- ret = __svfscanf(fp, fmt0, ap);
+ ret = __svfscanf_l(fp, loc, fmt0, ap);
FUNLOCKFILE(fp);
return (ret);
}
-@@ -117,8 +132,8 @@ __vfscanf(FILE *fp, char const *fmt0, va
+@@ -121,8 +146,8 @@
/*
* __svfscanf - non-MT-safe version of __vfscanf
*/
@@ -67,7 +71,7 @@
{
const u_char *fmt = (const u_char *)fmt0;
int c; /* character from format, or conversion */
-@@ -128,36 +143,43 @@ __svfscanf(FILE *fp, const char *fmt0, v
+@@ -132,7 +157,6 @@
int flags; /* flags as defined above */
char *p0; /* saves original value of p when necessary */
int nassigned; /* number of fields assigned */
@@ -75,8 +79,9 @@
int nread; /* number of characters consumed from fp */
int base; /* base argument to conversion function */
char ccltab[256]; /* character class table for %[...] */
- char buf[BUF]; /* buffer for numeric and mb conversions */
+@@ -140,24 +164,29 @@
wchar_t *wcp; /* handy wide character pointer */
+ wchar_t *wcp0; /* saves original value of wcp */
size_t nconv; /* length of multibyte sequence converted */
+ int index; /* %index$, zero if unset */
+ va_list ap_orig; /* to reset ap to first argument */
@@ -107,35 +112,7 @@
nread++, fp->_r--, fp->_p++;
continue;
}
-- if (c != '%')
-+ if (c != '%') {
-+ if (fp->_r <= 0 && __srefill(fp))
-+ goto input_failure;
- goto literal;
-+ }
- width = 0;
- flags = 0;
- /*
-@@ -167,15 +189,35 @@ __svfscanf(FILE *fp, const char *fmt0, v
- again: c = *fmt++;
- switch (c) {
- case '%':
-+ /* Consume leading white space */
-+ for(;;) {
-+ if (fp->_r <= 0 && __srefill(fp))
-+ goto input_failure;
-+ if (!isspace_l(*fp->_p, loc))
-+ break;
-+ nread++;
-+ fp->_r--;
-+ fp->_p++;
-+ }
- literal:
-- if (fp->_r <= 0 && __srefill(fp))
-- goto input_failure;
- if (*fp->_p != c)
- goto match_failure;
- fp->_r--, fp->_p++;
+@@ -181,6 +210,18 @@
nread++;
continue;
@@ -154,7 +131,7 @@
case '*':
flags |= SUPPRESS;
goto again;
-@@ -262,7 +304,7 @@ literal:
+@@ -267,7 +308,7 @@
break;
case '[':
@@ -163,48 +140,15 @@
flags |= NOSKIP;
c = CT_CCL;
break;
-@@ -283,27 +325,28 @@ literal:
+@@ -288,7 +329,6 @@
break;
case 'n':
- nconversions++;
-- if (flags & SUPPRESS) /* ??? */
-+ {
-+ void *ptr = va_arg(ap, void *);
-+ if ((ptr == NULL) || (flags & SUPPRESS)) /* ??? */
+ if (flags & SUPPRESS) /* ??? */
continue;
-- 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;
-
-@@ -325,7 +368,7 @@ literal:
+ if (flags & SHORTSHORT)
+@@ -330,7 +370,7 @@
* that suppress this.
*/
if ((flags & NOSKIP) == 0) {
@@ -213,7 +157,7 @@
nread++;
if (--fp->_r > 0)
fp->_p++;
-@@ -355,7 +398,7 @@ literal:
+@@ -360,7 +400,7 @@
wcp = NULL;
n = 0;
while (width != 0) {
@@ -222,7 +166,7 @@
fp->_flags |= __SERR;
goto input_failure;
}
-@@ -363,7 +406,7 @@ literal:
+@@ -368,7 +408,7 @@
fp->_p++;
fp->_r--;
mbs = initial;
@@ -231,7 +175,7 @@
if (nconv == (size_t)-1) {
fp->_flags |= __SERR;
goto input_failure;
-@@ -416,7 +459,6 @@ literal:
+@@ -421,7 +461,6 @@
nread += r;
nassigned++;
}
@@ -239,7 +183,7 @@
break;
case CT_CCL:
-@@ -435,7 +477,7 @@ literal:
+@@ -440,7 +479,7 @@
n = 0;
nchars = 0;
while (width != 0) {
@@ -248,7 +192,7 @@
fp->_flags |= __SERR;
goto input_failure;
}
-@@ -443,7 +485,7 @@ literal:
+@@ -448,7 +487,7 @@
fp->_p++;
fp->_r--;
mbs = initial;
@@ -257,7 +201,7 @@
if (nconv == (size_t)-1) {
fp->_flags |= __SERR;
goto input_failure;
-@@ -451,8 +493,8 @@ literal:
+@@ -456,8 +495,8 @@
if (nconv == 0)
*wcp = L'\0';
if (nconv != (size_t)-2) {
@@ -268,7 +212,7 @@
while (n != 0) {
n--;
__ungetc(buf[n],
-@@ -520,7 +562,6 @@ literal:
+@@ -525,7 +564,6 @@
nassigned++;
}
nread += n;
@@ -276,18 +220,18 @@
break;
case CT_STRING:
-@@ -535,8 +576,8 @@ literal:
+@@ -540,8 +578,8 @@
else
wcp = &twc;
n = 0;
- while (!isspace(*fp->_p) && width != 0) {
- if (n == MB_CUR_MAX) {
-+ while (width != 0) {
++ while (!isspace_l(*fp->_p, loc) && width != 0) {
+ if (n == mb_cur_max) {
fp->_flags |= __SERR;
goto input_failure;
}
-@@ -544,7 +585,7 @@ literal:
+@@ -549,7 +587,7 @@
fp->_p++;
fp->_r--;
mbs = initial;
@@ -296,7 +240,7 @@
if (nconv == (size_t)-1) {
fp->_flags |= __SERR;
goto input_failure;
-@@ -552,7 +593,7 @@ literal:
+@@ -557,7 +595,7 @@
if (nconv == 0)
*wcp = L'\0';
if (nconv != (size_t)-2) {
@@ -305,7 +249,7 @@
while (n != 0) {
n--;
__ungetc(buf[n],
-@@ -580,7 +621,7 @@ literal:
+@@ -585,7 +623,7 @@
}
} else if (flags & SUPPRESS) {
n = 0;
@@ -314,7 +258,7 @@
n++, fp->_r--, fp->_p++;
if (--width == 0)
break;
-@@ -590,7 +631,7 @@ literal:
+@@ -595,7 +633,7 @@
nread += n;
} else {
p0 = p = va_arg(ap, char *);
@@ -323,7 +267,7 @@
fp->_r--;
*p++ = *fp->_p++;
if (--width == 0)
-@@ -602,7 +643,6 @@ literal:
+@@ -607,7 +645,6 @@
nread += p - p0;
nassigned++;
}
@@ -331,7 +275,7 @@
continue;
case CT_INT:
-@@ -733,9 +773,9 @@ literal:
+@@ -738,9 +775,9 @@
*p = 0;
if ((flags & UNSIGNED) == 0)
@@ -343,7 +287,7 @@
if (flags & POINTER)
*va_arg(ap, void **) =
(void *)(uintptr_t)res;
-@@ -758,41 +798,46 @@ literal:
+@@ -763,43 +800,52 @@
nassigned++;
}
nread += p - buf;
@@ -358,8 +302,11 @@
- if (width == 0 || width > sizeof(buf) - 1)
- width = sizeof(buf) - 1;
- if ((width = parsefloat(fp, buf, buf + width)) == 0)
-+ if ((width = parsefloat(fp, &pbuf, width, loc)) == 0)
++ if ((width = parsefloat(fp, &pbuf, width, loc)) == 0) {
++ if (pbuf)
++ free(pbuf);
goto match_failure;
++ }
if ((flags & SUPPRESS) == 0) {
if (flags & LONGDBL) {
- long double res = strtold(buf, &p);
@@ -374,10 +321,14 @@
+ float res = strtof_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 */
@@ -399,7 +350,7 @@
/*
* Fill in the given table from the scanset at the given format
* (just after `['). Return a pointer to the character past the
-@@ -800,9 +845,10 @@ match_failure:
+@@ -807,9 +853,10 @@
* considered part of the scanset.
*/
static const u_char *
@@ -411,7 +362,7 @@
{
int c, n, v, i;
-@@ -838,6 +884,7 @@ doswitch:
+@@ -845,6 +892,7 @@
return (fmt - 1);
case '-':
@@ -419,7 +370,7 @@
/*
* A scanset of the form
* [01+-]
-@@ -858,8 +905,8 @@ doswitch:
+@@ -865,8 +913,8 @@
*/
n = *fmt;
if (n == ']'
@@ -430,7 +381,7 @@
)
) {
c = '-';
-@@ -867,14 +914,14 @@ doswitch:
+@@ -874,14 +922,14 @@
}
fmt++;
/* fill in the range */
@@ -448,7 +399,7 @@
)
tab[i] = v;
}
-@@ -894,7 +941,7 @@ doswitch:
+@@ -901,7 +949,7 @@
return (fmt);
#endif
break;
@@ -457,76 +408,28 @@
case ']': /* end of scanset */
return (fmt);
-@@ -907,8 +954,54 @@ doswitch:
- }
+@@ -915,7 +963,7 @@
#ifndef NO_FLOATING_POINT
-+/*
-+ * Maintain a per-thread parsefloat buffer, shared by __svfscanf_l and
-+ * __vfwscanf.
-+ */
-+#ifdef BUILDING_VARIANT
-+extern char *__parsefloat_buf(size_t s);
-+#else /* !BUILDING_VARIANT */
-+__private_extern__ char *
-+__parsefloat_buf(size_t s)
-+{
-+ char *b;
-+ static pthread_key_t parsefloat_tsd_key = (pthread_key_t)-1;
-+ static pthread_mutex_t parsefloat_tsd_lock = PTHREAD_MUTEX_INITIALIZER;
-+ static size_t bsiz = 0;
-+
-+ if (parsefloat_tsd_key == (pthread_key_t)-1) {
-+ pthread_mutex_lock(&parsefloat_tsd_lock);
-+ if (parsefloat_tsd_key == (pthread_key_t)-1) {
-+ parsefloat_tsd_key = __LIBC_PTHREAD_KEY_PARSEFLOAT;
-+ pthread_key_init_np(parsefloat_tsd_key, free);
-+ }
-+ pthread_mutex_unlock(&parsefloat_tsd_lock);
-+ }
-+ if ((b = (char *)pthread_getspecific(parsefloat_tsd_key)) == NULL) {
-+ bsiz = s > BUF ? s : BUF;
-+ b = (char *)malloc(bsiz);
-+ if (b == NULL) {
-+ bsiz = 0;
-+ return NULL;
-+ }
-+ pthread_setspecific(parsefloat_tsd_key, b);
-+ return b;
-+ }
-+ if (s > bsiz) {
-+ b = (char *)reallocf(b, s);
-+ pthread_setspecific(parsefloat_tsd_key, b);
-+ if (b == NULL) {
-+ bsiz = 0;
-+ return NULL;
-+ }
-+ bsiz = s;
-+ }
-+ return b;
-+}
-+#endif /* BUILDING_VARIANT */
-+
static int
-parsefloat(FILE *fp, char *buf, char *end)
+parsefloat(FILE *fp, char **buf, size_t width, locale_t loc)
{
char *commit, *p;
- int infnanpos = 0, decptpos = 0;
-@@ -917,9 +1010,18 @@ parsefloat(FILE *fp, char *buf, char *en
- S_DIGITS, S_DECPT, S_FRAC, S_EXP, S_EXPDIGITS
+ int infnanpos = 0;
+@@ -924,9 +972,18 @@
+ S_DIGITS, S_FRAC, S_EXP, S_EXPDIGITS
} state = S_START;
unsigned char c;
-- const char *decpt = localeconv()->decimal_point;
-+ const char *decpt = localeconv_l(loc)->decimal_point;
+- char decpt = *localeconv()->decimal_point;
++ char decpt = *localeconv_l(loc)->decimal_point;
_Bool gotmantdig = 0, ishex = 0;
--
-+ char *b;
-+ char *e;
++ char *b, *e;
+ size_t s;
-+
-+ s = (width == 0 ? BUF : (width + 1));
-+ if ((b = __parsefloat_buf(s)) == NULL) {
+
++ s = (width == 0 ? BUF : width + 1);
++ b = (char *)malloc(s);
++ if (b == NULL) {
+ *buf = NULL;
+ return 0;
+ }
@@ -534,7 +437,7 @@
/*
* We set commit = p whenever the string we have read so far
* constitutes a valid representation of a floating point
-@@ -929,8 +1031,8 @@ parsefloat(FILE *fp, char *buf, char *en
+@@ -936,8 +993,8 @@
* always necessary to read at least one character that doesn't
* match; thus, we can't short-circuit "infinity" or "nan(...)".
*/
@@ -545,25 +448,25 @@
c = *fp->_p;
reswitch:
switch (state) {
-@@ -988,7 +1090,7 @@ reswitch:
+@@ -997,7 +1054,7 @@
if (c == ')') {
commit = p;
- state = S_DONE;
+ infnanpos = -2;
- } else if (!isalnum(c) && c != '_')
+ } else if (!isalnum_l(c, loc) && c != '_')
goto parsedone;
break;
}
-@@ -1006,7 +1108,7 @@ reswitch:
+@@ -1013,7 +1070,7 @@
goto reswitch;
}
case S_DIGITS:
-- if ((ishex && isxdigit(c)) || isdigit(c)) {
-+ if ((ishex && isxdigit_l(c, loc)) || isdigit_l(c, loc)) {
+- if ((ishex && isxdigit(c)) || isdigit(c))
++ if ((ishex && isxdigit_l(c, loc)) || isdigit_l(c, loc))
gotmantdig = 1;
- commit = p;
- break;
-@@ -1041,7 +1143,7 @@ reswitch:
+ else {
+ state = S_FRAC;
+@@ -1030,7 +1087,7 @@
goto parsedone;
else
state = S_EXP;
@@ -572,7 +475,7 @@
commit = p;
gotmantdig = 1;
} else
-@@ -1054,13 +1156,26 @@ reswitch:
+@@ -1043,7 +1100,7 @@
else
goto reswitch;
case S_EXPDIGITS:
@@ -581,27 +484,25 @@
commit = p;
else
goto parsedone;
- break;
+@@ -1051,6 +1108,17 @@
default:
-- abort();
-+ LIBC_ABORT("unknown state %d", state);
-+ }
+ abort();
+ }
+ if (p >= e) {
-+ ssize_t diff = (p - b);
-+ ssize_t com = (commit - b);
++ size_t diff = (p - b);
+ s += BUF;
-+ b = __parsefloat_buf(s);
++ b = (char *)reallocf(b, s);
+ if (b == NULL) {
+ *buf = NULL;
+ return 0;
+ }
+ e = b + (s - 1);
+ p = b + diff;
-+ commit = b + com;
- }
++ }
*p++ = c;
if (--fp->_r > 0)
-@@ -1073,6 +1188,7 @@ parsedone:
+ fp->_p++;
+@@ -1062,6 +1130,7 @@
while (commit < --p)
__ungetc(*(u_char *)p, fp);
*++commit = '\0';