mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 19:09:58 +08:00
b9db529222
* libc/stdio/Makefile.am (ELIX_SOURCES): Rename... (ELIX_2_SOURCES): ...to this. (ELIX_4_SOURCES): Add new variable. Build asnprintf. (GENERAL_SOURCES): Move dprintf to ELIX_4_SOURCES. (CHEWOUT_FILES): Include diprintf in documentation. * libc/stdio/Makefile.in: Regenerate. * libc/stdio/diprintf.c: Improve documentation. * libc/stdio/dprintf.c: Likewise. * libc/stdio/siprintf.c: Likewise. * libc/stdio/sprintf.c: Likewise. * libc/stdio/vfprintf.c: Likewise. * libc/stdio/viprintf.c: Likewise. * libc/stdio/vsniprintf.c: Consolidate documentation. * libc/stdio/asiprintf.c: Refer to documentation. * libc/stdio/asprintf.c: Likewise. * libc/stdio/fiprintf.c: Likewise. * libc/stdio/fprintf.c: Likewise. * libc/stdio/iprintf.c: Likewise. * libc/stdio/printf.c: Likewise. * libc/stdio/sniprintf.c: Likewise. * libc/stdio/vdiprintf.c: Likewise. * libc/stdio/vdprintf.c: Likewise. * libc/stdio/vsiprintf.c: Likewise. * libc/stdio/fvwrite.c (__sfvwrite_r): Handle asnprintf. * libc/stdio/asniprintf.c (asniprintf, _asniprintf_r): New file. * libc/stdio/asnprintf.c (asnprintf, _asnprintf_r): New file. * libc/stdio/vasniprintf.c (vasniprintf, _vasniprintf_r): New file. * libc/stdio/vasnprintf.c (vasnprintf, _vasnprintf_r): New file. * libc/stdio/vdprintf.c (_vdprintf_r): Rewrite to avoid malloc in typical case. * libc/stdio/vdiprintf.c (_vdiprintf_r): Likewise. * libc/include/stdio.h: Add prototypes for new functions; sort existing functions.
121 lines
2.7 KiB
C
121 lines
2.7 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 created by modifying snprintf.c so copyright inherited. */
|
|
/* doc in siprintf.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 <errno.h>
|
|
#include "local.h"
|
|
|
|
int
|
|
#ifdef _HAVE_STDC
|
|
_DEFUN (_sniprintf_r, (ptr, str, size, fmt),
|
|
struct _reent *ptr _AND
|
|
char *str _AND
|
|
size_t size _AND
|
|
_CONST char *fmt _DOTS)
|
|
#else
|
|
_sniprintf_r (ptr, str, size, fmt, va_alist)
|
|
struct _reent *ptr;
|
|
char *str;
|
|
size_t size;
|
|
_CONST char *fmt;
|
|
va_dcl
|
|
#endif
|
|
{
|
|
int ret;
|
|
va_list ap;
|
|
FILE f;
|
|
|
|
if (size > INT_MAX)
|
|
{
|
|
ptr->_errno = EOVERFLOW;
|
|
return EOF;
|
|
}
|
|
f._flags = __SWR | __SSTR;
|
|
f._bf._base = f._p = (unsigned char *) str;
|
|
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
|
|
f._file = -1; /* No file. */
|
|
#ifdef _HAVE_STDC
|
|
va_start (ap, fmt);
|
|
#else
|
|
va_start (ap);
|
|
#endif
|
|
ret = _vfiprintf_r (ptr, &f, fmt, ap);
|
|
va_end (ap);
|
|
if (ret < EOF)
|
|
ptr->_errno = EOVERFLOW;
|
|
if (size > 0)
|
|
*f._p = 0;
|
|
return (ret);
|
|
}
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
int
|
|
#ifdef _HAVE_STDC
|
|
_DEFUN (sniprintf, (str, size, fmt),
|
|
char *str _AND
|
|
size_t size _AND
|
|
_CONST char *fmt _DOTS)
|
|
#else
|
|
sniprintf (str, size, fmt, va_alist)
|
|
char *str;
|
|
size_t size;
|
|
_CONST char *fmt;
|
|
va_dcl
|
|
#endif
|
|
{
|
|
int ret;
|
|
va_list ap;
|
|
FILE f;
|
|
struct _reent *ptr = _REENT;
|
|
|
|
if (size > INT_MAX)
|
|
{
|
|
ptr->_errno = EOVERFLOW;
|
|
return EOF;
|
|
}
|
|
f._flags = __SWR | __SSTR;
|
|
f._bf._base = f._p = (unsigned char *) str;
|
|
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
|
|
f._file = -1; /* No file. */
|
|
#ifdef _HAVE_STDC
|
|
va_start (ap, fmt);
|
|
#else
|
|
va_start (ap);
|
|
#endif
|
|
ret = _vfiprintf_r (ptr, &f, fmt, ap);
|
|
va_end (ap);
|
|
if (ret < EOF)
|
|
ptr->_errno = EOVERFLOW;
|
|
if (size > 0)
|
|
*f._p = 0;
|
|
return (ret);
|
|
}
|
|
|
|
#endif
|