Loading...
--- Libc/Libc-763.11/stdio/FreeBSD/vfprintf.c.patch
+++ Libc/Libc-391.4.2/stdio/FreeBSD/vfprintf.c.patch
@@ -1,93 +1,82 @@
---- vfprintf.c.orig 2010-11-22 22:37:24.000000000 -0800
-+++ vfprintf.c 2010-11-22 22:38:38.000000000 -0800
-@@ -36,6 +36,8 @@ static char sccsid[] = "@(#)vfprintf.c 8
+--- vfprintf.c.orig 2004-11-25 11:38:35.000000000 -0800
++++ vfprintf.c 2005-11-08 22:43:11.000000000 -0800
+@@ -40,6 +40,8 @@
#include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.90 2009/02/28 06:06:57 das Exp $");
+ __FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.68 2004/08/26 06:25:28 des Exp $");
+#include "xlocale_private.h"
+
/*
* Actual printf innards.
*
-@@ -54,7 +56,10 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/v
+@@ -58,6 +60,7 @@
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-+#if 0 // xprintf pending API review
- #include <printf.h>
-+#endif
+#include <errno.h>
#include <stdarg.h>
#include "un-namespace.h"
-@@ -64,10 +69,11 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/v
+@@ -66,6 +69,13 @@
+ #include "local.h"
#include "fvwrite.h"
- #include "printflocal.h"
-
--static int __sprint(FILE *, struct __suio *);
--static int __sbprintf(FILE *, const char *, va_list) __printflike(2, 0)
-- __noinline;
+
++#ifdef VECTORS
++typedef __attribute__ ((vector_size(16))) unsigned char VECTORTYPE;
++#ifdef __SSE2__
++#define V64TYPE
++#endif /* __SSE2__ */
++#endif /* VECTORS */
++
+ union arg {
+ int intarg;
+ u_int uintarg;
+@@ -93,6 +103,21 @@
+ #endif
+ wint_t wintarg;
+ wchar_t *pwchararg;
++#ifdef VECTORS
++ VECTORTYPE vectorarg;
++ unsigned char vuchararg[16];
++ signed char vchararg[16];
++ unsigned short vushortarg[8];
++ signed short vshortarg[8];
++ unsigned int vuintarg[4];
++ signed int vintarg[4];
++ float vfloatarg[4];
++#ifdef V64TYPE
++ double vdoublearg[2];
++ unsigned long long vulonglongarg[2];
++ long long vlonglongarg[2];
++#endif /* V64TYPE */
++#endif /* VECTORS */
+ };
+
+ /*
+@@ -103,16 +128,20 @@
+ T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG,
+ T_PTRDIFFT, TP_PTRDIFFT, T_SIZET, TP_SIZET,
+ T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
++#ifdef VECTORS
++ T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR, T_VECTOR
++#else /* ! VECTORS */
+ T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
++#endif /* VECTORS */
+ };
+
+ static int __sprint(FILE *, struct __suio *);
+-static int __sbprintf(FILE *, const char *, va_list) __printflike(2, 0);
++static int __sbprintf(FILE *, locale_t, const char *, va_list) __printflike(3, 0);
+ static char *__ujtoa(uintmax_t, char *, int, int, const char *, int, char,
+ const char *);
+ static char *__ultoa(u_long, char *, int, int, const char *, int, char,
+ const char *);
-static char *__wcsconv(wchar_t *, int);
-+static int __sprint(FILE *, locale_t, struct __suio *);
-+static int __sbprintf(FILE *, locale_t, const char *, va_list) __printflike(3, 0);
+static char *__wcsconv(wchar_t *, int, locale_t);
-+
-+__private_extern__ const char *__fix_nogrouping(const char *);
-
- #define CHAR char
- #include "printfcommon.h"
-@@ -87,12 +93,12 @@ struct grouping_state {
- * of bytes that will be needed.
- */
- static int
--grouping_init(struct grouping_state *gs, int ndigits)
-+grouping_init(struct grouping_state *gs, int ndigits, locale_t loc)
- {
- struct lconv *locale;
-
-- locale = localeconv();
-- gs->grouping = locale->grouping;
-+ locale = localeconv_l(loc);
-+ gs->grouping = __fix_nogrouping(locale->grouping);
- gs->thousands_sep = locale->thousands_sep;
- gs->thousep_len = strlen(gs->thousands_sep);
-
-@@ -116,11 +122,11 @@ grouping_init(struct grouping_state *gs,
- */
- static int
- grouping_print(struct grouping_state *gs, struct io_state *iop,
-- const CHAR *cp, const CHAR *ep)
-+ const CHAR *cp, const CHAR *ep, locale_t loc)
- {
- const CHAR *cp0 = cp;
-
-- if (io_printandpad(iop, cp, ep, gs->lead, zeroes))
-+ if (io_printandpad(iop, cp, ep, gs->lead, zeroes, loc))
- return (-1);
- cp += gs->lead;
- while (gs->nseps > 0 || gs->nrepeats > 0) {
-@@ -130,9 +136,9 @@ grouping_print(struct grouping_state *gs
- gs->grouping--;
- gs->nseps--;
- }
-- if (io_print(iop, gs->thousands_sep, gs->thousep_len))
-+ if (io_print(iop, gs->thousands_sep, gs->thousep_len, loc))
- return (-1);
-- if (io_printandpad(iop, cp, ep, *gs->grouping, zeroes))
-+ if (io_printandpad(iop, cp, ep, *gs->grouping, zeroes, loc))
- return (-1);
- cp += *gs->grouping;
- }
-@@ -146,7 +152,7 @@ grouping_print(struct grouping_state *gs
- * then reset it so that it can be reused.
- */
- static int
--__sprint(FILE *fp, struct __suio *uio)
-+__sprint(FILE *fp, locale_t loc __unused, struct __suio *uio)
- {
- int err;
-
-@@ -166,11 +172,14 @@ __sprint(FILE *fp, struct __suio *uio)
+ static void __find_arguments(const char *, va_list, union arg **);
+ static void __grow_type_table(int, enum typeid **, int *);
+
+@@ -141,7 +170,7 @@
* worries about ungetc buffers and so forth.
*/
static int
@@ -96,14 +85,7 @@
{
int ret;
FILE fake;
- unsigned char buf[BUFSIZ];
-+ struct __sFILEX ext;
-+ fake._extra = &ext;
-+ INITEXTRA(&fake);
-
- /* XXX This is probably not needed. */
- if (prepwrite(fp) != 0)
-@@ -190,7 +199,7 @@ __sbprintf(FILE *fp, const char *fmt, va
+@@ -160,7 +189,7 @@
fake._lbfsize = 0; /* not actually used, but Just In Case */
/* do the work, then copy any error status */
@@ -112,8 +94,8 @@
if (ret >= 0 && __fflush(&fake))
ret = EOF;
if (fake._flags & __SERR)
-@@ -205,7 +214,7 @@ __sbprintf(FILE *fp, const char *fmt, va
- * string ends is null-terminated.
+@@ -336,7 +365,7 @@
+ * that the wide char. string ends in a null character.
*/
static char *
-__wcsconv(wchar_t *wcsarg, int prec)
@@ -121,70 +103,64 @@
{
static const mbstate_t initial;
mbstate_t mbs;
-@@ -218,7 +227,7 @@ __wcsconv(wchar_t *wcsarg, int prec)
- if (prec < 0) {
+@@ -354,7 +383,7 @@
+ p = wcsarg;
+ mbs = initial;
+ for (;;) {
+- clen = wcrtomb(buf, *p++, &mbs);
++ clen = wcrtomb_l(buf, *p++, &mbs, loc);
+ if (clen == 0 || clen == (size_t)-1 ||
+ nbytes + clen > prec)
+ break;
+@@ -363,7 +392,7 @@
+ } else {
p = wcsarg;
mbs = initial;
- nbytes = wcsrtombs(NULL, (const wchar_t **)&p, 0, &mbs);
+ nbytes = wcsrtombs_l(NULL, (const wchar_t **)&p, 0, &mbs, loc);
if (nbytes == (size_t)-1)
return (NULL);
- } else {
-@@ -234,7 +243,7 @@ __wcsconv(wchar_t *wcsarg, int prec)
- p = wcsarg;
- mbs = initial;
- for (;;) {
-- clen = wcrtomb(buf, *p++, &mbs);
-+ clen = wcrtomb_l(buf, *p++, &mbs, loc);
- if (clen == 0 || clen == (size_t)-1 ||
- nbytes + clen > prec)
- break;
-@@ -248,8 +257,8 @@ __wcsconv(wchar_t *wcsarg, int prec)
- /* Fill the output buffer. */
+ }
+@@ -378,7 +407,7 @@
p = wcsarg;
mbs = initial;
-- if ((nbytes = wcsrtombs(convbuf, (const wchar_t **)&p,
-- nbytes, &mbs)) == (size_t)-1) {
-+ if ((nbytes = wcsrtombs_l(convbuf, (const wchar_t **)&p,
-+ nbytes, &mbs, loc)) == (size_t)-1) {
- free(convbuf);
- return (NULL);
- }
-@@ -261,22 +270,30 @@ __wcsconv(wchar_t *wcsarg, int prec)
- * MT-safe version
- */
- int
--vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap)
-+vfprintf_l(FILE * __restrict fp, locale_t loc, const char * __restrict fmt0, va_list ap)
-
- {
+ while (mbp - convbuf < nbytes) {
+- clen = wcrtomb(mbp, *p++, &mbs);
++ clen = wcrtomb_l(mbp, *p++, &mbs, loc);
+ if (clen == 0 || clen == (size_t)-1)
+ break;
+ mbp += clen;
+@@ -402,7 +431,21 @@
int ret;
+ FLOCKFILE(fp);
+- ret = __vfprintf(fp, fmt0, ap);
++ ret = __vfprintf(fp, __current_locale(), fmt0, ap);
++ FUNLOCKFILE(fp);
++ return (ret);
++}
++
++int
++vfprintf_l(FILE * __restrict fp, locale_t loc, const char * __restrict fmt0,
++ va_list ap)
++
++{
++ int ret;
++
+ NORMALIZE_LOCALE(loc);
- FLOCKFILE(fp);
- /* optimise fprintf(stderr) (and other unbuffered Unix files) */
- if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
- fp->_file >= 0)
-- ret = __sbprintf(fp, fmt0, ap);
-+ ret = __sbprintf(fp, loc, fmt0, ap);
- else
-- ret = __vfprintf(fp, fmt0, ap);
-+ ret = __vfprintf(fp, loc, fmt0, ap);
++ FLOCKFILE(fp);
++ ret = __vfprintf(fp, loc, fmt0, ap);
FUNLOCKFILE(fp);
return (ret);
}
-
-+int
-+vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap)
-+
-+{
-+ return vfprintf_l(fp, __current_locale(), fmt0, ap);
-+}
-+
- /*
- * The size of the buffer we use as scratch space for integer
- * conversions, among other things. We need enough space to
-@@ -291,8 +308,8 @@ vfprintf(FILE * __restrict fp, const cha
+@@ -451,12 +494,15 @@
+ #define PTRDIFFT 0x800 /* ptrdiff_t */
+ #define INTMAXT 0x1000 /* intmax_t */
+ #define CHARINT 0x2000 /* print char using int format */
++#ifdef VECTORS
++#define VECTOR 0x4000 /* Altivec or SSE vector */
++#endif /* VECTORS */
+
/*
* Non-MT-safe version
*/
@@ -195,9 +171,9 @@
{
char *fmt; /* format string */
int ch; /* character from fmt */
-@@ -335,6 +352,11 @@ __vfprintf(FILE *fp, const char *fmt0, v
- char expstr[MAXEXPDIG+2]; /* buffer for exponent string: e+ZZZ */
- char *dtoaresult; /* buffer allocated by dtoa */
+@@ -502,6 +548,11 @@
+ int nseps; /* number of group separators with ' */
+ int nrepeats; /* number of repeats of the last group */
#endif
+#ifdef VECTORS
+ union arg vval; /* Vector argument. */
@@ -207,71 +183,35 @@
u_long ulval; /* integer arguments %[diouxX] */
uintmax_t ujval; /* %j, %ll, %q, %t, %z integers */
int base; /* base for [diouxX] conversion */
-@@ -357,19 +379,19 @@ __vfprintf(FILE *fp, const char *fmt0, v
-
- /* BEWARE, these `goto error' on error. */
- #define PRINT(ptr, len) { \
-- if (io_print(&io, (ptr), (len))) \
-+ if (io_print(&io, (ptr), (len), loc)) \
- goto error; \
- }
- #define PAD(howmany, with) { \
-- if (io_pad(&io, (howmany), (with))) \
-+ if (io_pad(&io, (howmany), (with), loc)) \
- goto error; \
- }
- #define PRINTANDPAD(p, ep, len, with) { \
-- if (io_printandpad(&io, (p), (ep), (len), (with))) \
-+ if (io_printandpad(&io, (p), (ep), (len), (with), loc)) \
- goto error; \
- }
- #define FLUSH() { \
-- if (io_flush(&io)) \
-+ if (io_flush(&io, loc)) \
- goto error; \
- }
-
-@@ -405,7 +427,7 @@ __vfprintf(FILE *fp, const char *fmt0, v
- #define UJARG() \
- (flags&INTMAXT ? GETARG(uintmax_t) : \
- flags&SIZET ? (uintmax_t)GETARG(size_t) : \
-- flags&PTRDIFFT ? (uintmax_t)GETARG(ptrdiff_t) : \
-+ flags&PTRDIFFT ? (uintmax_t)(unsigned long)GETARG(ptrdiff_t) : \
- (uintmax_t)GETARG(unsigned long long))
-
- /*
-@@ -436,14 +458,19 @@ __vfprintf(FILE *fp, const char *fmt0, v
+@@ -633,22 +684,23 @@
val = GETARG (int); \
}
-+#if 0 // xprintf pending API review
- if (__use_xprintf == 0 && getenv("USE_XPRINTF"))
- __use_xprintf = 1;
- if (__use_xprintf > 0)
-- return (__xvprintf(fp, fmt0, ap));
-+ return (__xvprintf(fp, loc, fmt0, ap));
-+#endif
-
+-
+ thousands_sep = '\0';
+ grouping = NULL;
+ convbuf = NULL;
+ #ifndef NO_FLOATING_POINT
+ dtoaresult = NULL;
+- decimal_point = localeconv()->decimal_point;
++ decimal_point = localeconv_l(loc)->decimal_point;
+ #endif
/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
- if (prepwrite(fp) != 0)
+ if (prepwrite(fp) != 0) {
+ errno = EBADF;
return (EOF);
+ }
-+ ORIENT(fp, -1);
-
- convbuf = NULL;
+
+ /* optimise fprintf(stderr) (and other unbuffered Unix files) */
+ if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
+ fp->_file >= 0)
+- return (__sbprintf(fp, fmt0, ap));
++ return (__sbprintf(fp, loc, fmt0, ap));
+
fmt = (char *)fmt0;
-@@ -454,7 +481,7 @@ __vfprintf(FILE *fp, const char *fmt0, v
- ret = 0;
- #ifndef NO_FLOATING_POINT
- dtoaresult = NULL;
-- decimal_point = localeconv()->decimal_point;
-+ decimal_point = localeconv_l(loc)->decimal_point;
- /* The overwhelmingly common case is decpt_len == 1. */
- decpt_len = (decimal_point[1] == '\0' ? 1 : strlen(decimal_point));
- #endif
-@@ -475,6 +502,9 @@ __vfprintf(FILE *fp, const char *fmt0, v
+ argtable = NULL;
+@@ -675,6 +727,9 @@
}
if (ch == '\0')
goto done;
@@ -281,8 +221,8 @@
fmt++; /* skip over '%' */
flags = 0;
-@@ -484,6 +514,9 @@ __vfprintf(FILE *fp, const char *fmt0, v
- gs.grouping = NULL;
+@@ -683,6 +738,9 @@
+ prec = -1;
sign = '\0';
ox[1] = '\0';
+#ifdef VECTORS
@@ -291,7 +231,7 @@
rflag: ch = *fmt++;
reswitch: switch (ch) {
-@@ -499,6 +532,11 @@ reswitch: switch (ch) {
+@@ -698,6 +756,11 @@
case '#':
flags |= ALT;
goto rflag;
@@ -303,7 +243,18 @@
case '*':
/*-
* ``A negative field width argument is taken as a
-@@ -595,14 +633,18 @@ reswitch: switch (ch) {
+@@ -718,8 +781,8 @@
+ goto rflag;
+ case '\'':
+ flags |= GROUPING;
+- thousands_sep = *(localeconv()->thousands_sep);
+- grouping = localeconv()->grouping;
++ thousands_sep = *(localeconv_l(loc)->thousands_sep);
++ grouping = localeconv_l(loc)->grouping;
+ goto rflag;
+ case '.':
+ if ((ch = *fmt++) == '*') {
+@@ -793,14 +856,18 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'c':
@@ -324,7 +275,7 @@
if (mbseqlen == (size_t)-1) {
fp->_flags |= __SERR;
goto error;
-@@ -619,6 +661,10 @@ reswitch: switch (ch) {
+@@ -817,6 +884,10 @@
/*FALLTHROUGH*/
case 'd':
case 'i':
@@ -335,7 +286,7 @@
if (flags & INTMAX_SIZE) {
ujval = SJARG();
if ((intmax_t)ujval < 0) {
-@@ -637,6 +683,12 @@ reswitch: switch (ch) {
+@@ -835,6 +906,12 @@
#ifndef NO_FLOATING_POINT
case 'a':
case 'A':
@@ -348,7 +299,7 @@
if (ch == 'a') {
ox[1] = 'x';
xdigs = xdigs_lower;
-@@ -650,6 +702,12 @@ reswitch: switch (ch) {
+@@ -848,6 +925,12 @@
prec++;
if (dtoaresult != NULL)
freedtoa(dtoaresult);
@@ -361,7 +312,7 @@
if (flags & LONGDBL) {
fparg.ldbl = GETARG(long double);
dtoaresult = cp =
-@@ -661,6 +719,7 @@ reswitch: switch (ch) {
+@@ -859,6 +942,7 @@
__hdtoa(fparg.dbl, xdigs, prec,
&expt, &signflag, &dtoaend);
}
@@ -369,7 +320,7 @@
if (prec < 0)
prec = dtoaend - cp;
if (expt == INT_MAX)
-@@ -668,6 +727,12 @@ reswitch: switch (ch) {
+@@ -866,6 +950,12 @@
goto fp_common;
case 'e':
case 'E':
@@ -382,7 +333,7 @@
expchar = ch;
if (prec < 0) /* account for digit before decpt */
prec = DEFPREC + 1;
-@@ -676,10 +741,22 @@ reswitch: switch (ch) {
+@@ -874,10 +964,22 @@
goto fp_begin;
case 'f':
case 'F':
@@ -405,7 +356,7 @@
expchar = ch - ('g' - 'e');
if (prec == 0)
prec = 1;
-@@ -688,6 +765,14 @@ fp_begin:
+@@ -886,6 +988,14 @@
prec = DEFPREC;
if (dtoaresult != NULL)
freedtoa(dtoaresult);
@@ -420,7 +371,7 @@
if (flags & LONGDBL) {
fparg.ldbl = GETARG(long double);
dtoaresult = cp =
-@@ -701,6 +786,7 @@ fp_begin:
+@@ -899,6 +1009,7 @@
if (expt == 9999)
expt = INT_MAX;
}
@@ -428,53 +379,7 @@
fp_common:
if (signflag)
sign = '-';
-@@ -750,37 +836,46 @@ fp_common:
- if (prec || flags & ALT)
- size += prec + decpt_len;
- if ((flags & GROUPING) && expt > 0)
-- size += grouping_init(&gs, expt);
-+ size += grouping_init(&gs, expt, loc);
- }
- break;
- #endif /* !NO_FLOATING_POINT */
- case 'n':
-+ {
- /*
- * Assignment-like behavior is specified if the
- * value overflows or is otherwise unrepresentable.
- * C99 says to use `signed char' for %hhn conversions.
- */
-- if (flags & LLONGINT)
-- *GETARG(long long *) = ret;
-+ void *ptr = GETARG(void *);
-+ if (ptr == NULL)
-+ continue;
-+ else if (flags & LLONGINT)
-+ *(long long *)ptr = ret;
- else if (flags & SIZET)
-- *GETARG(ssize_t *) = (ssize_t)ret;
-+ *(ssize_t *)ptr = (ssize_t)ret;
- else if (flags & PTRDIFFT)
-- *GETARG(ptrdiff_t *) = ret;
-+ *(ptrdiff_t *)ptr = ret;
- else if (flags & INTMAXT)
-- *GETARG(intmax_t *) = ret;
-+ *(intmax_t *)ptr = ret;
- else if (flags & LONGINT)
-- *GETARG(long *) = ret;
-+ *(long *)ptr = ret;
- else if (flags & SHORTINT)
-- *GETARG(short *) = ret;
-+ *(short *)ptr = ret;
- else if (flags & CHARINT)
-- *GETARG(signed char *) = ret;
-+ *(signed char *)ptr = ret;
- else
-- *GETARG(int *) = ret;
-+ *(int *)ptr = ret;
- continue; /* no output */
-+ }
- case 'O':
+@@ -993,6 +1104,10 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'o':
@@ -485,7 +390,7 @@
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -795,6 +890,10 @@ fp_common:
+@@ -1007,6 +1122,10 @@
* defined manner.''
* -- ANSI X3J11
*/
@@ -496,7 +401,7 @@
ujval = (uintmax_t)(uintptr_t)GETARG(void *);
base = 16;
xdigs = xdigs_lower;
-@@ -813,7 +912,7 @@ fp_common:
+@@ -1025,7 +1144,7 @@
if ((wcp = GETARG(wchar_t *)) == NULL)
cp = "(null)";
else {
@@ -505,7 +410,7 @@
if (convbuf == NULL) {
fp->_flags |= __SERR;
goto error;
-@@ -829,6 +928,10 @@ fp_common:
+@@ -1056,6 +1175,10 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'u':
@@ -516,7 +421,7 @@
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -841,6 +944,10 @@ fp_common:
+@@ -1068,6 +1191,10 @@
case 'x':
xdigs = xdigs_lower;
hex:
@@ -527,23 +432,9 @@
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -858,6 +965,7 @@ nosign: sign = '\0';
- * ``... diouXx conversions ... if a precision is
- * specified, the 0 flag will be ignored.''
- * -- ANSI X3J11
-+ * except for %#.0o and zero value
- */
- number: if ((dprec = prec) >= 0)
- flags &= ~ZEROPAD;
-@@ -885,10 +993,15 @@ number: if ((dprec = prec) >= 0)
- }
- size = buf + BUF - cp;
+@@ -1112,6 +1239,11 @@
if (size > BUF) /* should never happen */
-- abort();
-+ LIBC_ABORT("size (%d) > BUF (%d)", size, BUF);
- if ((flags & GROUPING) && size != 0)
-- size += grouping_init(&gs, size);
-+ size += grouping_init(&gs, size, loc);
+ abort();
break;
+#ifdef VECTORS
+ case 'v':
@@ -553,7 +444,7 @@
default: /* "%?" prints ?, unless ? is NUL */
if (ch == '\0')
goto done;
-@@ -900,6 +1013,290 @@ number: if ((dprec = prec) >= 0)
+@@ -1123,6 +1255,290 @@
break;
}
@@ -719,25 +610,25 @@
+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vuchararg[ind]); \
+ break; \
+ case V_PCHAR: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vuchararg[ind]); \
++ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(long)vval.vuchararg[ind]); \
+ break; \
+ case V_SHORT: \
+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vushortarg[ind]); \
+ break; \
+ case V_PSHORT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vushortarg[ind]); \
++ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(long)vval.vushortarg[ind]); \
+ break; \
+ case V_INT: \
+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vuintarg[ind]); \
+ break; \
+ case V_PINT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vuintarg[ind]); \
++ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(long)vval.vuintarg[ind]); \
+ break; \
+ case V_LONGLONG: \
+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vulonglongarg[ind]); \
+ break; \
+ case V_PLONGLONG: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vulonglongarg[ind]); \
++ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(long)vval.vulonglongarg[ind]); \
+ break; \
+ case V_FLOAT: \
+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vfloatarg[ind]); \
@@ -758,19 +649,19 @@
+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vuchararg[ind]); \
+ break; \
+ case V_PCHAR: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vuchararg[ind]); \
++ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(long)vval.vuchararg[ind]); \
+ break; \
+ case V_SHORT: \
+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vushortarg[ind]); \
+ break; \
+ case V_PSHORT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vushortarg[ind]); \
++ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(long)vval.vushortarg[ind]); \
+ break; \
+ case V_INT: \
+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vuintarg[ind]); \
+ break; \
+ case V_PINT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vuintarg[ind]); \
++ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(long)vval.vuintarg[ind]); \
+ break; \
+ case V_FLOAT: \
+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vfloatarg[ind]); \
@@ -844,21 +735,92 @@
/*
* All reasonable formats wind up here. At this point, `cp'
* points to a string which (if not flags&LADJUST) should be
-@@ -950,7 +1347,7 @@ number: if ((dprec = prec) >= 0)
- /* leading zeroes from decimal precision */
- PAD(dprec - size, zeroes);
- if (gs.grouping) {
-- if (grouping_print(&gs, &io, cp, buf+BUF) < 0)
-+ if (grouping_print(&gs, &io, cp, buf+BUF, loc) < 0)
- goto error;
- } else {
- PRINT(cp, size);
-@@ -968,7 +1365,7 @@ number: if ((dprec = prec) >= 0)
- } else {
- if (gs.grouping) {
- n = grouping_print(&gs, &io,
-- cp, dtoaend);
-+ cp, dtoaend, loc);
- if (n < 0)
- goto error;
- cp += n;
+@@ -1406,6 +1822,11 @@
+ if (flags & LONGINT)
+ ADDTYPE(T_WINT);
+ else
++#ifdef VECTORS
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif /* VECTORS */
+ ADDTYPE(T_INT);
+ break;
+ case 'D':
+@@ -1413,6 +1834,11 @@
+ /*FALLTHROUGH*/
+ case 'd':
+ case 'i':
++#ifdef VECTORS
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif
+ ADDSARG();
+ break;
+ #ifndef NO_FLOATING_POINT
+@@ -1423,6 +1849,11 @@
+ case 'f':
+ case 'g':
+ case 'G':
++#ifdef VECTORS
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif /* VECTORS */
+ if (flags & LONGDBL)
+ ADDTYPE(T_LONG_DOUBLE);
+ else
+@@ -1451,9 +1882,19 @@
+ flags |= LONGINT;
+ /*FALLTHROUGH*/
+ case 'o':
++#ifdef VECTORS
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif /* VECTORS */
+ ADDUARG();
+ break;
+ case 'p':
++#ifdef VECTORS
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif /* VECTORS */
+ ADDTYPE(TP_VOID);
+ break;
+ case 'S':
+@@ -1471,6 +1912,11 @@
+ case 'u':
+ case 'X':
+ case 'x':
++#ifdef VECTORS
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif /* VECTORS */
+ ADDUARG();
+ break;
+ default: /* "%?" prints ?, unless ? is NUL */
+@@ -1537,7 +1983,7 @@
+ (*argtable) [n].sizearg = va_arg (ap, size_t);
+ break;
+ case TP_SIZET:
+- (*argtable) [n].psizearg = va_arg (ap, ssize_t *);
++ (*argtable) [n].psizearg = va_arg (ap, size_t *);
+ break;
+ case T_INTMAXT:
+ (*argtable) [n].intmaxarg = va_arg (ap, intmax_t);
+@@ -1556,6 +2002,11 @@
+ (*argtable) [n].longdoublearg = va_arg (ap, long double);
+ break;
+ #endif
++#ifdef VECTORS
++ case T_VECTOR:
++ (*argtable) [n].vectorarg = va_arg (ap, VECTORTYPE);
++ break;
++#endif /* VECTORS */
+ case TP_CHAR:
+ (*argtable) [n].pchararg = va_arg (ap, char *);
+ break;