Loading...
--- Libc/Libc-391.2.5/stdio/FreeBSD/vfwprintf.c.patch
+++ Libc/Libc-320/stdio/FreeBSD/vfwprintf.c.patch
@@ -1,35 +1,36 @@
---- vfwprintf.c.orig 2004-11-25 11:38:36.000000000 -0800
-+++ vfwprintf.c 2005-02-24 15:17:14.000000000 -0800
-@@ -42,6 +42,8 @@
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.23 2004/08/26 06:25:28 des Exp $");
-
-+#include "xlocale_private.h"
-+
- /*
- * Actual wprintf innards.
- *
-@@ -63,12 +65,19 @@
- #include <string.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <errno.h>
- #include "un-namespace.h"
-
- #include "libc_private.h"
+--- vfwprintf.c.orig Thu Jul 24 12:42:14 2003
++++ vfwprintf.c Sun Aug 24 16:22:23 2003
+@@ -70,9 +70,20 @@
#include "local.h"
#include "fvwrite.h"
+#ifdef ALTIVEC
+#include <machine/cpu_capabilities.h>
+
-+#define VECTORTYPE vector unsigned char
-+#endif /* ALTIVEC */
++#define VECTORTYPE vector unsigned char
++#endif /* ALTIVEC */
++
+ /* Define FLOATING_POINT to get floating point. */
+ #define FLOATING_POINT
+
++/* if no floating point, turn off HEXFLOAT as well */
++#if defined(HEXFLOAT) && !defined(FLOATING_POINT)
++#undef HEXFLOAT
++#endif /* defined(HEXFLOAT) && !defined(FLOATING_POINT) */
+
union arg {
int intarg;
u_int uintarg;
-@@ -96,6 +105,16 @@
+@@ -92,7 +103,7 @@
+ long *plongarg;
+ long long *plonglongarg;
+ ptrdiff_t *pptrdiffarg;
+- size_t *psizearg;
++ ssize_t *psizearg;
+ intmax_t *pintmaxarg;
+ #ifdef FLOATING_POINT
+ double doublearg;
+@@ -100,6 +111,16 @@
#endif
wint_t wintarg;
wchar_t *pwchararg;
@@ -46,7 +47,7 @@
};
/*
-@@ -106,26 +125,63 @@
+@@ -110,7 +131,11 @@
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,
@@ -57,16 +58,8 @@
+#endif /* ALTIVEC */
};
--static int __sbprintf(FILE *, const wchar_t *, va_list);
--static wint_t __xfputwc(wchar_t, FILE *);
-+static int __sbprintf(FILE *, locale_t, const wchar_t *, va_list);
-+static wint_t __xfputwc(wchar_t, FILE *, locale_t);
- static wchar_t *__ujtoa(uintmax_t, wchar_t *, int, int, const char *, int,
- char, const char *);
- static wchar_t *__ultoa(u_long, wchar_t *, int, int, const char *, int,
- char, const char *);
--static wchar_t *__mbsconv(char *, int);
-+static wchar_t *__mbsconv(char *, int, locale_t);
+ static int __sbprintf(FILE *, const wchar_t *, va_list);
+@@ -122,6 +147,37 @@
static void __find_arguments(const wchar_t *, va_list, union arg **);
static void __grow_type_table(int, enum typeid **, int *);
@@ -87,8 +80,6 @@
+ * processor would crash on illegal instruction. By isolating the calling
+ * sequence in getvec(), __vprintf() is callable by a non-Altivec processor.
+ *-----------------------------------------------------------------------*/
-+static va_list getvec(union arg *, const union arg *, int, va_list) __attribute__((noinline));
-+
+static va_list
+getvec(union arg *dst, const union arg *argtable, int nextarg, va_list ap)
+{
@@ -106,103 +97,23 @@
/*
* Helper function for `fprintf to unbuffered unix file': creates a
* temporary buffer. We only work on write-only files; this avoids
- * worries about ungetc buffers and so forth.
- */
- static int
--__sbprintf(FILE *fp, const wchar_t *fmt, va_list ap)
-+__sbprintf(FILE *fp, locale_t loc, const wchar_t *fmt, va_list ap)
- {
- int ret;
- FILE fake;
-@@ -144,7 +200,7 @@
- fake._lbfsize = 0; /* not actually used, but Just In Case */
-
- /* do the work, then copy any error status */
-- ret = __vfwprintf(&fake, fmt, ap);
-+ ret = __vfwprintf(&fake, loc, fmt, ap);
- if (ret >= 0 && __fflush(&fake))
- ret = WEOF;
- if (fake._flags & __SERR)
-@@ -157,7 +213,7 @@
- * File must already be locked.
- */
- static wint_t
--__xfputwc(wchar_t wc, FILE *fp)
-+__xfputwc(wchar_t wc, FILE *fp, locale_t loc)
- {
- static const mbstate_t initial;
- mbstate_t mbs;
-@@ -167,10 +223,10 @@
- size_t len;
-
- if ((fp->_flags & __SSTR) == 0)
-- return (__fputwc(wc, fp));
-+ return (__fputwc(wc, fp, loc));
-
- mbs = initial;
-- if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1) {
-+ if ((len = wcrtomb_l(buf, wc, &mbs, loc)) == (size_t)-1) {
- fp->_flags |= __SERR;
- return (WEOF);
- }
-@@ -350,13 +406,14 @@
- * that the multibyte char. string ends in a null character.
- */
- static wchar_t *
--__mbsconv(char *mbsarg, int prec)
-+__mbsconv(char *mbsarg, int prec, locale_t loc)
- {
- static const mbstate_t initial;
- mbstate_t mbs;
- wchar_t *convbuf, *wcp;
- const char *p;
- size_t insize, nchars, nconv;
-+ int mb_cur_max = MB_CUR_MAX_L(loc);
-
- if (mbsarg == NULL)
- return (NULL);
-@@ -374,7 +431,7 @@
- insize = nchars = 0;
- mbs = initial;
- while (nchars != (size_t)prec) {
-- nconv = mbrlen(p, MB_CUR_MAX, &mbs);
-+ nconv = mbrlen_l(p, mb_cur_max, &mbs, loc);
- if (nconv == 0 || nconv == (size_t)-1 ||
- nconv == (size_t)-2)
- break;
-@@ -399,7 +456,7 @@
- p = mbsarg;
- mbs = initial;
- while (insize != 0) {
-- nconv = mbrtowc(wcp, p, insize, &mbs);
-+ nconv = mbrtowc_l(wcp, p, insize, &mbs, loc);
- if (nconv == 0 || nconv == (size_t)-1 || nconv == (size_t)-2)
- break;
- wcp++;
-@@ -425,7 +482,21 @@
- int ret;
-
- FLOCKFILE(fp);
-- ret = __vfwprintf(fp, fmt0, ap);
-+ ret = __vfwprintf(fp, __current_locale(), fmt0, ap);
-+ FUNLOCKFILE(fp);
-+ return (ret);
-+}
-+
-+int
-+vfwprintf_l(FILE * __restrict fp, locale_t loc, const wchar_t * __restrict fmt0,
-+ va_list ap)
-+
-+{
-+ int ret;
-+
-+ NORMALIZE_LOCALE(loc);
-+ FLOCKFILE(fp);
-+ ret = __vfwprintf(fp, loc, fmt0, ap);
- FUNLOCKFILE(fp);
- return (ret);
- }
-@@ -474,12 +545,15 @@
+@@ -418,6 +474,15 @@
+
+ #endif /* FLOATING_POINT */
+
++#ifdef HEXFLOAT
++extern int __hdtoa(double d, const char *xdigs, int prec, char *cp,
++ int *expt, int *signflag, char **dtoaend);
++#if !__TYPE_LONGDOUBLE_IS_DOUBLE
++extern int __hldtoa(long double d, const char *xdigs, int prec, char *cp,
++ int *expt, int *signflag, char **dtoaend);
++#endif /* !__TYPE_LONGDOUBLE_IS_DOUBLE */
++#endif /* HEXFLOAT */
++
+ /*
+ * The size of the buffer we use as scratch space for integer
+ * conversions, among other things. Technically, we would need the
+@@ -446,6 +511,9 @@
#define PTRDIFFT 0x800 /* ptrdiff_t */
#define INTMAXT 0x1000 /* intmax_t */
#define CHARINT 0x2000 /* print char using int format */
@@ -212,15 +123,7 @@
/*
* Non-MT-safe version
- */
--int
--__vfwprintf(FILE *fp, const wchar_t *fmt0, va_list ap)
-+__private_extern__ int
-+__vfwprintf(FILE *fp, locale_t loc, const wchar_t *fmt0, va_list ap)
- {
- wchar_t *fmt; /* format string */
- wchar_t ch; /* character from fmt */
-@@ -524,6 +598,11 @@
+@@ -496,6 +564,11 @@
int nseps; /* number of group separators with ' */
int nrepeats; /* number of repeats of the last group */
#endif
@@ -232,16 +135,23 @@
u_long ulval; /* integer arguments %[diouxX] */
uintmax_t ujval; /* %j, %ll, %q, %t, %z integers */
int base; /* base for [diouxX] conversion */
-@@ -560,7 +639,7 @@
- */
- #define PRINT(ptr, len) do { \
- for (n3 = 0; n3 < (len); n3++) \
-- __xfputwc((ptr)[n3], fp); \
-+ __xfputwc((ptr)[n3], fp, loc); \
- } while (0)
- #define PAD(howmany, with) do { \
- if ((n = (howmany)) > 0) { \
-@@ -581,15 +660,6 @@
+@@ -525,6 +598,15 @@
+
+ static const wchar_t xdigs_lower[16] = L"0123456789abcdef";
+ static const wchar_t xdigs_upper[16] = L"0123456789ABCDEF";
++#ifdef HEXFLOAT
++#define HEXFLOATDELTA 32
++#define HEXFLOATSTART 32
++ static char *hexfloat = NULL;
++ static int hexfloatlen = 0;
++ const char *xdigs0; /* digits for [aA] conversion */
++ static const char xdigs_lower0[16] = "0123456789abcdef";
++ static const char xdigs_upper0[16] = "0123456789ABCDEF";
++#endif /* HEXFLOAT */
+
+ /*
+ * BEWARE, these `goto error' on error, PRINT uses `n2' and
+@@ -553,15 +635,6 @@
} while(0)
/*
@@ -257,34 +167,15 @@
* To extend shorts properly, we need both signed and unsigned
* argument extraction methods.
*/
-@@ -640,21 +710,22 @@
+@@ -612,7 +685,6 @@
val = GETARG (int); \
}
-
thousands_sep = '\0';
grouping = NULL;
- #ifndef NO_FLOATING_POINT
-- decimal_point = localeconv()->decimal_point;
-+ decimal_point = localeconv_l(loc)->decimal_point;
- #endif
- convbuf = NULL;
- /* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */
-- if (prepwrite(fp) != 0)
-+ if (prepwrite(fp) != 0) {
-+ errno = EBADF;
- return (EOF);
-+ }
-
- /* 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 = (wchar_t *)fmt0;
- argtable = NULL;
-@@ -678,6 +749,9 @@
+ #ifdef FLOATING_POINT
+@@ -650,6 +722,9 @@
}
if (ch == '\0')
goto done;
@@ -294,7 +185,7 @@
fmt++; /* skip over '%' */
flags = 0;
-@@ -686,6 +760,9 @@
+@@ -658,6 +733,9 @@
prec = -1;
sign = '\0';
ox[1] = '\0';
@@ -304,7 +195,7 @@
rflag: ch = *fmt++;
reswitch: switch (ch) {
-@@ -701,6 +778,11 @@
+@@ -673,6 +751,11 @@
case '#':
flags |= ALT;
goto rflag;
@@ -316,36 +207,26 @@
case '*':
/*-
* ``A negative field width argument is taken as a
-@@ -721,8 +803,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++) == '*') {
-@@ -796,10 +878,16 @@
- flags |= LONGINT;
- /*FALLTHROUGH*/
+@@ -770,8 +853,18 @@
case 'c':
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
if (flags & LONGINT)
*(cp = buf) = (wchar_t)GETARG(wint_t);
++#ifdef ALTIVEC
++ else {
++ if (flags & VECTOR) {
++ SETVEC(vval);
++ break;
++ }
++ *(cp = buf) = (wchar_t)btowc(GETARG(int));
++ }
++#else /* ALTIVEC */
else
-- *(cp = buf) = (wchar_t)btowc(GETARG(int));
-+ *(cp = buf) = (wchar_t)btowc_l(GETARG(int), loc);
+ *(cp = buf) = (wchar_t)btowc(GETARG(int));
++#endif /* ALTIVEC */
size = 1;
sign = '\0';
break;
-@@ -808,6 +896,12 @@
+@@ -780,6 +873,12 @@
/*FALLTHROUGH*/
case 'd':
case 'i':
@@ -353,42 +234,103 @@
+ if (flags & VECTOR) {
+ SETVEC(vval);
+ break;
-+ }
++ } else
+#endif /* ALTIVEC */
if (flags & INTMAX_SIZE) {
ujval = SJARG();
if ((intmax_t)ujval < 0) {
-@@ -837,6 +931,12 @@
+@@ -799,38 +898,74 @@
+ #ifdef HEXFLOAT
+ case 'a':
+ case 'A':
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ flags |= FPT;
++ SETVEC(vval);
++ break;
++ }
++#endif /* ALTIVEC */
+ if (ch == 'a') {
+ ox[1] = 'x';
+- xdigs = xdigs_lower;
++ xdigs0 = xdigs_lower0;
+ expchar = 'p';
+ } else {
+ ox[1] = 'X';
+- xdigs = xdigs_upper;
++ xdigs0 = xdigs_upper0;
+ expchar = 'P';
}
- if (prec >= 0)
- prec++;
-+#ifdef LDBL_COMPAT
-+ fparg.dbl = GETARG(double);
-+ dtoaresult =
-+ __hdtoa(fparg.dbl, xdigs, prec,
-+ &expt, &signflag, &dtoaend);
-+#else /* !LDBL_COMPAT */
+- /*
+- * XXX We don't actually have a conversion
+- * XXX routine for this yet.
+- */
++ if (!hexfloat) {
++ hexfloat = malloc(hexfloatlen = HEXFLOATSTART);
++ if (!hexfloat)
++ goto error;
++ }
++ /* one extra for integer part and another for null */
++ if (prec > hexfloatlen - 2) {
++ int hlen = prec + HEXFLOATDELTA;
++ char *hf = realloc(hexfloat, hlen);
++ if (hf == NULL)
++ goto error;
++ hexfloat = hf;
++ hexfloatlen = hlen;
++ }
if (flags & LONGDBL) {
- fparg.ldbl = GETARG(long double);
- dtoaresult =
-@@ -848,6 +948,7 @@
- __hdtoa(fparg.dbl, xdigs, prec,
- &expt, &signflag, &dtoaend);
+- fparg.ldbl = (double)GETARG(long double);
+- dtoaresult =
+- __hldtoa(fparg.ldbl, xdigs, prec,
+- &expt, &signflag, &dtoaend);
++#if __TYPE_LONGDOUBLE_IS_DOUBLE
++ fparg.dbl = (double)GETARG(long double);
++ prec = __hdtoa(fparg.dbl, xdigs0, prec,
++ hexfloat, &expt, &signflag, &dtoaend);
++#else /* ! __TYPE_LONGDOUBLE_IS_DOUBLE */
++ fparg.ldbl = GETARG(long double);
++ prec = __hldtoa(fparg.ldbl, xdigs0, prec,
++ hexfloat, &expt, &signflag, &dtoaend);
++#endif /* __TYPE_LONGDOUBLE_IS_DOUBLE */
+ } else {
+ fparg.dbl = GETARG(double);
+- dtoaresult =
+- __hdtoa(fparg.dbl, xdigs, prec,
+- &expt, &signflag, &dtoaend);
++ prec = __hdtoa(fparg.dbl, xdigs0, prec,
++ hexfloat, &expt, &signflag, &dtoaend);
++ }
++ prec++;
++ if (expt == INT_MAX) {
++ ox[1] = 0;
++ hexfloat[1] = 0;
++ } else {
++ expt++;
++ *dtoaend = 0;
++ ndig = dtoaend - hexfloat;
}
-+#endif /* LDBL_COMPAT */
- if (prec < 0)
- prec = dtoaend - dtoaresult;
- if (expt == INT_MAX)
-@@ -855,7 +956,7 @@
if (convbuf != NULL)
free(convbuf);
- ndig = dtoaend - dtoaresult;
- cp = convbuf = __mbsconv(dtoaresult, -1);
-+ cp = convbuf = __mbsconv(dtoaresult, -1, loc);
- freedtoa(dtoaresult);
- goto fp_common;
+- freedtoa(dtoaresult);
+- goto fp_begin;
++ cp = convbuf = __mbsconv(hexfloat, -1);
++ goto hex_begin;
+ #endif
case 'e':
-@@ -868,10 +969,24 @@
+ case 'E':
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ flags |= FPT;
++ SETVEC(vval);
++ break;
++ }
++#endif /* ALTIVEC */
+ expchar = ch;
+ if (prec < 0) /* account for digit before decpt */
+ prec = DEFPREC + 1;
+@@ -839,10 +974,24 @@
goto fp_begin;
case 'f':
case 'F':
@@ -413,33 +355,39 @@
expchar = ch - ('g' - 'e');
if (prec == 0)
prec = 1;
-@@ -880,6 +995,14 @@
+@@ -851,6 +1000,17 @@
prec = DEFPREC;
if (convbuf != NULL)
free(convbuf);
-+#ifdef LDBL_COMPAT
-+ fparg.dbl = GETARG(double);
++#if __TYPE_LONGDOUBLE_IS_DOUBLE
++ if (flags & LONGDBL)
++ fparg.ldbl = GETARG(long double);
++ else
++ fparg.dbl = GETARG(double);
+ dtoaresult =
+ dtoa(fparg.dbl, expchar ? 2 : 3, prec,
+ &expt, &signflag, &dtoaend);
+ if (expt == 9999)
+ expt = INT_MAX;
-+#else /* !LDBL_COMPAT */
++#else /* ! __TYPE_LONGDOUBLE_IS_DOUBLE */
if (flags & LONGDBL) {
fparg.ldbl = GETARG(long double);
dtoaresult =
-@@ -893,8 +1016,9 @@
+@@ -864,9 +1024,13 @@
if (expt == 9999)
expt = INT_MAX;
}
-+#endif /* LDBL_COMPAT */
++#endif /* __TYPE_LONGDOUBLE_IS_DOUBLE */
ndig = dtoaend - dtoaresult;
-- cp = convbuf = __mbsconv(dtoaresult, -1);
-+ cp = convbuf = __mbsconv(dtoaresult, -1, loc);
+ cp = convbuf = __mbsconv(dtoaresult, -1);
freedtoa(dtoaresult);
- fp_common:
++#ifdef HEXFLOAT
++hex_begin:
++#endif /* HEXFLOAT */
if (signflag)
-@@ -989,6 +1113,12 @@
+ sign = '-';
+ if (expt == INT_MAX) { /* inf or nan */
+@@ -959,6 +1123,12 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'o':
@@ -447,12 +395,12 @@
+ if (flags & VECTOR) {
+ SETVEC(vval);
+ break;
-+ }
++ } else
+#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -1003,6 +1133,12 @@
+@@ -973,6 +1143,12 @@
* defined manner.''
* -- ANSI X3J11
*/
@@ -465,16 +413,7 @@
ujval = (uintmax_t)(uintptr_t)GETARG(void *);
base = 16;
xdigs = xdigs_lower;
-@@ -1024,7 +1160,7 @@
- if ((mbp = GETARG(char *)) == NULL)
- cp = L"(null)";
- else {
-- convbuf = __mbsconv(mbp, prec);
-+ convbuf = __mbsconv(mbp, prec, loc);
- if (convbuf == NULL) {
- fp->_flags |= __SERR;
- goto error;
-@@ -1055,6 +1191,12 @@
+@@ -1025,6 +1201,12 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'u':
@@ -482,12 +421,12 @@
+ if (flags & VECTOR) {
+ SETVEC(vval);
+ break;
-+ }
++ } else
+#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -1067,6 +1209,12 @@
+@@ -1037,6 +1219,12 @@
case 'x':
xdigs = xdigs_lower;
hex:
@@ -495,12 +434,12 @@
+ if (flags & VECTOR) {
+ SETVEC(vval);
+ break;
-+ }
++ } else
+#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -1111,6 +1259,14 @@
+@@ -1081,6 +1269,14 @@
if (size > BUF) /* should never happen */
abort();
break;
@@ -515,7 +454,7 @@
default: /* "%?" prints ?, unless ? is NUL */
if (ch == '\0')
goto done;
-@@ -1122,6 +1278,183 @@
+@@ -1092,6 +1288,185 @@
break;
}
@@ -579,12 +518,10 @@
+ * finish up the format specifier.
+ */
+ if (flags & SHORTINT) {
-+ if (ch != 'c')
-+ vfmt[j++] = 'h';
++ vfmt[j++] = 'h';
+ vcnt = 8;
+ } else if (flags & LONGINT) {
-+ if (ch != 'c')
-+ vfmt[j++] = 'l';
++ vfmt[j++] = 'l';
+ vcnt = 4;
+ } else {
+ switch (ch) {
@@ -620,7 +557,7 @@
+#define VPRINT(cnt, ind, args...) do { \
+ if (flags & FPT) { \
+ velm.f = vval.vfloatarg[ind]; \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, velm.f); \
++ vlen = asprintf(&vstr, vfmt , ## args, velm.f); \
+ } else { \
+ switch (cnt) { \
+ default: \
@@ -635,7 +572,7 @@
+ velm.i = (unsigned char)vval.vchararg[ind]; \
+ break; \
+ } \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, velm.i); \
++ vlen = asprintf(&vstr, vfmt , ## args, velm.i); \
+ } \
+ ret += vlen; \
+ PRINT(vstr, vlen); \
@@ -649,7 +586,8 @@
+ VPRINT(vcnt, 0);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ PRINT(&vsep, 1);
++ if (vsep)
++ PRINT(&vsep, 1);
+
+ /* Element. */
+ VPRINT(vcnt, i);
@@ -659,7 +597,8 @@
+ VPRINT(vcnt, 0, prec);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ PRINT(&vsep, 1);
++ if (vsep)
++ PRINT(&vsep, 1);
+
+ /* Element. */
+ VPRINT(vcnt, i, prec);
@@ -671,7 +610,8 @@
+ VPRINT(vcnt, 0, width);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ PRINT(&vsep, 1);
++ if (vsep)
++ PRINT(&vsep, 1);
+
+ /* Element. */
+ VPRINT(vcnt, i, width);
@@ -681,7 +621,8 @@
+ VPRINT(vcnt, 0, width, prec);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ PRINT(&vsep, 1);
++ if (vsep)
++ PRINT(&vsep, 1);
+
+ /* Element. */
+ VPRINT(vcnt, i, width, prec);
@@ -699,7 +640,28 @@
/*
* All reasonable formats wind up here. At this point, `cp'
* points to a string which (if not flags&LADJUST) should be
-@@ -1401,6 +1734,11 @@
+@@ -1109,7 +1484,7 @@
+ realsz = dprec > size ? dprec : size;
+ if (sign)
+ realsz++;
+- else if (ox[1])
++ if (ox[1])
+ realsz += 2;
+
+ prsize = width > realsz ? width : realsz;
+@@ -1123,9 +1498,9 @@
+ PAD(width - realsz, blanks);
+
+ /* prefix */
+- if (sign) {
++ if (sign)
+ PRINT(&sign, 1);
+- } else if (ox[1]) { /* ox[1] is either x, X, or \0 */
++ if (ox[1]) { /* ox[1] is either x, X, or \0 */
+ ox[0] = '0';
+ PRINT(ox, 2);
+ }
+@@ -1368,6 +1743,11 @@
if (flags & LONGINT)
ADDTYPE(T_WINT);
else
@@ -711,7 +673,7 @@
ADDTYPE(T_INT);
break;
case 'D':
-@@ -1418,6 +1756,11 @@
+@@ -1387,6 +1767,11 @@
case 'f':
case 'g':
case 'G':
@@ -723,7 +685,7 @@
if (flags & LONGDBL)
ADDTYPE(T_LONG_DOUBLE);
else
-@@ -1446,9 +1789,19 @@
+@@ -1415,9 +1800,19 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'o':
@@ -743,7 +705,7 @@
ADDTYPE(TP_VOID);
break;
case 'S':
-@@ -1466,6 +1819,11 @@
+@@ -1435,6 +1830,11 @@
case 'u':
case 'X':
case 'x':
@@ -755,16 +717,7 @@
ADDUARG();
break;
default: /* "%?" prints ?, unless ? is NUL */
-@@ -1532,7 +1890,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);
-@@ -1551,6 +1909,12 @@
+@@ -1520,6 +1920,12 @@
(*argtable) [n].longdoublearg = va_arg (ap, long double);
break;
#endif