mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 19:09:58 +08:00
3bf091476a
* libc/include/stdio.h: Add new iprintf and iscanf variants. Also
do some reordering.
* libc/machine/powerpc/vfscanf.c: Remove __sccl function.
* libc/stdio/Makefile.am: Add support for new iprintf and iscanf
family functions.
* libc/stdio/Makefile.in: Regenerated.
* libc/stdio/fiprintf.c: Remove doc to siprintf.c.
* libc/stdio/iprintf.c: Ditto.
* libc/stdio/local.h (__svfiscanf_r): New prototype.
* libc/stdio/siprintf.c: Add docs for various iprintf family functions.
* libc/stdio/sniprintf.c: Move docs to siprintf.c.
* libc/stdio/stdio.tex: Add new functions.
* libc/stdio/vfscanf.c: Split out __sccl function to separate
file and add special name defines so this file can be used
to build vfiscanf.o.
* libc/stdio/asiprintf.c: New file.
* libc/stdio/fiscanf.c: Ditto.
* libc/stdio/iscanf.c: Ditto.
* libc/stdio/sccl.c: Ditto.
* libc/stdio/siscanf.c: Ditto.
* libc/stdio/vasiprintf.c: Ditto.
* libc/stdio/viprintf.c: Ditto.
* libc/stdio/viscanf.c: Ditto.
* libc/stdio/vsiprintf.c: Ditto.
* libc/stdio/vsiscanf.c: Ditto.
* libc/stdio/vsniprintf.c: Ditto.
101 lines
2.3 KiB
C
101 lines
2.3 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.
|
|
*/
|
|
/* This code was copied from asprintf.c */
|
|
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
#include <stdio.h>
|
|
#ifdef _HAVE_STDC
|
|
#include <stdarg.h>
|
|
#else
|
|
#include <varargs.h>
|
|
#endif
|
|
#include <limits.h>
|
|
#include "local.h"
|
|
|
|
int
|
|
#ifdef _HAVE_STDC
|
|
_DEFUN(_asiprintf_r, (ptr, strp, fmt),
|
|
struct _reent *ptr _AND
|
|
char **strp _AND
|
|
_CONST char *fmt _DOTS)
|
|
#else
|
|
_asiprintf_r(ptr, strp, fmt, va_alist)
|
|
struct _reent *ptr;
|
|
char **strp;
|
|
_CONST char *fmt;
|
|
va_dcl
|
|
#endif
|
|
{
|
|
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. */
|
|
#ifdef _HAVE_STDC
|
|
va_start (ap, fmt);
|
|
#else
|
|
va_start (ap);
|
|
#endif
|
|
ret = vfiprintf (&f, fmt, ap);
|
|
va_end (ap);
|
|
*f._p = 0;
|
|
*strp = f._bf._base;
|
|
return (ret);
|
|
}
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
int
|
|
#ifdef _HAVE_STDC
|
|
_DEFUN(asiprintf, (strp, fmt),
|
|
char **strp _AND
|
|
_CONST char *fmt _DOTS)
|
|
#else
|
|
asiprintf(strp, fmt, va_alist)
|
|
char **strp;
|
|
_CONST char *fmt;
|
|
va_dcl
|
|
#endif
|
|
{
|
|
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. */
|
|
#ifdef _HAVE_STDC
|
|
va_start (ap, fmt);
|
|
#else
|
|
va_start (ap);
|
|
#endif
|
|
ret = vfiprintf (&f, fmt, ap);
|
|
va_end (ap);
|
|
*f._p = 0;
|
|
*strp = f._bf._base;
|
|
return (ret);
|
|
}
|
|
|
|
#endif
|