d34336767e
* README (--enable-newlib-nano-formatted-io): Describe.
* acconfig.h (_NANO_FORMATTED_IO): Undef.
* newlib.hin (_NANO_FORMATTED_IO): Undef.
* configure.in (--enable-newlib-nano-formatted-io): New option.
* configure: Regenerated.
* libc/configure.in (--enable-newlib-nano-formatted-io): New option.
* libc/configure: Regenerated.
* libc/stdio/Makefile.am (NEWLIB_NANO_FORMATTED_IO): Support new
configuration option.
* libc/stdio/Makefile.in: Regenerated.
* libc/stdio/asnprintf.c (_asniprintf_r, asniprintf): Use
_NANO_FORMATTED_IO to declare alias prototypes.
* libc/stdio/asprintf.c (_asiprintf_r, asiprintf): Ditto.
* libc/stdio/dprintf.c (_diprintf_r, diprintf): Ditto.
* libc/stdio/fprintf.c (_fiprintf_r, fiprintf): Ditto.
* libc/stdio/fscanf.c (fiscanf, _fiscanf_r): Ditto.
* libc/stdio/printf.c (_iprintf_r, iprintf): Ditto.
* libc/stdio/scanf.c (iscanf, _iscanf_r): Ditto.
* libc/stdio/snprintf.c (_sniprintf_r, sniprintf): Ditto.
* libc/stdio/sprintf.c (_siprintf_r, siprintf): Ditto.
* libc/stdio/sscanf.c (siscanf, _siscanf_r): Ditto.
* libc/stdio/vasnprintf.c (_vasniprintf_r, vasniprintf): Ditto.
* libc/stdio/vasprintf.c (vasiprintf, _vasiprintf_r): Ditto.
* libc/stdio/vdprintf.c (_vdiprintf_r, vdiprintf): Ditto.
* libc/stdio/vprintf.c (viprintf, _viprintf_r): Ditto.
* libc/stdio/vscanf.c (viscanf, _viscanf_r): Ditto.
* libc/stdio/vsnprintf.c (vsniprintf, _vsniprintf_r): Ditto.
* libc/stdio/vsprintf.c (vsiprintf, _vsiprintf_r): Ditto.
* libc/stdio/vsscanf.c (vsiscanf, _vsiscanf_r): Ditto.
* libc/stdio/nano-vfprintf.c: New file.
* libc/stdio/nano-vfprintf_float.c: New file.
* libc/stdio/nano-vfprintf_i.c: New file.
* libc/stdio/nano-vfprintf_local.h: New file.
* libc/stdio/nano-vfscanf.c: New file.
* libc/stdio/nano-vfscanf_float.c: New file.
* libc/stdio/nano-vfscanf_i.c: New file.
* libc/stdio/nano-vfscanf_local.h: New file.
84 lines
1.9 KiB
C
84 lines
1.9 KiB
C
/* Copyright (C) 2007 Eric Blake
|
|
* Permission to use, copy, modify, and distribute this software
|
|
* is freely granted, provided that this notice is preserved.
|
|
*/
|
|
/* This code was derived from asprintf.c */
|
|
/* doc in vfprintf.c */
|
|
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <limits.h>
|
|
#include <errno.h>
|
|
#include "local.h"
|
|
|
|
char *
|
|
_DEFUN(_vasnprintf_r, (ptr, buf, lenp, fmt, ap),
|
|
struct _reent *ptr _AND
|
|
char *buf _AND
|
|
size_t *lenp _AND
|
|
const char *fmt _AND
|
|
va_list ap)
|
|
{
|
|
int ret;
|
|
FILE f;
|
|
size_t len = *lenp;
|
|
|
|
if (buf && len)
|
|
{
|
|
/* mark an existing buffer, but allow allocation of larger string */
|
|
f._flags = __SWR | __SSTR | __SOPT;
|
|
}
|
|
else
|
|
{
|
|
/* mark a zero-length reallocatable buffer */
|
|
f._flags = __SWR | __SSTR | __SMBF;
|
|
len = 0;
|
|
buf = NULL;
|
|
}
|
|
f._bf._base = f._p = (unsigned char *) buf;
|
|
/* For now, inherit the 32-bit signed limit of FILE._bf._size.
|
|
FIXME - it would be nice to rewrite sys/reent.h to support size_t
|
|
for _size. */
|
|
if (len > INT_MAX)
|
|
{
|
|
ptr->_errno = EOVERFLOW;
|
|
return NULL;
|
|
}
|
|
f._bf._size = f._w = len;
|
|
f._file = -1; /* No file. */
|
|
ret = _svfprintf_r (ptr, &f, fmt, ap);
|
|
if (ret < 0)
|
|
return NULL;
|
|
*lenp = ret;
|
|
*f._p = '\0';
|
|
return (char *) f._bf._base;
|
|
}
|
|
|
|
#ifdef _NANO_FORMATTED_IO
|
|
char *
|
|
_EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *,
|
|
const char *, __VALIST)
|
|
_ATTRIBUTE ((__alias__("_vasnprintf_r"))));
|
|
#endif
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
char *
|
|
_DEFUN(vasnprintf, (buf, lenp, fmt, ap),
|
|
char *buf _AND
|
|
size_t *lenp _AND
|
|
const char *fmt _AND
|
|
va_list ap)
|
|
{
|
|
return _vasnprintf_r (_REENT, buf, lenp, fmt, ap);
|
|
}
|
|
|
|
#ifdef _NANO_FORMATTED_IO
|
|
char *
|
|
_EXFUN(vasniprintf, (char *, size_t *, const char *, __VALIST)
|
|
_ATTRIBUTE ((__alias__("vasnprintf"))));
|
|
#endif
|
|
#endif /* ! _REENT_ONLY */
|