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.
92 lines
2.3 KiB
C
92 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 1990, 2007 The Regents of the University of California.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that the above copyright notice and this paragraph are
|
|
* duplicated in all such forms and that any documentation,
|
|
* advertising materials, and other materials related to such
|
|
* distribution and use acknowledge that the software was developed
|
|
* by the University of California, Berkeley. The name of the
|
|
* University may not be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
/* This code was copied from sprintf.c */
|
|
/* doc in sprintf.c */
|
|
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <limits.h>
|
|
#include "local.h"
|
|
|
|
int
|
|
_DEFUN(_asprintf_r, (ptr, strp, fmt),
|
|
struct _reent *ptr _AND
|
|
char **__restrict strp _AND
|
|
const char *__restrict fmt _DOTS)
|
|
{
|
|
int ret;
|
|
va_list ap;
|
|
FILE f;
|
|
|
|
/* mark a zero-length reallocatable buffer */
|
|
f._flags = __SWR | __SSTR | __SMBF;
|
|
f._bf._base = f._p = NULL;
|
|
f._bf._size = f._w = 0;
|
|
f._file = -1; /* No file. */
|
|
va_start (ap, fmt);
|
|
ret = _svfprintf_r (ptr, &f, fmt, ap);
|
|
va_end (ap);
|
|
if (ret >= 0)
|
|
{
|
|
*f._p = 0;
|
|
*strp = (char *) f._bf._base;
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
#ifdef _NANO_FORMATTED_IO
|
|
int
|
|
_EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
|
|
_ATTRIBUTE ((__alias__("_asprintf_r"))));
|
|
#endif
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
int
|
|
_DEFUN(asprintf, (strp, fmt),
|
|
char **__restrict strp _AND
|
|
const char *__restrict fmt _DOTS)
|
|
{
|
|
int ret;
|
|
va_list ap;
|
|
FILE f;
|
|
|
|
/* mark a zero-length reallocatable buffer */
|
|
f._flags = __SWR | __SSTR | __SMBF;
|
|
f._bf._base = f._p = NULL;
|
|
f._bf._size = f._w = 0;
|
|
f._file = -1; /* No file. */
|
|
va_start (ap, fmt);
|
|
ret = _svfprintf_r (_REENT, &f, fmt, ap);
|
|
va_end (ap);
|
|
if (ret >= 0)
|
|
{
|
|
*f._p = 0;
|
|
*strp = (char *) f._bf._base;
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
#ifdef _NANO_FORMATTED_IO
|
|
int
|
|
_EXFUN(asiprintf, (char **, const char *, ...)
|
|
_ATTRIBUTE ((__alias__("asprintf"))));
|
|
#endif
|
|
#endif /* ! _REENT_ONLY */
|