glibc/misc/efgcvt_r.c
Ulrich Drepper 6dd67bd565 Update.
2002-08-24  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/charmap.c (charmap_new_char): Don't use
	ULONG_MAX as maximum UCS4 value.

	* sysdeps/unix/sysv/linux/ia64/sys/user.h: New file.

	* sysdeps/generic/strtol.c: We don't need the isascii test in glibc.

	* malloc/hooks.c (public_sET_STATe): use size_t as type for i.
	* malloc/malloc.c (mALLINFo): Likewise.

	* libio/wstrops.c (_IO_wstr_pbackfail): Use WEOF in comparison.

	* libio/wfileops.c (_IO_wfile_overflow): Use EOF not WEOF when
	examining result of _IO_do_flush call.

	* stdio-common/vfprintf.c (vfprintf): Use correct type in va_arg.
	Use prec not spec when sizing buffers.

	* catgets/open_catalog.c (__open_catalog): Add casts to avoid warnings.
	* locale/loadarchive.c (_nl_load_locale_from_archive): Likewise.
	* locale/loadlocale.c (_nl_intern_locale_data): Likewise.
	* stdio-common/vfscanf.c (inchar): Likewise.
	* misc/efgcvt_r.c (fcvt_r): Likewise.
	* elf/dl-misc.c (_dl_debug_vdprintf): Likewise.
	* elf/readlib.c (process_file): Likewise.
	* elf/sprof.c (load_profdata): Likewise.
	* sysdeps/ia64/hp-timing.h (HP_TIMING_PRINT): Likewise.
	* locale/programs/linereader.c (get_toplvl_escape): Likewise.
	* locale/programs/charmap.c (charmap_read): Likewise.
	* libio/fileops.c: Likewise.
	* libio/fmemopen.c: Likewise.
	* stdlib/strtod.c: Likewise.
	* elf/dl-load.c: Likewise.
	* iconv/iconvconfig.c: Likewise.
	* iconv/iconv_prog.c (process_block): Likewise.

	* sysdeps/unix/sysv/linux/ia64/Makefile: Define _ASM_IA64_CURRENT_H
	macro to calm down the compiler.

	* iconv/gconv_cache.c (__gconv_load_cache): Add cast to avoid warning.

	* sysdeps/ia64/elf/initfini.c: Don't use newlines embedded in string.

	* sysdeps/unix/sysv/linux/i386/sysdep.S: Update comment regarding
	placement of errno definition.
	* sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise.
	* sysdeps/unix/sysv/linux/mips/sysdep.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/sysdep.S: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise.

	* resolv/nss_dns/dns-host.c (MAXPACKET): Increase minimum value
	from 1024 to 65536, to avoid buffer overrun.

2002-08-16  Paul Eggert  <eggert@twinsun.com>

	* resolv/gethnamaddr.c (MAXPACKET): Increase minimum value
	from 1024 to 65536, to avoid buffer overrun.
	* resolv/res_query.c (MAXPACKET): Likewise.

	architectures.
2002-08-25 04:51:08 +00:00

217 lines
4.7 KiB
C

