Loading...
--- Libc/Libc-1725.40.4/stdio/FreeBSD/vfprintf.c
+++ Libc/Libc-583/stdio/FreeBSD/vfprintf.c
@@ -13,6 +13,10 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -30,21 +34,11 @@
* SUCH DAMAGE.
*/
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wint-conversion"
-
-#include <TargetConditionals.h>
-#if !TARGET_OS_DRIVERKIT
-#define OS_CRASH_ENABLE_EXPERIMENTAL_LIBTRACE 1
-#endif
-
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.90 2009/02/28 06:06:57 das Exp $");
-
-#include "xlocale_private.h"
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.68 2004/08/26 06:25:28 des Exp $");
/*
* Actual printf innards.
@@ -64,110 +58,70 @@
#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"
-
-#include <os/assumes.h>
-#include <mach-o/dyld_priv.h>
-#include <mach/mach.h>
#include "libc_private.h"
#include "local.h"
#include "fvwrite.h"
-#include "printflocal.h"
-#include "libc_hooks_impl.h"
-
-static int __sprint(FILE *, locale_t, struct __suio *);
-#if 0
-static int __sbprintf(FILE *, locale_t, const char *, va_list) __printflike(3, 0);
+
+union arg {
+ int intarg;
+ u_int uintarg;
+ long longarg;
+ u_long ulongarg;
+ long long longlongarg;
+ unsigned long long ulonglongarg;
+ ptrdiff_t ptrdiffarg;
+ size_t sizearg;
+ intmax_t intmaxarg;
+ uintmax_t uintmaxarg;
+ void *pvoidarg;
+ char *pchararg;
+ signed char *pschararg;
+ short *pshortarg;
+ int *pintarg;
+ long *plongarg;
+ long long *plonglongarg;
+ ptrdiff_t *pptrdiffarg;
+ size_t *psizearg;
+ intmax_t *pintmaxarg;
+#ifndef NO_FLOATING_POINT
+ double doublearg;
+ long double longdoublearg;
#endif
-static char *__wcsconv(wchar_t *, int, locale_t);
-
-__private_extern__ const char *__fix_nogrouping(const char *);
-
-#define CHAR char
-#include "printfcommon.h"
-
-struct grouping_state {
- char *thousands_sep; /* locale-specific thousands separator */
- int thousep_len; /* length of thousands_sep */
- const char *grouping; /* locale-specific numeric grouping rules */
- int lead; /* sig figs before decimal or group sep */
- int nseps; /* number of group separators with ' */
- int nrepeats; /* number of repeats of the last group */
+ wint_t wintarg;
+ wchar_t *pwchararg;
};
/*
- * Initialize the thousands' grouping state in preparation to print a
- * number with ndigits digits. This routine returns the total number
- * of bytes that will be needed.
+ * Type ids for argument type table.
*/
-static int
-grouping_init(struct grouping_state *gs, int ndigits, locale_t loc)
-{
- struct lconv *locale;
-
- locale = localeconv_l(loc);
- gs->grouping = __fix_nogrouping(locale->grouping);
- gs->thousands_sep = locale->thousands_sep;
- gs->thousep_len = strlen(gs->thousands_sep);
-
- gs->nseps = gs->nrepeats = 0;
- gs->lead = ndigits;
- while (*gs->grouping != CHAR_MAX) {
- if (gs->lead <= *gs->grouping)
- break;
- gs->lead -= *gs->grouping;
- if (*(gs->grouping+1)) {
- gs->nseps++;
- gs->grouping++;
- } else
- gs->nrepeats++;
- }
- return ((gs->nseps + gs->nrepeats) * gs->thousep_len);
-}
-
-/*
- * Print a number with thousands' separators.
- */
-static int
-grouping_print(struct grouping_state *gs, struct io_state *iop,
- const CHAR *cp, const CHAR *ep, locale_t loc)
-{
- const CHAR *cp0 = cp;
-
- if (io_printandpad(iop, cp, ep, gs->lead, zeroes, loc))
- return (-1);
- cp += gs->lead;
- while (gs->nseps > 0 || gs->nrepeats > 0) {
- if (gs->nrepeats > 0)
- gs->nrepeats--;
- else {
- gs->grouping--;
- gs->nseps--;
- }
- if (io_print(iop, gs->thousands_sep, gs->thousep_len, loc))
- return (-1);
- if (io_printandpad(iop, cp, ep, *gs->grouping, zeroes, loc))
- return (-1);
- cp += *gs->grouping;
- }
- if (cp > ep)
- cp = ep;
- return (cp - cp0);
-}
+enum typeid {
+ T_UNUSED, TP_SHORT, T_INT, T_U_INT, TP_INT,
+ 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,
+ T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
+};
+
+static int __sprint(FILE *, struct __suio *);
+static int __sbprintf(FILE *, const char *, va_list) __printflike(2, 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 void __find_arguments(const char *, va_list, union arg **);
+static void __grow_type_table(int, enum typeid **, int *);
/*
* Flush out all the vectors defined by the given uio,
* then reset it so that it can be reused.
*/
static int
-__sprint(FILE *fp, locale_t loc __unused, struct __suio *uio)
+__sprint(FILE *fp, struct __suio *uio)
{
int err;
@@ -181,33 +135,24 @@
return (err);
}
-#if 0
/*
* 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, locale_t loc, const char *fmt, va_list ap)
+__sbprintf(FILE *fp, const char *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)
- return (EOF);
/* copy the important variables */
fake._flags = fp->_flags & ~__SNBF;
fake._file = fp->_file;
fake._cookie = fp->_cookie;
fake._write = fp->_write;
- fake._orientation = fp->_orientation;
- fake._mbstate = fp->_mbstate;
+ fake._extra = fp->_extra;
/* set up the buffer */
fake._bf._base = fake._p = buf;
@@ -215,71 +160,235 @@
fake._lbfsize = 0; /* not actually used, but Just In Case */
/* do the work, then copy any error status */
- ret = __vfprintf(&fake, loc, fmt, ap);
+ ret = __vfprintf(&fake, fmt, ap);
if (ret >= 0 && __fflush(&fake))
ret = EOF;
if (fake._flags & __SERR)
fp->_flags |= __SERR;
return (ret);
}
-#endif
+
+/*
+ * Macros for converting digits to letters and vice versa
+ */
+#define to_digit(c) ((c) - '0')
+#define is_digit(c) ((unsigned)to_digit(c) <= 9)
+#define to_char(n) ((n) + '0')
+
+/*
+ * Convert an unsigned long to ASCII for printf purposes, returning
+ * a pointer to the first character of the string representation.
+ * Octal numbers can be forced to have a leading zero; hex numbers
+ * use the given digits.
+ */
+static char *
+__ultoa(u_long val, char *endp, int base, int octzero, const char *xdigs,
+ int needgrp, char thousep, const char *grp)
+{
+ char *cp = endp;
+ long sval;
+ int ndig;
+
+ /*
+ * Handle the three cases separately, in the hope of getting
+ * better/faster code.
+ */
+ switch (base) {
+ case 10:
+ if (val < 10) { /* many numbers are 1 digit */
+ *--cp = to_char(val);
+ return (cp);
+ }
+ ndig = 0;
+ /*
+ * On many machines, unsigned arithmetic is harder than
+ * signed arithmetic, so we do at most one unsigned mod and
+ * divide; this is sufficient to reduce the range of
+ * the incoming value to where signed arithmetic works.
+ */
+ if (val > LONG_MAX) {
+ *--cp = to_char(val % 10);
+ ndig++;
+ sval = val / 10;
+ } else
+ sval = val;
+ do {
+ *--cp = to_char(sval % 10);
+ ndig++;
+ /*
+ * If (*grp == CHAR_MAX) then no more grouping
+ * should be performed.
+ */
+ if (needgrp && ndig == *grp && *grp != CHAR_MAX
+ && sval > 9) {
+ *--cp = thousep;
+ ndig = 0;
+ /*
+ * If (*(grp+1) == '\0') then we have to
+ * use *grp character (last grouping rule)
+ * for all next cases
+ */
+ if (*(grp+1) != '\0')
+ grp++;
+ }
+ sval /= 10;
+ } while (sval != 0);
+ break;
+
+ case 8:
+ do {
+ *--cp = to_char(val & 7);
+ val >>= 3;
+ } while (val);
+ if (octzero && *cp != '0')
+ *--cp = '0';
+ break;
+
+ case 16:
+ do {
+ *--cp = xdigs[val & 15];
+ val >>= 4;
+ } while (val);
+ break;
+
+ default: /* oops */
+ abort();
+ }
+ return (cp);
+}
+
+/* Identical to __ultoa, but for intmax_t. */
+static char *
+__ujtoa(uintmax_t val, char *endp, int base, int octzero, const char *xdigs,
+ int needgrp, char thousep, const char *grp)
+{
+ char *cp = endp;
+ intmax_t sval;
+ int ndig;
+
+ /* quick test for small values; __ultoa is typically much faster */
+ /* (perhaps instead we should run until small, then call __ultoa?) */
+ if (val <= ULONG_MAX)
+ return (__ultoa((u_long)val, endp, base, octzero, xdigs,
+ needgrp, thousep, grp));
+ switch (base) {
+ case 10:
+ if (val < 10) {
+ *--cp = to_char(val % 10);
+ return (cp);
+ }
+ ndig = 0;
+ if (val > INTMAX_MAX) {
+ *--cp = to_char(val % 10);
+ ndig++;
+ sval = val / 10;
+ } else
+ sval = val;
+ do {
+ *--cp = to_char(sval % 10);
+ ndig++;
+ /*
+ * If (*grp == CHAR_MAX) then no more grouping
+ * should be performed.
+ */
+ if (needgrp && *grp != CHAR_MAX && ndig == *grp
+ && sval > 9) {
+ *--cp = thousep;
+ ndig = 0;
+ /*
+ * If (*(grp+1) == '\0') then we have to
+ * use *grp character (last grouping rule)
+ * for all next cases
+ */
+ if (*(grp+1) != '\0')
+ grp++;
+ }
+ sval /= 10;
+ } while (sval != 0);
+ break;
+
+ case 8:
+ do {
+ *--cp = to_char(val & 7);
+ val >>= 3;
+ } while (val);
+ if (octzero && *cp != '0')
+ *--cp = '0';
+ break;
+
+ case 16:
+ do {
+ *--cp = xdigs[val & 15];
+ val >>= 4;
+ } while (val);
+ break;
+
+ default:
+ abort();
+ }
+ return (cp);
+}
/*
* Convert a wide character string argument for the %ls format to a multibyte
- * string representation. If not -1, prec specifies the maximum number of
- * bytes to output, and also means that we can't assume that the wide char.
- * string ends is null-terminated.
+ * string representation. ``prec'' specifies the maximum number of bytes
+ * to output. If ``prec'' is greater than or equal to zero, we can't assume
+ * that the wide char. string ends in a null character.
*/
static char *
-__wcsconv(wchar_t *wcsarg, int prec, locale_t loc)
+__wcsconv(wchar_t *wcsarg, int prec)
{
static const mbstate_t initial;
mbstate_t mbs;
char buf[MB_LEN_MAX];
wchar_t *p;
- char *convbuf;
+ char *convbuf, *mbp;
size_t clen, nbytes;
- /* Allocate space for the maximum number of bytes we could output. */
- if (prec < 0) {
+ /*
+ * Determine the number of bytes to output and allocate space for
+ * the output.
+ */
+ if (prec >= 0) {
+ nbytes = 0;
p = wcsarg;
mbs = initial;
- nbytes = wcsrtombs_l(NULL, (const wchar_t **)&p, 0, &mbs, loc);
+ for (;;) {
+ clen = wcrtomb(buf, *p++, &mbs);
+ if (clen == 0 || clen == (size_t)-1 ||
+ nbytes + clen > prec)
+ break;
+ nbytes += clen;
+ }
+ } else {
+ p = wcsarg;
+ mbs = initial;
+ nbytes = wcsrtombs(NULL, (const wchar_t **)&p, 0, &mbs);
if (nbytes == (size_t)-1)
return (NULL);
- } else {
- /*
- * Optimisation: if the output precision is small enough,
- * just allocate enough memory for the maximum instead of
- * scanning the string.
- */
- if (prec < 128)
- nbytes = prec;
- else {
- nbytes = 0;
- p = wcsarg;
- mbs = initial;
- for (;;) {
- clen = wcrtomb_l(buf, *p++, &mbs, loc);
- if (clen == 0 || clen == (size_t)-1 ||
- nbytes + clen > prec)
- break;
- nbytes += clen;
- }
- }
}
if ((convbuf = malloc(nbytes + 1)) == NULL)
return (NULL);
- /* Fill the output buffer. */
+ /*
+ * Fill the output buffer with the multibyte representations of as
+ * many wide characters as will fit.
+ */
+ mbp = convbuf;
p = wcsarg;
mbs = initial;
- if ((nbytes = wcsrtombs_l(convbuf, (const wchar_t **)&p,
- nbytes, &mbs, loc)) == (size_t)-1) {
+ while (mbp - convbuf < nbytes) {
+ clen = wcrtomb(mbp, *p++, &mbs);
+ if (clen == 0 || clen == (size_t)-1)
+ break;
+ mbp += clen;
+ }
+ if (clen == (size_t)-1) {
free(convbuf);
return (NULL);
}
- convbuf[nbytes] = '\0';
+ *mbp = '\0';
+
return (convbuf);
}
@@ -287,85 +396,80 @@
* MT-safe version
*/
int
-vfprintf_l(FILE * __restrict fp, locale_t loc, const char * __restrict fmt0, va_list ap)
+vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap)
{
int ret;
- libc_hooks_will_write(fp, sizeof(*fp));
-
FLOCKFILE(fp);
- ret = __xvprintf(XPRINTF_PLAIN, NULL, fp, loc, fmt0, ap);
+ ret = __vfprintf(fp, fmt0, ap);
FUNLOCKFILE(fp);
return (ret);
}
-int
-vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap)
-
-{
- int ret;
-
- libc_hooks_will_write(fp, sizeof(*fp));
-
- FLOCKFILE(fp);
- ret = __xvprintf(XPRINTF_PLAIN, NULL, fp, __current_locale(), fmt0, ap);
- FUNLOCKFILE(fp);
- return ret;
-}
+#ifndef NO_FLOATING_POINT
+
+#define dtoa __dtoa
+#define freedtoa __freedtoa
+
+#include <float.h>
+#include <math.h>
+#include "floatio.h"
+#include "gdtoa.h"
+
+#define DEFPREC 6
+
+static int exponent(char *, int, int);
+
+#endif /* !NO_FLOATING_POINT */
/*
* The size of the buffer we use as scratch space for integer
- * conversions, among other things. We need enough space to
- * write a uintmax_t in octal (plus one byte).
+ * conversions, among other things. Technically, we would need the
+ * most space for base 10 conversions with thousands' grouping
+ * characters between each pair of digits. 100 bytes is a
+ * conservative overestimate even for a 128-bit uintmax_t.
*/
-#if UINTMAX_MAX <= UINT64_MAX
-#define BUF 32
-#else
-#error "BUF must be large enough to format a uintmax_t"
-#endif
-
-__private_extern__ bool
-__printf_is_memory_read_only(void *addr, size_t __unused size)
-{
- vm_address_t address = addr;
- vm_size_t vmsize = 0;
- vm_region_basic_info_data_64_t info;
- mach_msg_type_number_t info_cnt = VM_REGION_BASIC_INFO_COUNT_64;
- memory_object_name_t object = MACH_PORT_NULL;
- kern_return_t kr = KERN_SUCCESS;
-
- kr = vm_region_64(mach_task_self(),
- &address,
- &vmsize,
- VM_REGION_BASIC_INFO_64,
- (vm_region_info_t) &info,
- &info_cnt,
- &object);
- return (kr == KERN_SUCCESS) && !(info.protection & VM_PROT_WRITE);
-}
+#define BUF 100
+
+#define STATIC_ARG_TBL_SIZE 8 /* Size of static argument table. */
+
+/*
+ * Flags used during conversion.
+ */
+#define ALT 0x001 /* alternate form */
+#define LADJUST 0x004 /* left adjustment */
+#define LONGDBL 0x008 /* long double */
+#define LONGINT 0x010 /* long integer */
+#define LLONGINT 0x020 /* long long integer */
+#define SHORTINT 0x040 /* short integer */
+#define ZEROPAD 0x080 /* zero (as opposed to blank) pad */
+#define FPT 0x100 /* Floating point number */
+#define GROUPING 0x200 /* use grouping ("'" flag) */
+ /* C99 additional size modifiers: */
+#define SIZET 0x400 /* size_t */
+#define PTRDIFFT 0x800 /* ptrdiff_t */
+#define INTMAXT 0x1000 /* intmax_t */
+#define CHARINT 0x2000 /* print char using int format */
/*
* Non-MT-safe version
*/
-__private_extern__ int
-__vfprintf(FILE *fp, locale_t loc, const char *fmt0, va_list ap)
+int
+__vfprintf(FILE *fp, const char *fmt0, va_list ap)
{
char *fmt; /* format string */
int ch; /* character from fmt */
- ssize_t n, n2; /* handy integer (short term usage) */
+ int n, n2; /* handy integer (short term usage) */
char *cp; /* handy char pointer (short term usage) */
+ struct __siov *iovp; /* for PRINT macro */
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 */
char sign; /* sign prefix (' ', '+', '-', or \0) */
- struct grouping_state gs; /* thousands' grouping info */
-
-#ifndef ALLOW_DYNAMIC_PERCENT_N
- bool static_format_checked = false;
-#endif // ALLOW_DYNAMIC_PERCENT_N
-
+ char thousands_sep; /* locale specific thousands separator */
+ const char *grouping; /* locale specific numeric grouping rules */
#ifndef NO_FLOATING_POINT
/*
* We can decompose the printed representation of floating
@@ -382,7 +486,6 @@
* F: at least two digits for decimal, at least one digit for hex
*/
char *decimal_point; /* locale specific decimal point */
- int decpt_len; /* length of decimal_point */
int signflag; /* true if float is negative */
union { /* floating point arguments %[aAeEfFgG] */
double dbl;
@@ -392,24 +495,24 @@
char expchar; /* exponent character: [eEpP\0] */
char *dtoaend; /* pointer to end of converted digits */
int expsize; /* character count for expstr */
+ int lead; /* sig figs before decimal or group sep */
int ndig; /* actual number of digits returned by dtoa */
char expstr[MAXEXPDIG+2]; /* buffer for exponent string: e+ZZZ */
char *dtoaresult; /* buffer allocated by dtoa */
-#endif
-#ifdef VECTORS
- union arg vval; /* Vector argument. */
- char *pct; /* Pointer to '%' at beginning of specifier. */
- char vsep; /* Vector separator character. */
+ int nseps; /* number of group separators with ' */
+ int nrepeats; /* number of repeats of the last group */
#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 */
+#define NIOV 8
+ struct __suio uio; /* output information: summary */
+ struct __siov iov[NIOV];/* ... and individual io vectors */
char buf[BUF]; /* buffer with space for digits of uintmax_t */
char ox[2]; /* space for 0x; ox[1] is either x, X, or \0 */
union arg *argtable; /* args, built due to positional arg */
@@ -418,25 +521,56 @@
va_list orgap; /* original argument pointer */
char *convbuf; /* wide to multibyte conversion result */
+ /*
+ * Choose PADSIZE to trade efficiency vs. size. If larger printf
+ * fields occur frequently, increase PADSIZE and make the initialisers
+ * below longer.
+ */
+#define PADSIZE 16 /* pad chunk size */
+ static char blanks[PADSIZE] =
+ {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
+ static char zeroes[PADSIZE] =
+ {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
+
static const char xdigs_lower[16] = "0123456789abcdef";
static const char xdigs_upper[16] = "0123456789ABCDEF";
- /* BEWARE, these `goto error' on error. */
+ /*
+ * BEWARE, these `goto error' on error, and PAD uses `n'.
+ */
#define PRINT(ptr, len) { \
- if (io_print(&io, (ptr), (len), loc)) \
- goto error; \
+ iovp->iov_base = (ptr); \
+ iovp->iov_len = (len); \
+ uio.uio_resid += (len); \
+ iovp++; \
+ if (++uio.uio_iovcnt >= NIOV) { \
+ if (__sprint(fp, &uio)) \
+ goto error; \
+ iovp = iov; \
+ } \
}
#define PAD(howmany, with) { \
- if (io_pad(&io, (howmany), (with), loc)) \
+ if ((n = (howmany)) > 0) { \
+ while (n > PADSIZE) { \
+ PRINT(with, PADSIZE); \
+ n -= PADSIZE; \
+ } \
+ PRINT(with, n); \
+ } \
+}
+#define PRINTANDPAD(p, ep, len, with) do { \
+ n2 = (ep) - (p); \
+ if (n2 > (len)) \
+ n2 = (len); \
+ if (n2 > 0) \
+ PRINT((p), n2); \
+ PAD((len) - (n2 > 0 ? n2 : 0), (with)); \
+} while(0)
+#define FLUSH() { \
+ if (uio.uio_resid && __sprint(fp, &uio)) \
goto error; \
-}
-#define PRINTANDPAD(p, ep, len, with) { \
- if (io_printandpad(&io, (p), (ep), (len), (with), loc)) \
- goto error; \
-}
-#define FLUSH() { \
- if (io_flush(&io, loc)) \
- goto error; \
+ uio.uio_iovcnt = 0; \
+ iovp = iov; \
}
/*
@@ -465,13 +599,13 @@
#define INTMAX_SIZE (INTMAXT|SIZET|PTRDIFFT|LLONGINT)
#define SJARG() \
(flags&INTMAXT ? GETARG(intmax_t) : \
- flags&SIZET ? (intmax_t)GETARG(ssize_t) : \
+ flags&SIZET ? (intmax_t)GETARG(size_t) : \
flags&PTRDIFFT ? (intmax_t)GETARG(ptrdiff_t) : \
(intmax_t)GETARG(long long))
#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))
/*
@@ -489,10 +623,7 @@
int hold = nextarg; \
if (argtable == NULL) { \
argtable = statargtable; \
- if (__find_arguments (fmt0, orgap, &argtable)) { \
- ret = EOF; \
- goto error; \
- } \
+ __find_arguments (fmt0, orgap, &argtable); \
} \
nextarg = n2; \
val = GETARG (int); \
@@ -502,29 +633,31 @@
val = GETARG (int); \
}
- /* The following has been moved to __v2printf() */
-#if 0
+
+ thousands_sep = '\0';
+ grouping = NULL;
+ convbuf = NULL;
+#ifndef NO_FLOATING_POINT
+ dtoaresult = NULL;
+ decimal_point = localeconv()->decimal_point;
+#endif
/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
- if (prepwrite(fp) != 0) {
- errno = EBADF;
+ if (prepwrite(fp) != 0)
return (EOF);
- }
- ORIENT(fp, -1);
-#endif
-
- 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));
+
fmt = (char *)fmt0;
argtable = NULL;
nextarg = 1;
va_copy(orgap, ap);
- io_init(&io, fp);
+ uio.uio_iov = iovp = iov;
+ uio.uio_resid = 0;
+ uio.uio_iovcnt = 0;
ret = 0;
-#ifndef NO_FLOATING_POINT
- dtoaresult = NULL;
- 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
/*
* Scan the format for conversions (`%' character).
@@ -533,9 +666,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);
@@ -543,21 +675,14 @@
}
if (ch == '\0')
goto done;
-#ifdef VECTORS
- pct = fmt;
-#endif /* VECTORS */
fmt++; /* skip over '%' */
flags = 0;
dprec = 0;
width = 0;
prec = -1;
- 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) {
@@ -573,11 +698,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
@@ -598,6 +718,8 @@
goto rflag;
case '\'':
flags |= GROUPING;
+ thousands_sep = *(localeconv()->thousands_sep);
+ grouping = localeconv()->grouping;
goto rflag;
case '.':
if ((ch = *fmt++) == '*') {
@@ -629,11 +751,8 @@
nextarg = n;
if (argtable == NULL) {
argtable = statargtable;
- if (__find_arguments (fmt0, orgap,
- &argtable)) {
- ret = EOF;
- goto error;
- }
+ __find_arguments (fmt0, orgap,
+ &argtable);
}
goto rflag;
}
@@ -674,18 +793,14 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'c':
-#ifdef VECTORS
- if (flags & VECTOR)
- break;
-#endif /* VECTORS */
if (flags & LONGINT) {
static const mbstate_t initial;
mbstate_t mbs;
size_t mbseqlen;
mbs = initial;
- mbseqlen = wcrtomb_l(cp = buf,
- (wchar_t)GETARG(wint_t), &mbs, loc);
+ mbseqlen = wcrtomb(cp = buf,
+ (wchar_t)GETARG(wint_t), &mbs);
if (mbseqlen == (size_t)-1) {
fp->_flags |= __SERR;
goto error;
@@ -702,10 +817,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) {
@@ -724,12 +835,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;
@@ -761,12 +866,6 @@
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;
@@ -775,22 +874,10 @@
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;
@@ -822,7 +909,6 @@
} else
cp = (ch >= 'a') ? "inf" : "INF";
size = 3;
- flags &= ~ZEROPAD;
break;
}
flags |= FPT;
@@ -850,7 +936,7 @@
expsize = exponent(expstr, expt - 1, expchar);
size = expsize + prec;
if (prec > 1 || flags & ALT)
- size += decpt_len;
+ ++size;
} else {
/* space for digits before decimal point */
if (expt > 0)
@@ -859,63 +945,54 @@
size = 1;
/* space for decimal pt and following digits */
if (prec || flags & ALT)
- size += prec + decpt_len;
- if ((flags & GROUPING) && expt > 0)
- size += grouping_init(&gs, expt, loc);
+ size += prec + 1;
+ if (grouping && expt > 0) {
+ /* space for thousands' grouping */
+ nseps = nrepeats = 0;
+ lead = expt;
+ while (*grouping != CHAR_MAX) {
+ if (lead <= *grouping)
+ break;
+ lead -= *grouping;
+ if (*(grouping+1)) {
+ nseps++;
+ grouping++;
+ } else
+ nrepeats++;
+ }
+ size += nseps + nrepeats;
+ } else
+ lead = 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;
-
-#ifndef ALLOW_DYNAMIC_PERCENT_N
- if (!static_format_checked) {
- static_format_checked = __printf_is_memory_read_only((void*)fmt0, strlen(fmt0));
- }
- if (!static_format_checked) {
-#if OS_CRASH_ENABLE_EXPERIMENTAL_LIBTRACE
- os_crash("%%n used in a non-immutable format string: %s", fmt0);
-#else
- os_crash("%%n used in a non-immutable format string");
-#endif
- }
-#endif // ALLOW_DYNAMIC_PERCENT_N
-
- if (flags & LLONGINT) {
- LIBC_HOOKS_WRITE_SIMPLE_TYPE(ptr, long long, ret);
- } else if (flags & SIZET) {
- LIBC_HOOKS_WRITE_SIMPLE_TYPE(ptr, ssize_t, ret);
- } else if (flags & PTRDIFFT) {
- LIBC_HOOKS_WRITE_SIMPLE_TYPE(ptr, ptrdiff_t, ret);
- } else if (flags & INTMAXT) {
- LIBC_HOOKS_WRITE_SIMPLE_TYPE(ptr, intmax_t, ret);
- } else if (flags & LONGINT) {
- LIBC_HOOKS_WRITE_SIMPLE_TYPE(ptr, long, ret);
- } else if (flags & SHORTINT) {
- LIBC_HOOKS_WRITE_SIMPLE_TYPE(ptr, short, ret);
- } else if (flags & CHARINT) {
- LIBC_HOOKS_WRITE_SIMPLE_TYPE(ptr, signed char, ret);
- } else {
- LIBC_HOOKS_WRITE_SIMPLE_TYPE(ptr, int, ret);
- }
+ if (flags & LLONGINT)
+ *GETARG(long long *) = ret;
+ else if (flags & SIZET)
+ *GETARG(ssize_t *) = (ssize_t)ret;
+ else if (flags & PTRDIFFT)
+ *GETARG(ptrdiff_t *) = ret;
+ else if (flags & INTMAXT)
+ *GETARG(intmax_t *) = ret;
+ else if (flags & LONGINT)
+ *GETARG(long *) = ret;
+ else if (flags & SHORTINT)
+ *GETARG(short *) = ret;
+ else if (flags & CHARINT)
+ *GETARG(signed char *) = ret;
+ else
+ *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
@@ -930,10 +1007,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;
@@ -947,12 +1020,12 @@
if (flags & LONGINT) {
wchar_t *wcp;
- free(convbuf);
- if ((wcp = GETARG(wchar_t *)) == NULL) {
- convbuf = NULL;
+ if (convbuf != NULL)
+ free(convbuf);
+ if ((wcp = GETARG(wchar_t *)) == NULL)
cp = "(null)";
- } else {
- convbuf = __wcsconv(wcp, prec, loc);
+ else {
+ convbuf = __wcsconv(wcp, prec);
if (convbuf == NULL) {
fp->_flags |= __SERR;
goto error;
@@ -961,26 +1034,28 @@
}
} else if ((cp = GETARG(char *)) == NULL)
cp = "(null)";
- {
- size_t cp_len = (prec >= 0) ? strnlen(cp, prec) : strlen(cp);
- if (cp_len < INT_MAX) {
- size = cp_len;
- } else {
- ret = EOF;
- goto error;
- }
- libc_hooks_will_read(cp, size);
- }
+ if (prec >= 0) {
+ /*
+ * can't use strlen; can only look for the
+ * NUL in the first `prec' characters, and
+ * strlen() will go further.
+ */
+ char *p = memchr(cp, 0, (size_t)prec);
+
+ if (p != NULL) {
+ size = p - cp;
+ if (size > prec)
+ size = prec;
+ } else
+ size = prec;
+ } else
+ size = strlen(cp);
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
@@ -993,10 +1068,6 @@
case 'x':
xdigs = xdigs_lower;
hex:
-#ifdef VECTORS
- if (flags & VECTOR)
- break;
-#endif /* VECTORS */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
@@ -1014,7 +1085,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;
@@ -1023,34 +1093,25 @@
* ``The result of converting a zero value with an
* explicit precision of zero is no characters.''
* -- ANSI X3J11
- *
- * ``The C Standard is clear enough as is. The call
- * printf("%#.0o", 0) should print 0.''
- * -- Defect Report #151
*/
cp = buf + BUF;
if (flags & INTMAX_SIZE) {
- if (ujval != 0 || prec != 0 ||
- (flags & ALT && base == 8))
+ if (ujval != 0 || prec != 0)
cp = __ujtoa(ujval, cp, base,
- flags & ALT, xdigs);
+ flags & ALT, xdigs,
+ flags & GROUPING, thousands_sep,
+ grouping);
} else {
- if (ulval != 0 || prec != 0 ||
- (flags & ALT && base == 8))
+ if (ulval != 0 || prec != 0)
cp = __ultoa(ulval, cp, base,
- flags & ALT, xdigs);
+ flags & ALT, xdigs,
+ flags & GROUPING, thousands_sep,
+ grouping);
}
size = buf + BUF - cp;
if (size > BUF) /* should never happen */
- LIBC_ABORT("size (%zd) > BUF (%d)", size, BUF);
- if ((flags & GROUPING) && size != 0)
- size += grouping_init(&gs, size, loc);
- break;
-#ifdef VECTORS
- case 'v':
- flags |= VECTOR;
- goto rflag;
-#endif /* VECTORS */
+ abort();
+ break;
default: /* "%?" prints ?, unless ? is NUL */
if (ch == '\0')
goto done;
@@ -1062,290 +1123,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(vstr, vlen); \
- FLUSH(); \
- 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(vstr, vlen); \
- FLUSH(); \
- 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
@@ -1367,9 +1144,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;
}
@@ -1390,48 +1166,51 @@
if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD)
PAD(width - realsz, zeroes);
+ /* leading zeroes from decimal precision */
+ PAD(dprec - size, zeroes);
+
/* the string or number proper */
#ifndef NO_FLOATING_POINT
if ((flags & FPT) == 0) {
-#endif
- /* leading zeroes from decimal precision */
- PAD(dprec - size, zeroes);
- if (gs.grouping) {
- if (grouping_print(&gs, &io, cp, buf+BUF, loc) < 0)
- goto error;
- } else {
- PRINT(cp, size);
- }
-#ifndef NO_FLOATING_POINT
+ PRINT(cp, size);
} else { /* glue together f_p fragments */
if (!expchar) { /* %[fF] or sufficiently short %[gG] */
if (expt <= 0) {
PRINT(zeroes, 1);
if (prec || flags & ALT)
- PRINT(decimal_point,decpt_len);
+ PRINT(decimal_point, 1);
PAD(-expt, zeroes);
/* already handled initial 0's */
prec += expt;
} else {
- if (gs.grouping) {
- n = grouping_print(&gs, &io,
- cp, dtoaend, loc);
- if (n < 0)
- goto error;
- cp += n;
- } else {
- PRINTANDPAD(cp, dtoaend,
- expt, zeroes);
- cp += expt;
+ PRINTANDPAD(cp, dtoaend, lead, zeroes);
+ cp += lead;
+ if (grouping) {
+ while (nseps>0 || nrepeats>0) {
+ if (nrepeats > 0)
+ nrepeats--;
+ else {
+ grouping--;
+ nseps--;
+ }
+ PRINT(&thousands_sep,
+ 1);
+ PRINTANDPAD(cp,dtoaend,
+ *grouping, zeroes);
+ cp += *grouping;
+ }
+ if (cp > dtoaend)
+ cp = dtoaend;
}
if (prec || flags & ALT)
- PRINT(decimal_point,decpt_len);
+ PRINT(decimal_point,1);
}
PRINTANDPAD(cp, dtoaend, prec, zeroes);
} else { /* %[eE] or sufficiently long %[gG] */
if (prec > 1 || flags & ALT) {
- PRINT(cp++, 1);
- PRINT(decimal_point, decpt_len);
+ buf[0] = *cp++;
+ buf[1] = *decimal_point;
+ PRINT(buf, 2);
PRINT(cp, ndig-1);
PAD(prec - ndig, zeroes);
} else /* XeYYY */
@@ -1439,6 +1218,8 @@
PRINT(expstr, expsize);
}
}
+#else
+ PRINT(cp, size);
#endif
/* left-adjusting padding (always blank) */
if (flags & LADJUST)
@@ -1457,12 +1238,408 @@
if (dtoaresult != NULL)
freedtoa(dtoaresult);
#endif
- 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 */
}
-#pragma clang diagnostic pop
+
+/*
+ * Find all arguments when a positional parameter is encountered. Returns a
+ * table, indexed by argument number, of pointers to each arguments. The
+ * initial argument table should be an array of STATIC_ARG_TBL_SIZE entries.
+ * It will be replaces with a malloc-ed one if it overflows.
+ */
+static void
+__find_arguments (const char *fmt0, va_list ap, union arg **argtable)
+{
+ char *fmt; /* format string */
+ int ch; /* character from fmt */
+ int n, n2; /* handy integer (short term usage) */
+ char *cp; /* handy char pointer (short term usage) */
+ int flags; /* flags as above */
+ int width; /* width from format (%8d), or 0 */
+ enum typeid *typetable; /* table of types */
+ enum typeid stattypetable [STATIC_ARG_TBL_SIZE];
+ int tablesize; /* current size of type table */
+ int tablemax; /* largest used index in table */
+ int nextarg; /* 1-based argument index */
+
+ /*
+ * Add an argument type to the table, expanding if necessary.
+ */
+#define ADDTYPE(type) \
+ ((nextarg >= tablesize) ? \
+ __grow_type_table(nextarg, &typetable, &tablesize) : (void)0, \
+ (nextarg > tablemax) ? tablemax = nextarg : 0, \
+ typetable[nextarg++] = type)
+
+#define ADDSARG() \
+ ((flags&INTMAXT) ? ADDTYPE(T_INTMAXT) : \
+ ((flags&SIZET) ? ADDTYPE(T_SIZET) : \
+ ((flags&PTRDIFFT) ? ADDTYPE(T_PTRDIFFT) : \
+ ((flags&LLONGINT) ? ADDTYPE(T_LLONG) : \
+ ((flags&LONGINT) ? ADDTYPE(T_LONG) : ADDTYPE(T_INT))))))
+
+#define ADDUARG() \
+ ((flags&INTMAXT) ? ADDTYPE(T_UINTMAXT) : \
+ ((flags&SIZET) ? ADDTYPE(T_SIZET) : \
+ ((flags&PTRDIFFT) ? ADDTYPE(T_PTRDIFFT) : \
+ ((flags&LLONGINT) ? ADDTYPE(T_U_LLONG) : \
+ ((flags&LONGINT) ? ADDTYPE(T_U_LONG) : ADDTYPE(T_U_INT))))))
+
+ /*
+ * Add * arguments to the type array.
+ */
+#define ADDASTER() \
+ n2 = 0; \
+ cp = fmt; \
+ while (is_digit(*cp)) { \
+ n2 = 10 * n2 + to_digit(*cp); \
+ cp++; \
+ } \
+ if (*cp == '$') { \
+ int hold = nextarg; \
+ nextarg = n2; \
+ ADDTYPE (T_INT); \
+ nextarg = hold; \
+ fmt = ++cp; \
+ } else { \
+ ADDTYPE (T_INT); \
+ }
+ fmt = (char *)fmt0;
+ typetable = stattypetable;
+ tablesize = STATIC_ARG_TBL_SIZE;
+ tablemax = 0;
+ nextarg = 1;
+ for (n = 0; n < STATIC_ARG_TBL_SIZE; n++)
+ typetable[n] = T_UNUSED;
+
+ /*
+ * Scan the format for conversions (`%' character).
+ */
+ for (;;) {
+ for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
+ /* void */;
+ if (ch == '\0')
+ goto done;
+ fmt++; /* skip over '%' */
+
+ flags = 0;
+ width = 0;
+
+rflag: ch = *fmt++;
+reswitch: switch (ch) {
+ case ' ':
+ case '#':
+ goto rflag;
+ case '*':
+ ADDASTER ();
+ goto rflag;
+ case '-':
+ case '+':
+ case '\'':
+ goto rflag;
+ case '.':
+ if ((ch = *fmt++) == '*') {
+ ADDASTER ();
+ goto rflag;
+ }
+ while (is_digit(ch)) {
+ ch = *fmt++;
+ }
+ goto reswitch;
+ case '0':
+ goto rflag;
+ case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+ n = 0;
+ do {
+ n = 10 * n + to_digit(ch);
+ ch = *fmt++;
+ } while (is_digit(ch));
+ if (ch == '$') {
+ nextarg = n;
+ goto rflag;
+ }
+ width = n;
+ goto reswitch;
+#ifndef NO_FLOATING_POINT
+ case 'L':
+ flags |= LONGDBL;
+ goto rflag;
+#endif
+ case 'h':
+ if (flags & SHORTINT) {
+ flags &= ~SHORTINT;
+ flags |= CHARINT;
+ } else
+ flags |= SHORTINT;
+ goto rflag;
+ case 'j':
+ flags |= INTMAXT;
+ goto rflag;
+ case 'l':
+ if (flags & LONGINT) {
+ flags &= ~LONGINT;
+ flags |= LLONGINT;
+ } else
+ flags |= LONGINT;
+ goto rflag;
+ case 'q':
+ flags |= LLONGINT; /* not necessarily */
+ goto rflag;
+ case 't':
+ flags |= PTRDIFFT;
+ goto rflag;
+ case 'z':
+ flags |= SIZET;
+ goto rflag;
+ case 'C':
+ flags |= LONGINT;
+ /*FALLTHROUGH*/
+ case 'c':
+ if (flags & LONGINT)
+ ADDTYPE(T_WINT);
+ else
+ ADDTYPE(T_INT);
+ break;
+ case 'D':
+ flags |= LONGINT;
+ /*FALLTHROUGH*/
+ case 'd':
+ case 'i':
+ ADDSARG();
+ break;
+#ifndef NO_FLOATING_POINT
+ case 'a':
+ case 'A':
+ case 'e':
+ case 'E':
+ case 'f':
+ case 'g':
+ case 'G':
+ if (flags & LONGDBL)
+ ADDTYPE(T_LONG_DOUBLE);
+ else
+ ADDTYPE(T_DOUBLE);
+ break;
+#endif /* !NO_FLOATING_POINT */
+ case 'n':
+ if (flags & INTMAXT)
+ ADDTYPE(TP_INTMAXT);
+ else if (flags & PTRDIFFT)
+ ADDTYPE(TP_PTRDIFFT);
+ else if (flags & SIZET)
+ ADDTYPE(TP_SIZET);
+ else if (flags & LLONGINT)
+ ADDTYPE(TP_LLONG);
+ else if (flags & LONGINT)
+ ADDTYPE(TP_LONG);
+ else if (flags & SHORTINT)
+ ADDTYPE(TP_SHORT);
+ else if (flags & CHARINT)
+ ADDTYPE(TP_SCHAR);
+ else
+ ADDTYPE(TP_INT);
+ continue; /* no output */
+ case 'O':
+ flags |= LONGINT;
+ /*FALLTHROUGH*/
+ case 'o':
+ ADDUARG();
+ break;
+ case 'p':
+ ADDTYPE(TP_VOID);
+ break;
+ case 'S':
+ flags |= LONGINT;
+ /*FALLTHROUGH*/
+ case 's':
+ if (flags & LONGINT)
+ ADDTYPE(TP_WCHAR);
+ else
+ ADDTYPE(TP_CHAR);
+ break;
+ case 'U':
+ flags |= LONGINT;
+ /*FALLTHROUGH*/
+ case 'u':
+ case 'X':
+ case 'x':
+ ADDUARG();
+ break;
+ default: /* "%?" prints ?, unless ? is NUL */
+ if (ch == '\0')
+ goto done;
+ break;
+ }
+ }
+done:
+ /*
+ * Build the argument table.
+ */
+ if (tablemax >= STATIC_ARG_TBL_SIZE) {
+ *argtable = (union arg *)
+ malloc (sizeof (union arg) * (tablemax + 1));
+ }
+
+ (*argtable) [0].intarg = 0;
+ for (n = 1; n <= tablemax; n++) {
+ switch (typetable [n]) {
+ case T_UNUSED: /* whoops! */
+ (*argtable) [n].intarg = va_arg (ap, int);
+ break;
+ case TP_SCHAR:
+ (*argtable) [n].pschararg = va_arg (ap, signed char *);
+ break;
+ case TP_SHORT:
+ (*argtable) [n].pshortarg = va_arg (ap, short *);
+ break;
+ case T_INT:
+ (*argtable) [n].intarg = va_arg (ap, int);
+ break;
+ case T_U_INT:
+ (*argtable) [n].uintarg = va_arg (ap, unsigned int);
+ break;
+ case TP_INT:
+ (*argtable) [n].pintarg = va_arg (ap, int *);
+ break;
+ case T_LONG:
+ (*argtable) [n].longarg = va_arg (ap, long);
+ break;
+ case T_U_LONG:
+ (*argtable) [n].ulongarg = va_arg (ap, unsigned long);
+ break;
+ case TP_LONG:
+ (*argtable) [n].plongarg = va_arg (ap, long *);
+ break;
+ case T_LLONG:
+ (*argtable) [n].longlongarg = va_arg (ap, long long);
+ break;
+ case T_U_LLONG:
+ (*argtable) [n].ulonglongarg = va_arg (ap, unsigned long long);
+ break;
+ case TP_LLONG:
+ (*argtable) [n].plonglongarg = va_arg (ap, long long *);
+ break;
+ case T_PTRDIFFT:
+ (*argtable) [n].ptrdiffarg = va_arg (ap, ptrdiff_t);
+ break;
+ case TP_PTRDIFFT:
+ (*argtable) [n].pptrdiffarg = va_arg (ap, ptrdiff_t *);
+ break;
+ case T_SIZET:
+ (*argtable) [n].sizearg = va_arg (ap, size_t);
+ break;
+ case TP_SIZET:
+ (*argtable) [n].psizearg = va_arg (ap, ssize_t *);
+ break;
+ case T_INTMAXT:
+ (*argtable) [n].intmaxarg = va_arg (ap, intmax_t);
+ break;
+ case T_UINTMAXT:
+ (*argtable) [n].uintmaxarg = va_arg (ap, uintmax_t);
+ break;
+ case TP_INTMAXT:
+ (*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
+ break;
+#ifndef NO_FLOATING_POINT
+ case T_DOUBLE:
+ (*argtable) [n].doublearg = va_arg (ap, double);
+ break;
+ case T_LONG_DOUBLE:
+ (*argtable) [n].longdoublearg = va_arg (ap, long double);
+ break;
+#endif
+ case TP_CHAR:
+ (*argtable) [n].pchararg = va_arg (ap, char *);
+ break;
+ case TP_VOID:
+ (*argtable) [n].pvoidarg = va_arg (ap, void *);
+ break;
+ case T_WINT:
+ (*argtable) [n].wintarg = va_arg (ap, wint_t);
+ break;
+ case TP_WCHAR:
+ (*argtable) [n].pwchararg = va_arg (ap, wchar_t *);
+ break;
+ }
+ }
+
+ if ((typetable != NULL) && (typetable != stattypetable))
+ free (typetable);
+}
+
+/*
+ * Increase the size of the type table.
+ */
+static void
+__grow_type_table (int nextarg, enum typeid **typetable, int *tablesize)
+{
+ enum typeid *const oldtable = *typetable;
+ const int oldsize = *tablesize;
+ enum typeid *newtable;
+ int n, newsize = oldsize * 2;
+
+ if (newsize < nextarg + 1)
+ newsize = nextarg + 1;
+ if (oldsize == STATIC_ARG_TBL_SIZE) {
+ if ((newtable = malloc(newsize * sizeof(enum typeid))) == NULL)
+ abort(); /* XXX handle better */
+ bcopy(oldtable, newtable, oldsize * sizeof(enum typeid));
+ } else {
+ newtable = reallocf(oldtable, newsize * sizeof(enum typeid));
+ if (newtable == NULL)
+ abort(); /* XXX handle better */
+ }
+ for (n = oldsize; n < newsize; n++)
+ newtable[n] = T_UNUSED;
+
+ *typetable = newtable;
+ *tablesize = newsize;
+}
+
+
+#ifndef NO_FLOATING_POINT
+
+static int
+exponent(char *p0, int exp, int fmtch)
+{
+ char *p, *t;
+ char expbuf[MAXEXPDIG];
+
+ p = p0;
+ *p++ = fmtch;
+ if (exp < 0) {
+ exp = -exp;
+ *p++ = '-';
+ }
+ else
+ *p++ = '+';
+ t = expbuf + MAXEXPDIG;
+ if (exp > 9) {
+ do {
+ *--t = to_char(exp % 10);
+ } while ((exp /= 10) > 9);
+ *--t = to_char(exp);
+ for (; t < expbuf + MAXEXPDIG; *p++ = *t++);
+ }
+ else {
+ /*
+ * Exponents for decimal floating point conversions
+ * (%[eEgG]) must be at least two characters long,
+ * whereas exponents for hexadecimal conversions can
+ * be only one character long.
+ */
+ if (fmtch == 'e' || fmtch == 'E')
+ *p++ = '0';
+ *p++ = to_char(exp);
+ }
+ return (p - p0);
+}
+#endif /* !NO_FLOATING_POINT */