Copied [efg]cvt() and *cvt_r() from glibc 2.3.2, this gets cdrecord running.
Btw, why do we have _G_config.h in 2 places ? git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24192 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
parent
520b37b8e0
commit
84b29b5f5f
|
|
@ -4,7 +4,7 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc include arch
|
|||
$(TARGET_ARCH) ;
|
||||
SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc include arch generic ;
|
||||
SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc include ;
|
||||
#SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc libio ;
|
||||
SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc libio ;
|
||||
#SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc wcsmbs ;
|
||||
SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc misc ;
|
||||
SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc locale ;
|
||||
|
|
@ -14,4 +14,6 @@ SubDirCcFlags -D_GNU_SOURCE -DUSE_IN_LIBIO ;
|
|||
|
||||
MergeObject posix_gnu_misc.o :
|
||||
tsearch.c
|
||||
efgcvt.c
|
||||
efgcvt_r.c
|
||||
;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,104 @@
|
|||
/* Compatibility functions for floating point formatting.
|
||||
Copyright (C) 1995, 1996, 1997, 1999, 2002 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 <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/param.h>
|
||||
#include <float.h>
|
||||
#include <bits/libc-lock.h>
|
||||
|
||||
#ifndef FLOAT_TYPE
|
||||
# define FLOAT_TYPE double
|
||||
# define FUNC_PREFIX
|
||||
# define FLOAT_FMT_FLAG
|
||||
/* Actually we have to write (DBL_DIG + log10 (DBL_MAX_10_EXP)) but we
|
||||
don't have log10 available in the preprocessor. */
|
||||
# define MAXDIG (NDIGIT_MAX + 3)
|
||||
# define FCVT_MAXDIG (DBL_MAX_10_EXP + MAXDIG)
|
||||
# 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 FCVT_BUFFER APPEND (FUNC_PREFIX, fcvt_buffer)
|
||||
#define FCVT_BUFPTR APPEND (FUNC_PREFIX, fcvt_bufptr)
|
||||
#define ECVT_BUFFER APPEND (FUNC_PREFIX, ecvt_buffer)
|
||||
|
||||
|
||||
static char FCVT_BUFFER[MAXDIG];
|
||||
static char ECVT_BUFFER[MAXDIG];
|
||||
libc_freeres_ptr (static char *FCVT_BUFPTR);
|
||||
|
||||
char *
|
||||
APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign)
|
||||
FLOAT_TYPE value;
|
||||
int ndigit, *decpt, *sign;
|
||||
{
|
||||
if (FCVT_BUFPTR == NULL)
|
||||
{
|
||||
if (APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign,
|
||||
FCVT_BUFFER, MAXDIG) != -1)
|
||||
return FCVT_BUFFER;
|
||||
|
||||
FCVT_BUFPTR = (char *) malloc (FCVT_MAXDIG);
|
||||
if (FCVT_BUFPTR == NULL)
|
||||
return FCVT_BUFFER;
|
||||
}
|
||||
|
||||
(void) APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign,
|
||||
FCVT_BUFPTR, FCVT_MAXDIG);
|
||||
|
||||
return FCVT_BUFPTR;
|
||||
}
|
||||
|
||||
|
||||
char *
|
||||
APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign)
|
||||
FLOAT_TYPE value;
|
||||
int ndigit, *decpt, *sign;
|
||||
{
|
||||
(void) APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign,
|
||||
ECVT_BUFFER, MAXDIG);
|
||||
|
||||
return ECVT_BUFFER;
|
||||
}
|
||||
|
||||
char *
|
||||
APPEND (FUNC_PREFIX, gcvt) (value, ndigit, buf)
|
||||
FLOAT_TYPE value;
|
||||
int ndigit;
|
||||
char *buf;
|
||||
{
|
||||
sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", MIN (ndigit, NDIGIT_MAX), value);
|
||||
return buf;
|
||||
}
|
||||
|
|
@ -0,0 +1,216 @@
|
|||
/* 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))
|
||||
|
|
@ -12,7 +12,6 @@ MergeObject posix_stdlib.o :
|
|||
div.c
|
||||
env.c
|
||||
exit.c
|
||||
gcvt.c
|
||||
heapsort.c
|
||||
merge.c
|
||||
mktemp.c
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
/*
|
||||
* Copyright 2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
||||
char *
|
||||
gcvt(double value, int digits, char *buffer)
|
||||
{
|
||||
sprintf(buffer, "%.*g", digits, value);
|
||||
return buffer;
|
||||
}
|
||||
|
||||
|
||||
// TODO: eventually add ecvt(), and fcvt() as well, if needed.
|
||||
Loading…
Reference in New Issue