/* Compatibility functions for floating point formatting, reentrant versions.
Copyright (C) 1995,96,97,98,99,2000,01,02 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <errno.h>
#include <float.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <math.h>
#include <stdlib.h>
#include <sys/param.h>
#ifndef FLOAT_TYPE
# define FLOAT_TYPE double
# define FUNC_PREFIX
# define FLOAT_FMT_FLAG
# define FLOAT_NAME_EXT
# if DBL_MANT_DIG == 53
# define NDIGIT_MAX 17
# elif DBL_MANT_DIG == 24
# define NDIGIT_MAX 9
# elif DBL_MANT_DIG == 56
# define NDIGIT_MAX 18
# else
/* See IEEE 854 5.6, table 2 for this formula. Unfortunately we need a
compile time constant here, so we cannot use it. */
# error "NDIGIT_MAX must be precomputed"
# define NDIGIT_MAX (lrint (ceil (M_LN2 / M_LN10 * DBL_MANT_DIG + 1.0)))
# endif
#endif
#define APPEND(a, b) APPEND2 (a, b)
#define APPEND2(a, b) a##b
#define FLOOR APPEND(floor, FLOAT_NAME_EXT)
#define FABS APPEND(fabs, FLOAT_NAME_EXT)
#define LOG10 APPEND(log10, FLOAT_NAME_EXT)
#define EXP APPEND(exp, FLOAT_NAME_EXT)
int
APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len)
FLOAT_TYPE value;
int ndigit, *decpt, *sign;
char *buf;
size_t len;
{
ssize_t n;
ssize_t i;
int left;
if (buf == NULL)
{
__set_errno (EINVAL);
return -1;
}
left = 0;
if (isfinite (value))
{
*sign = signbit (value) != 0;
if (*sign)
value = -value;
if (ndigit < 0)
{
/* Rounding to the left of the decimal point. */
while (ndigit < 0)
{
FLOAT_TYPE new_value = value * 0.1;
if (new_value < 1.0)
{
ndigit = 0;
break;
}
value = new_value;
++left;
++ndigit;
}
}
}
else
/* Value is Inf or NaN. */
*sign = 0;
n = __snprintf (buf, len, "%.*" FLOAT_FMT_FLAG "f", MIN (ndigit, NDIGIT_MAX),
value);
/* Check for a too small buffer. */
if (n >= (ssize_t) len)
return -1;
i = 0;
while (i < n && isdigit (buf[i]))
++i;
*decpt = i;
if (i == 0)
/* Value is Inf or NaN. */
return 0;
if (i < n)
{
do
++i;
while (i < n && !isdigit (buf[i]));
if (*decpt == 1 && buf[0] == '0' && value != 0.0)
{
/* We must not have leading zeroes. Strip them all out and
adjust *DECPT if necessary. */
--*decpt;
while (i < n && buf[i] == '0')
{
--*decpt;
++i;
}
}
memmove (&buf[MAX (*decpt, 0)], &buf[i], n - i);
buf[n - (i - MAX (*decpt, 0))] = '\0';
}
if (left)
{
*decpt += left;
if ((ssize_t) --len > n)
{
while (left-- > 0 && n < (ssize_t) len)
buf[n++] = '0';
buf[n] = '\0';
}
}
return 0;
}
libc_hidden_def (APPEND (FUNC_PREFIX, fcvt_r))
int
APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, buf, len)
FLOAT_TYPE value;
int ndigit, *decpt, *sign;
char *buf;
size_t len;
{
int exponent = 0;
if (isfinite (value) && value != 0.0)
{
/* Slow code that doesn't require -lm functions. */
FLOAT_TYPE d;
FLOAT_TYPE f = 1.0;
if (value < 0.0)
d = -value;
else
d = value;
if (d < 1.0)
{
do
{
f *= 10.0;
--exponent;
}
while (d * f < 1.0);
value *= f;
}
else if (d >= 10.0)
{
do
{
f *= 10;
++exponent;
}
while (d >= f * 10.0);
value /= f;
}
}
else if (value == 0.0)
/* SUSv2 leaves it unspecified whether *DECPT is 0 or 1 for 0.0.
This could be changed to -1 if we want to return 0. */
exponent = 0;
if (ndigit <= 0 && len > 0)
{
buf[0] = '\0';
*decpt = 1;
*sign = isfinite (value) ? signbit (value) != 0 : 0;
}
else
if (APPEND (FUNC_PREFIX, fcvt_r) (value, MIN (ndigit, NDIGIT_MAX) - 1,
decpt, sign, buf, len))
return -1;
*decpt += exponent;
return 0;
}
libc_hidden_def (APPEND (FUNC_PREFIX, ecvt_r))