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.
90 lines
2 KiB
C
90 lines
2 KiB
C
/*
|
|
* Copyright (c) 1990 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.
|
|
*/
|
|
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
#include <stdio.h>
|
|
#ifdef _HAVE_STDC
|
|
#include <stdarg.h>
|
|
#else
|
|
#include <varargs.h>
|
|
#endif
|
|
#include "local.h"
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
int
|
|
#ifdef _HAVE_STDC
|
|
fscanf(FILE *__restrict fp, _CONST char *__restrict fmt, ...)
|
|
#else
|
|
fscanf(FILE *fp, fmt, va_alist)
|
|
FILE *fp;
|
|
char *fmt;
|
|
va_dcl
|
|
#endif
|
|
{
|
|
int ret;
|
|
va_list ap;
|
|
|
|
#ifdef _HAVE_STDC
|
|
va_start (ap, fmt);
|
|
#else
|
|
va_start (ap);
|
|
#endif
|
|
ret = _vfscanf_r (_REENT, fp, fmt, ap);
|
|
va_end (ap);
|
|
return ret;
|
|
}
|
|
|
|
#ifdef _NANO_FORMATTED_IO
|
|
int
|
|
_EXFUN(fiscanf, (FILE *, const char *, ...)
|
|
_ATTRIBUTE ((__alias__("fscanf"))));
|
|
#endif
|
|
|
|
#endif /* !_REENT_ONLY */
|
|
|
|
int
|
|
#ifdef _HAVE_STDC
|
|
_fscanf_r(struct _reent *ptr, FILE *__restrict fp, _CONST char *__restrict fmt, ...)
|
|
#else
|
|
_fscanf_r(ptr, FILE *fp, fmt, va_alist)
|
|
struct _reent *ptr;
|
|
FILE *fp;
|
|
char *fmt;
|
|
va_dcl
|
|
#endif
|
|
{
|
|
int ret;
|
|
va_list ap;
|
|
|
|
#ifdef _HAVE_STDC
|
|
va_start (ap, fmt);
|
|
#else
|
|
va_start (ap);
|
|
#endif
|
|
ret = _vfscanf_r (ptr, fp, fmt, ap);
|
|
va_end (ap);
|
|
return (ret);
|
|
}
|
|
|
|
#ifdef _NANO_FORMATTED_IO
|
|
int
|
|
_EXFUN(_fiscanf_r, (struct _reent *, FILE *, const char *, ...)
|
|
_ATTRIBUTE ((__alias__("_fscanf_r"))));
|
|
#endif
|