mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 03:19:54 +08:00
eabd7de028
* libc/stdio/Makefile.am: Build vfprintf.c and vfscanf.c with
-DSTRING_ONLY defined with and without -DINTEGER_ONLY defined
to build special versions for sprintf/sscanf family functions.
* libc/stdio/Makefile.in: Regenerated.
* libc/stdio/vfprintf.c[STRING_ONLY][INTEGER_ONLY](_VFPRINTF_R):
Redefine to be _svfiprintf_r which is optimized to work with siprintf
family of functions (i.e. no I/O) and does not support floating-point.
[STRING_ONLY][!INTEGER_ONLY](_VFPRINTF_R): Redefine to be
_svfprintf_r which is optimized to work with sprintf family of
functions and not use I/O.
[STRING_ONLY](__sprint_r): New string only version of static function.
designed to work with sprintf family of functions.
* libc/stdio/vfscanf.c[STRING_ONLY][INTEGER_ONLY](_SVFSCANF_R):
Redefine to be _ssvfiscanf_r which is optimized to work with siscanf
family of functions (i.e. no I/O) and no float-point support.
[STRING_ONLY][!INTEGER_ONLY](_SVFSCANF_R): Redefine to be
__ssvfscanf_r which is optimized to work with sscanf family of
functions and does not require I/O functions.
* libc/stdio/asprintf.c: Call _svfprintf_r instead of _vfprintf_r.
* libc/stdio/snprintf.c: Ditto.
* libc/stdio/sprintf.c: Ditto.
* libc/stdio/vasnprintf.c: Ditto.
* libc/stdio/vasprintf.c: Ditto.
* libc/stdio/siprintf.c: Call _svfiprintf_r instead of _vfiprintf_r.
* libc/stdio/sniprintf.c: Ditto.
* libc/stdio/vasiprintf.c: Ditto.
* libc/stdio/vsiprintf.c: Ditto.
* libc/stdio/vsniprintf.c: Ditto.
* libc/stdio/vsprintf.c: Ditto.
* libc/stdio/local.h: Add prototypes for _svfprintf_r, _svfiprintf_r,
_ssvfscanf_r, and _ssvfiscanf_r.
* libc/stdio/sscanf.c: Call _ssvfscanf_r instead of _svfscanf_r.
* libc/stdio/vsscanf.c: Ditto.
* libc/stdio/siscanf.c: Call _ssvfiscanf_r instead of _svfiscanf_r.
* libc/stdio/vsiscanf.c: Ditto.
71 lines
1.6 KiB
C
71 lines
1.6 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>
|
|
|
|
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;
|
|
}
|
|
|
|
#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);
|
|
}
|
|
|
|
#endif /* ! _REENT_ONLY */
|