Loading...
--- Libc/Libc-1725.40.4/stdio/FreeBSD/vfwprintf.c
+++ Libc/Libc-763.11/stdio/FreeBSD/vfwprintf.c
@@ -38,8 +38,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.42 2009/11/25 04:27:55 wollman Exp $");
-#include "xlocale_private.h"
-
/*
* Actual wprintf innards.
*
@@ -61,22 +59,17 @@
#include <string.h>
#include <wchar.h>
#include <wctype.h>
-#include <errno.h>
#include "un-namespace.h"
-
-#include <os/assumes.h>
-#include <mach-o/dyld_priv.h>
#include "libc_private.h"
#include "local.h"
#include "fvwrite.h"
#include "printflocal.h"
-static int __sprint(FILE *, locale_t, struct __suio *);
-static int __sbprintf(FILE *, locale_t, const wchar_t *, va_list);
-static wint_t __xfputwc(wchar_t, FILE *, locale_t);
-static wchar_t *__mbsconv(char *, int, locale_t);
-__private_extern__ const char *__fix_nogrouping(const char *);
+static int __sprint(FILE *, struct __suio *);
+static int __sbprintf(FILE *, const wchar_t *, va_list) __noinline;
+static wint_t __xfputwc(wchar_t, FILE *);
+static wchar_t *__mbsconv(char *, int);
#define CHAR wchar_t
#include "printfcommon.h"
@@ -92,29 +85,29 @@
static const mbstate_t initial_mbs;
static inline wchar_t
-get_decpt(locale_t loc)
+get_decpt(void)
{
mbstate_t mbs;
wchar_t decpt;
int nconv;
mbs = initial_mbs;
- nconv = mbrtowc_l(&decpt, localeconv_l(loc)->decimal_point, MB_CUR_MAX_L(loc), &mbs, loc);
+ nconv = mbrtowc(&decpt, localeconv()->decimal_point, MB_CUR_MAX, &mbs);
if (nconv == (size_t)-1 || nconv == (size_t)-2)
decpt = '.'; /* failsafe */
return (decpt);
}
static inline wchar_t
-get_thousep(locale_t loc)
+get_thousep(void)
{
mbstate_t mbs;
wchar_t thousep;
int nconv;
mbs = initial_mbs;
- nconv = mbrtowc_l(&thousep, localeconv_l(loc)->thousands_sep,
- MB_CUR_MAX_L(loc), &mbs, loc);
+ nconv = mbrtowc(&thousep, localeconv()->thousands_sep,
+ MB_CUR_MAX, &mbs);
if (nconv == (size_t)-1 || nconv == (size_t)-2)
thousep = '\0'; /* failsafe */
return (thousep);
@@ -126,11 +119,11 @@
* of wide characters that will be printed.
*/
static int
-grouping_init(struct grouping_state *gs, int ndigits, locale_t loc)
+grouping_init(struct grouping_state *gs, int ndigits)
{
- gs->grouping = __fix_nogrouping(localeconv_l(loc)->grouping);
- gs->thousands_sep = get_thousep(loc);
+ gs->grouping = localeconv()->grouping;
+ gs->thousands_sep = get_thousep();
gs->nseps = gs->nrepeats = 0;
gs->lead = ndigits;
@@ -152,11 +145,11 @@
*/
static int
grouping_print(struct grouping_state *gs, struct io_state *iop,
- const CHAR *cp, const CHAR *ep, locale_t loc)
+ const CHAR *cp, const CHAR *ep)
{
const CHAR *cp0 = cp;
- if (io_printandpad(iop, cp, ep, gs->lead, zeroes, loc))
+ if (io_printandpad(iop, cp, ep, gs->lead, zeroes))
return (-1);
cp += gs->lead;
while (gs->nseps > 0 || gs->nrepeats > 0) {
@@ -166,9 +159,9 @@
gs->grouping--;
gs->nseps--;
}
- if (io_print(iop, &gs->thousands_sep, 1, loc))
+ if (io_print(iop, &gs->thousands_sep, 1))
return (-1);
- if (io_printandpad(iop, cp, ep, *gs->grouping, zeroes, loc))
+ if (io_printandpad(iop, cp, ep, *gs->grouping, zeroes))
return (-1);
cp += *gs->grouping;
}
@@ -187,7 +180,7 @@
* string eclipses the benefits of buffering.
*/
static int
-__sprint(FILE *fp, locale_t loc, struct __suio *uio)
+__sprint(FILE *fp, struct __suio *uio)
{
struct __siov *iov;
wchar_t *p;
@@ -198,7 +191,7 @@
p = (wchar_t *)iov->iov_base;
len = iov->iov_len;
for (i = 0; i < len; i++) {
- if (__xfputwc(p[i], fp, loc) == WEOF)
+ if (__xfputwc(p[i], fp) == WEOF)
return (-1);
}
}
@@ -212,14 +205,11 @@
* worries about ungetc buffers and so forth.
*/
static int
-__sbprintf(FILE *fp, locale_t loc, const wchar_t *fmt, va_list ap)
+__sbprintf(FILE *fp, const wchar_t *fmt, va_list ap)
{
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)
@@ -239,7 +229,7 @@
fake._lbfsize = 0; /* not actually used, but Just In Case */
/* do the work, then copy any error status */
- ret = __vfwprintf(&fake, loc, fmt, ap);
+ ret = __vfwprintf(&fake, fmt, ap);
if (ret >= 0 && __fflush(&fake))
ret = WEOF;
if (fake._flags & __SERR)
@@ -252,7 +242,7 @@
* File must already be locked.
*/
static wint_t
-__xfputwc(wchar_t wc, FILE *fp, locale_t loc)
+__xfputwc(wchar_t wc, FILE *fp)
{
mbstate_t mbs;
char buf[MB_LEN_MAX];
@@ -261,10 +251,10 @@
size_t len;
if ((fp->_flags & __SSTR) == 0)
- return (__fputwc(wc, fp, loc));
+ return (__fputwc(wc, fp));
mbs = initial_mbs;
- if ((len = wcrtomb_l(buf, wc, &mbs, loc)) == (size_t)-1) {
+ if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1) {
fp->_flags |= __SERR;
return (WEOF);
}
@@ -283,13 +273,12 @@
* that the multibyte char. string ends in a null character.
*/
static wchar_t *
-__mbsconv(char *mbsarg, int prec, locale_t loc)
+__mbsconv(char *mbsarg, int prec)
{
mbstate_t mbs;
wchar_t *convbuf, *wcp;
const char *p;
- size_t insize, nchars, nconv = 0;
- int mb_cur_max = MB_CUR_MAX_L(loc);
+ size_t insize, nchars, nconv;
if (mbsarg == NULL)
return (NULL);
@@ -307,7 +296,7 @@
insize = nchars = nconv = 0;
mbs = initial_mbs;
while (nchars != (size_t)prec) {
- nconv = mbrlen_l(p, mb_cur_max, &mbs, loc);
+ nconv = mbrlen(p, MB_CUR_MAX, &mbs);
if (nconv == 0 || nconv == (size_t)-1 ||
nconv == (size_t)-2)
break;
@@ -334,7 +323,7 @@
p = mbsarg;
mbs = initial_mbs;
while (insize != 0) {
- nconv = mbrtowc_l(wcp, p, insize, &mbs, loc);
+ nconv = mbrtowc(wcp, p, insize, &mbs);
if (nconv == 0 || nconv == (size_t)-1 || nconv == (size_t)-2)
break;
wcp++;
@@ -354,30 +343,21 @@
* MT-safe version
*/
int
-vfwprintf_l(FILE * __restrict fp, locale_t loc, const wchar_t * __restrict fmt0, va_list ap)
+vfwprintf(FILE * __restrict fp, const wchar_t * __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, loc, fmt0, ap);
+ ret = __sbprintf(fp, fmt0, ap);
else
- ret = __vfwprintf(fp, loc, fmt0, ap);
+ ret = __vfwprintf(fp, fmt0, ap);
FUNLOCKFILE(fp);
return (ret);
}
-
-int
-vfwprintf(FILE * __restrict fp, const wchar_t * __restrict fmt0, va_list ap)
-{
- return vfwprintf_l(fp, __current_locale(), fmt0, ap);
-}
-
-// Defined in vfprintf.c
-bool __printf_is_memory_read_only(void *addr, size_t size);
/*
* The size of the buffer we use as scratch space for integer
@@ -393,20 +373,19 @@
/*
* Non-MT-safe version
*/
-__private_extern__ int
-__vfwprintf(FILE *fp, locale_t loc, const wchar_t *fmt0, va_list ap)
+int
+__vfwprintf(FILE *fp, const wchar_t *fmt0, va_list ap)
{
wchar_t *fmt; /* format string */
wchar_t ch; /* character from fmt */
- ssize_t n, n2; /* handy integer (short term usage) */
+ int n, n2; /* handy integer (short term usage) */
wchar_t *cp; /* handy char pointer (short term usage) */
int flags; /* flags as above */
- ssize_t ret; /* return value accumulator */
- ssize_t width; /* width from format (%8d), or 0 */
- ssize_t prec; /* precision from format; <0 for N/A */
+ int ret; /* return value accumulator */
+ int width; /* width from format (%8d), or 0 */
+ int prec; /* precision from format; <0 for N/A */
wchar_t sign; /* sign prefix (' ', '+', '-', or \0) */
struct grouping_state gs; /* thousands' grouping info */
-
#ifndef NO_FLOATING_POINT
/*
* We can decompose the printed representation of floating
@@ -436,18 +415,13 @@
wchar_t expstr[MAXEXPDIG+2]; /* buffer for exponent string: e+ZZZ */
char *dtoaresult; /* buffer allocated by dtoa */
#endif
-#ifdef VECTORS
- union arg vval; /* Vector argument. */
- wchar_t *pct; /* Pointer to '%' at beginning of specifier. */
- wchar_t vsep; /* Vector separator character. */
-#endif
u_long ulval; /* integer arguments %[diouxX] */
uintmax_t ujval; /* %j, %ll, %q, %t, %z integers */
int base; /* base for [diouxX] conversion */
int dprec; /* a copy of prec if [diouxX], 0 otherwise */
- ssize_t realsz; /* field size expanded by dprec, sign, etc */
- ssize_t size; /* size of converted field or string */
- ssize_t prsize; /* max size of printed field */
+ int realsz; /* field size expanded by dprec, sign, etc */
+ int size; /* size of converted field or string */
+ int prsize; /* max size of printed field */
const char *xdigs; /* digits for [xX] conversion */
struct io_state io; /* I/O buffering state */
wchar_t buf[BUF]; /* buffer with space for digits of uintmax_t */
@@ -463,19 +437,19 @@
/* BEWARE, these `goto error' on error. */
#define PRINT(ptr, len) do { \
- if (io_print(&io, (ptr), (len), loc)) \
+ if (io_print(&io, (ptr), (len))) \
goto error; \
} while (0)
#define PAD(howmany, with) { \
- if (io_pad(&io, (howmany), (with), loc)) \
+ if (io_pad(&io, (howmany), (with))) \
goto error; \
}
#define PRINTANDPAD(p, ep, len, with) { \
- if (io_printandpad(&io, (p), (ep), (len), (with), loc)) \
+ if (io_printandpad(&io, (p), (ep), (len), (with))) \
goto error; \
}
#define FLUSH() { \
- if (io_flush(&io, loc)) \
+ if (io_flush(&io)) \
goto error; \
}
@@ -511,7 +485,7 @@
#define UJARG() \
(flags&INTMAXT ? GETARG(uintmax_t) : \
flags&SIZET ? (uintmax_t)GETARG(size_t) : \
- flags&PTRDIFFT ? (uintmax_t)(unsigned long)GETARG(ptrdiff_t) : \
+ flags&PTRDIFFT ? (uintmax_t)GETARG(ptrdiff_t) : \
(uintmax_t)GETARG(unsigned long long))
/*
@@ -544,11 +518,8 @@
/* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */
- if (prepwrite(fp) != 0) {
- errno = EBADF;
+ if (prepwrite(fp) != 0)
return (EOF);
- }
- ORIENT(fp, 1);
convbuf = NULL;
fmt = (wchar_t *)fmt0;
@@ -558,7 +529,7 @@
io_init(&io, fp);
ret = 0;
#ifndef NO_FLOATING_POINT
- decimal_point = get_decpt(loc);
+ decimal_point = get_decpt();
#endif
/*
@@ -568,9 +539,8 @@
for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
/* void */;
if ((n = fmt - cp) != 0) {
- if (ret + n > INT_MAX) {
+ if ((unsigned)ret + n > INT_MAX) {
ret = EOF;
- errno = EOVERFLOW;
goto error;
}
PRINT(cp, n);
@@ -578,9 +548,6 @@
}
if (ch == '\0')
goto done;
-#ifdef VECTORS
- pct = fmt;
-#endif /* VECTORS */
fmt++; /* skip over '%' */
flags = 0;
@@ -590,9 +557,6 @@
gs.grouping = NULL;
sign = '\0';
ox[1] = '\0';
-#ifdef VECTORS
- vsep = 'X'; /* Illegal value, changed to defaults later. */
-#endif /* VECTORS */
rflag: ch = *fmt++;
reswitch: switch (ch) {
@@ -608,11 +572,6 @@
case '#':
flags |= ALT;
goto rflag;
-#ifdef VECTORS
- case ',': case ';': case ':': case '_':
- vsep = ch;
- goto rflag;
-#endif /* VECTORS */
case '*':
/*-
* ``A negative field width argument is taken as a
@@ -709,14 +668,10 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'c':
-#ifdef VECTORS
- if (flags & VECTOR)
- break;
-#endif /* VECTORS */
if (flags & LONGINT)
*(cp = buf) = (wchar_t)GETARG(wint_t);
else
- *(cp = buf) = (wchar_t)btowc_l(GETARG(int), loc);
+ *(cp = buf) = (wchar_t)btowc(GETARG(int));
size = 1;
sign = '\0';
break;
@@ -725,10 +680,6 @@
/*FALLTHROUGH*/
case 'd':
case 'i':
-#ifdef VECTORS
- if (flags & VECTOR)
- break;
-#endif /* VECTORS */
if (flags & INTMAX_SIZE) {
ujval = SJARG();
if ((intmax_t)ujval < 0) {
@@ -747,12 +698,6 @@
#ifndef NO_FLOATING_POINT
case 'a':
case 'A':
-#ifdef VECTORS
- if (flags & VECTOR) {
- flags |= FPT;
- break;
- }
-#endif /* VECTORS */
if (ch == 'a') {
ox[1] = 'x';
xdigs = xdigs_lower;
@@ -779,19 +724,14 @@
prec = dtoaend - dtoaresult;
if (expt == INT_MAX)
ox[1] = '\0';
- free(convbuf);
+ if (convbuf != NULL)
+ free(convbuf);
ndig = dtoaend - dtoaresult;
- cp = convbuf = __mbsconv(dtoaresult, -1, loc);
+ cp = convbuf = __mbsconv(dtoaresult, -1);
freedtoa(dtoaresult);
goto fp_common;
case 'e':
case 'E':
-#ifdef VECTORS
- if (flags & VECTOR) {
- flags |= FPT;
- break;
- }
-#endif /* VECTORS */
expchar = ch;
if (prec < 0) /* account for digit before decpt */
prec = DEFPREC + 1;
@@ -800,29 +740,18 @@
goto fp_begin;
case 'f':
case 'F':
-#ifdef VECTORS
- if (flags & VECTOR) {
- flags |= FPT;
- break;
- }
-#endif /* VECTORS */
expchar = '\0';
goto fp_begin;
case 'g':
case 'G':
-#ifdef VECTORS
- if (flags & VECTOR) {
- flags |= FPT;
- break;
- }
-#endif /* VECTORS */
expchar = ch - ('g' - 'e');
if (prec == 0)
prec = 1;
fp_begin:
if (prec < 0)
prec = DEFPREC;
- free(convbuf);
+ if (convbuf != NULL)
+ free(convbuf);
if (flags & LONGDBL) {
fparg.ldbl = GETARG(long double);
dtoaresult =
@@ -837,7 +766,7 @@
expt = INT_MAX;
}
ndig = dtoaend - dtoaresult;
- cp = convbuf = __mbsconv(dtoaresult, -1, loc);
+ cp = convbuf = __mbsconv(dtoaresult, -1);
freedtoa(dtoaresult);
fp_common:
if (signflag)
@@ -887,47 +816,37 @@
if (prec || flags & ALT)
size += prec + 1;
if ((flags & GROUPING) && expt > 0)
- size += grouping_init(&gs, expt, loc);
+ size += grouping_init(&gs, expt);
}
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.
*/
- void *ptr = GETARG(void *);
- if (ptr == NULL)
- continue;
-
if (flags & LLONGINT)
- *(long long *)ptr = ret;
+ *GETARG(long long *) = ret;
else if (flags & SIZET)
- *(ssize_t *)ptr = (ssize_t)ret;
+ *GETARG(ssize_t *) = (ssize_t)ret;
else if (flags & PTRDIFFT)
- *(ptrdiff_t *)ptr = ret;
+ *GETARG(ptrdiff_t *) = ret;
else if (flags & INTMAXT)
- *(intmax_t *)ptr = ret;
+ *GETARG(intmax_t *) = ret;
else if (flags & LONGINT)
- *(long *)ptr = ret;
+ *GETARG(long *) = ret;
else if (flags & SHORTINT)
- *(short *)ptr = ret;
+ *GETARG(short *) = ret;
else if (flags & CHARINT)
- *(signed char *)ptr = ret;
+ *GETARG(signed char *) = ret;
else
- *(int *)ptr = ret;
+ *GETARG(int *) = ret;
continue; /* no output */
- }
case 'O':
flags |= LONGINT;
/*FALLTHROUGH*/
case 'o':
-#ifdef VECTORS
- if (flags & VECTOR)
- break;
-#endif /* VECTORS */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
@@ -942,10 +861,6 @@
* defined manner.''
* -- ANSI X3J11
*/
-#ifdef VECTORS
- if (flags & VECTOR)
- break;
-#endif /* VECTORS */
ujval = (uintmax_t)(uintptr_t)GETARG(void *);
base = 16;
xdigs = xdigs_lower;
@@ -962,12 +877,12 @@
} else {
char *mbp;
- free(convbuf);
- if ((mbp = GETARG(char *)) == NULL) {
- convbuf = NULL;
+ if (convbuf != NULL)
+ free(convbuf);
+ if ((mbp = GETARG(char *)) == NULL)
cp = L"(null)";
- } else {
- convbuf = __mbsconv(mbp, prec, loc);
+ else {
+ convbuf = __mbsconv(mbp, prec);
if (convbuf == NULL) {
fp->_flags |= __SERR;
goto error;
@@ -975,28 +890,13 @@
cp = convbuf;
}
}
-#if 0 // wcsnlen needs API review first
size = (prec >= 0) ? wcsnlen(cp, prec) : wcslen(cp);
-#else
- size = wcslen(cp);
- if (size >= INT_MAX) {
- ret = EOF;
- errno = EOVERFLOW;
- goto error;
- }
- if(prec >= 0 && prec < size)
- size = prec;
-#endif
sign = '\0';
break;
case 'U':
flags |= LONGINT;
/*FALLTHROUGH*/
case 'u':
-#ifdef VECTORS
- if (flags & VECTOR)
- break;
-#endif /* VECTORS */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
@@ -1009,10 +909,6 @@
case 'x':
xdigs = xdigs_lower;
hex:
-#ifdef VECTORS
- if (flags & VECTOR)
- break;
-#endif /* VECTORS */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
@@ -1030,7 +926,6 @@
* ``... 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;
@@ -1058,15 +953,10 @@
}
size = buf + BUF - cp;
if (size > BUF) /* should never happen */
- LIBC_ABORT("size (%zd) > BUF (%d)", size, BUF);
+ abort();
if ((flags & GROUPING) && size != 0)
- size += grouping_init(&gs, size, loc);
+ size += grouping_init(&gs, size);
break;
-#ifdef VECTORS
- case 'v':
- flags |= VECTOR;
- goto rflag;
-#endif /* VECTORS */
default: /* "%?" prints ?, unless ? is NUL */
if (ch == '\0')
goto done;
@@ -1078,288 +968,6 @@
break;
}
-#ifdef VECTORS
- if (flags & VECTOR) {
- /*
- * Do the minimum amount of work necessary to construct
- * a format specifier that can be used to recursively
- * call vfprintf() for each element in the vector.
- */
- int i, j; /* Counter. */
- int vcnt; /* Number of elements in vector. */
- char *vfmt; /* Pointer to format specifier. */
-#define EXTRAHH 2
- char vfmt_buf[32 + EXTRAHH]; /* Static buffer for format spec. */
- int vwidth = 0; /* Width specified via '*'. */
- int vprec = 0; /* Precision specified via '*'. */
- char *vstr; /* Used for asprintf(). */
- int vlen; /* Length returned by asprintf(). */
- enum {
- V_CHAR, V_SHORT, V_INT,
- V_PCHAR, V_PSHORT, V_PINT,
- V_FLOAT,
-#ifdef V64TYPE
- V_LONGLONG, V_PLONGLONG,
- V_DOUBLE,
-#endif /* V64TYPE */
- } vtype;
-
- vval.vectorarg = GETARG(VECTORTYPE);
- /*
- * Set vfmt. If vfmt_buf may not be big enough,
- * malloc() space, taking care to free it later.
- * (EXTRAHH is for possible extra "hh")
- */
- if (&fmt[-1] - pct + EXTRAHH < sizeof(vfmt_buf))
- vfmt = vfmt_buf;
- else
- vfmt = (char *)malloc(&fmt[-1] - pct + EXTRAHH + 1);
-
- /* Set the separator character, if not specified. */
- if (vsep == 'X') {
- if (ch == 'c')
- vsep = '\0';
- else
- vsep = ' ';
- }
-
- /* Create the format specifier. */
- for (i = j = 0; i < &fmt[-1] - pct; i++) {
- switch (pct[i]) {
- case ',': case ';': case ':': case '_':
- case 'v': case 'h': case 'l':
- /* Ignore. */
- break;
- case '*':
- if (pct[i - 1] != '.')
- vwidth = 1;
- else
- vprec = 1;
- /* FALLTHROUGH */
- default:
- vfmt[j++] = pct[i];
- }
- }
-
- /*
- * Determine the number of elements in the vector and
- * finish up the format specifier.
- */
- if (flags & SHORTINT) {
- switch (ch) {
- case 'c':
- vtype = V_SHORT;
- break;
- case 'p':
- vtype = V_PSHORT;
- break;
- default:
- vfmt[j++] = 'h';
- vtype = V_SHORT;
- break;
- }
- vcnt = 8;
- } else if (flags & LONGINT) {
- vcnt = 4;
- vtype = (ch == 'p') ? V_PINT : V_INT;
-#ifdef V64TYPE
- } else if (flags & LLONGINT) {
- switch (ch) {
- case 'a':
- case 'A':
- case 'e':
- case 'E':
- case 'f':
- case 'g':
- case 'G':
- vcnt = 2;
- vtype = V_DOUBLE;
- break;
- case 'd':
- case 'i':
- case 'u':
- case 'o':
- case 'p':
- case 'x':
- case 'X':
- vfmt[j++] = 'l';
- vfmt[j++] = 'l';
- vcnt = 2;
- vtype = (ch == 'p') ? V_PLONGLONG : V_LONGLONG;
- break;
- default:
- /*
- * The default case should never
- * happen.
- */
- case 'c':
- vcnt = 16;
- vtype = V_CHAR;
- }
-#endif /* V64TYPE */
- } else {
- switch (ch) {
- case 'a':
- case 'A':
- case 'e':
- case 'E':
- case 'f':
- case 'g':
- case 'G':
- vcnt = 4;
- vtype = V_FLOAT;
- break;
- default:
- /*
- * The default case should never
- * happen.
- */
- case 'd':
- case 'i':
- case 'u':
- case 'o':
- case 'x':
- case 'X':
- vfmt[j++] = 'h';
- vfmt[j++] = 'h';
- /* drop through */
- case 'p':
- case 'c':
- vcnt = 16;
- vtype = (ch == 'p') ? V_PCHAR : V_CHAR;
- }
- }
- vfmt[j++] = ch;
- vfmt[j++] = '\0';
-
-/* Get a vector element. */
-#ifdef V64TYPE
-#define VPRINT(type, ind, args...) do { \
- switch (type) { \
- case V_CHAR: \
- 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]); \
- 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]); \
- 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]); \
- 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]); \
- break; \
- case V_FLOAT: \
- vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vfloatarg[ind]); \
- break; \
- case V_DOUBLE: \
- vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vdoublearg[ind]); \
- break; \
- } \
- ret += vlen; \
- PRINT((const CHAR *) vstr, vlen); \
- free(vstr); \
-} while (0)
-#else /* !V64TYPE */
-#define VPRINT(type, ind, args...) do { \
- switch (type) { \
- case V_CHAR: \
- 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]); \
- 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]); \
- 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]); \
- break; \
- case V_FLOAT: \
- vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vfloatarg[ind]); \
- break; \
- } \
- ret += vlen; \
- PRINT((const CHAR *) vstr, vlen); \
- free(vstr); \
-} while (0)
-#endif /* V64TYPE */
-
- /* Actually print. */
- if (vwidth == 0) {
- if (vprec == 0) {
- /* First element. */
- VPRINT(vtype, 0);
- for (i = 1; i < vcnt; i++) {
- /* Separator. */
- if(vsep)
- PRINT(&vsep, 1);
-
- /* Element. */
- VPRINT(vtype, i);
- }
- } else {
- /* First element. */
- VPRINT(vtype, 0, prec);
- for (i = 1; i < vcnt; i++) {
- /* Separator. */
- if(vsep)
- PRINT(&vsep, 1);
-
- /* Element. */
- VPRINT(vtype, i, prec);
- }
- }
- } else {
- if (vprec == 0) {
- /* First element. */
- VPRINT(vtype, 0, width);
- for (i = 1; i < vcnt; i++) {
- /* Separator. */
- if(vsep)
- PRINT(&vsep, 1);
-
- /* Element. */
- VPRINT(vtype, i, width);
- }
- } else {
- /* First element. */
- VPRINT(vtype, 0, width, prec);
- for (i = 1; i < vcnt; i++) {
- /* Separator. */
- if(vsep)
- PRINT(&vsep, 1);
-
- /* Element. */
- VPRINT(vtype, i, width, prec);
- }
- }
- }
-#undef VPRINT
-
- if (vfmt != vfmt_buf)
- free(vfmt);
-
- continue;
- }
-#endif /* VECTORS */
/*
* All reasonable formats wind up here. At this point, `cp'
* points to a string which (if not flags&LADJUST) should be
@@ -1381,9 +989,8 @@
realsz += 2;
prsize = width > realsz ? width : realsz;
- if (ret + prsize > INT_MAX) {
+ if ((unsigned)ret + prsize > INT_MAX) {
ret = EOF;
- errno = EOVERFLOW;
goto error;
}
@@ -1411,7 +1018,7 @@
/* leading zeroes from decimal precision */
PAD(dprec - size, zeroes);
if (gs.grouping) {
- if (grouping_print(&gs, &io, cp, buf+BUF, loc) < 0)
+ if (grouping_print(&gs, &io, cp, buf+BUF) < 0)
goto error;
} else {
PRINT(cp, size);
@@ -1429,7 +1036,7 @@
} else {
if (gs.grouping) {
n = grouping_print(&gs, &io,
- cp, convbuf + ndig, loc);
+ cp, convbuf + ndig);
if (n < 0)
goto error;
cp += n;
@@ -1468,11 +1075,12 @@
FLUSH();
error:
va_end(orgap);
- free(convbuf);
+ if (convbuf != NULL)
+ free(convbuf);
if (__sferror(fp))
ret = EOF;
if ((argtable != NULL) && (argtable != statargtable))
free (argtable);
- return (ret < 0 || ret >= INT_MAX) ? -1 : (int)ret;
+ return (ret);
/* NOTREACHED */
}