mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 03:19:54 +08:00
6818a5c539
* libc/stdlib/wcstoull_r.c: Add EINVAL return for bad base value,
include wchar.h for prototype, remove extraneous includes, use
C99/POSIX ULLONG_MAX (but allow for poor limits.h).
* libc/stdlib/wcstoull.c: Fix usage comments (mistakes and to add
base value check noted above), remove extraneous includes.
* libc/stdio/asnprintf.c: Add #include "local.h" to get function
prototype for _svfprintf_r().
* libc/stdio/vasnprintf.c: Ditto.
* libc/stdio/local.h: Add function prototype for __submore().
* libc/include/stdio.h: Add function prototypes for _fseeko_r and
_ftello_r.
* libc/posix/namespace.h: Commented out define for write to
eliminate write() prototype being missing for collate.c (which is
the only file that presently includes namespace.h).
* libc/include/reent.h: Added _rename_r.
* libc/reent/renamer.c: Corrected function prototypes in synopses.
* libc/locale/ldpart.c: Use struct stat64 when calling fstat64.
109 lines
2.4 KiB
C
109 lines
2.4 KiB
C
/* Copyright (C) 2007, 2008 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 sprintf.c */
|
|
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <limits.h>
|
|
#include <errno.h>
|
|
#include "local.h"
|
|
|
|
char *
|
|
_DEFUN(_asnprintf_r, (ptr, buf, lenp, fmt),
|
|
struct _reent *ptr _AND
|
|
char *buf _AND
|
|
size_t *lenp _AND
|
|
const char *fmt _DOTS)
|
|
{
|
|
int ret;
|
|
va_list ap;
|
|
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. */
|
|
va_start (ap, fmt);
|
|
ret = _svfprintf_r (ptr, &f, fmt, ap);
|
|
va_end (ap);
|
|
if (ret < 0)
|
|
return NULL;
|
|
*lenp = ret;
|
|
*f._p = '\0';
|
|
return (char *) f._bf._base;
|
|
}
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
char *
|
|
_DEFUN(asnprintf, (buf, lenp, fmt),
|
|
char *buf _AND
|
|
size_t *lenp _AND
|
|
const char *fmt _DOTS)
|
|
{
|
|
int ret;
|
|
va_list ap;
|
|
FILE f;
|
|
size_t len = *lenp;
|
|
struct _reent *ptr = _REENT;
|
|
|
|
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. */
|
|
va_start (ap, fmt);
|
|
ret = _svfprintf_r (ptr, &f, fmt, ap);
|
|
va_end (ap);
|
|
if (ret < 0)
|
|
return NULL;
|
|
*lenp = ret;
|
|
*f._p = '\0';
|
|
return (char *) f._bf._base;
|
|
}
|
|
|
|
#endif /* ! _REENT_ONLY */
|