* libc/stdlib/strtod.c (_strtod_r): Add NaN support.
* (strtof): Ditto.
* libc/stdio/vfscanf.c (__svfscanf_r): Ditto.
* Makefile.am (MATHOBJS_IN_LIBC): Add s_nan and sf_nan
functions for use by strtod and strtof.
* Makefile.in: Regenerated.
+2005-01-06 Jeff Johnston <jjohnstn@redhat.com>
+
+ * libc/stdlib/strtod.c (_strtod_r): Add NaN support.
+ * (strtof): Ditto.
+ * libc/stdio/vfscanf.c (__svfscanf_r): Ditto.
+ * Makefile.am (MATHOBJS_IN_LIBC): Add s_nan and sf_nan
+ functions for use by strtod and strtof.
+ * Makefile.in: Regenerated.
+
2005-01-06 Hans-Peter Nilsson <hp@axis.com>
* libc/stdio/ftell.c (ftell_r): Add parenthesis for __SWR
MATHOBJS_IN_LIBC = \
s_isinf.$(oext) sf_isinf.$(oext) \
s_isnan.$(oext) sf_isnan.$(oext) \
+ s_nan.$(oext) sf_nan.$(oext) \
s_ldexp.$(oext) sf_ldexp.$(oext) \
s_frexp.$(oext) sf_frexp.$(oext) \
s_modf.$(oext) \
# The functions ldexp, frexp and modf are traditionally supplied in
# both libc.a and libm.a. We build them in libm.a and copy them over,
# along with some required supporting routines.
-MATHOBJS_IN_LIBC = s_isinf.$(oext) sf_isinf.$(oext) s_isnan.$(oext) sf_isnan.$(oext) s_ldexp.$(oext) sf_ldexp.$(oext) s_frexp.$(oext) sf_frexp.$(oext) s_modf.$(oext) sf_modf.$(oext) s_scalbn.$(oext) sf_scalbn.$(oext) s_finite.$(oext) sf_finite.$(oext) s_copysign.$(oext) sf_copysign.$(oext) s_infconst.$(oext)
+MATHOBJS_IN_LIBC = s_isinf.$(oext) sf_isinf.$(oext) s_isnan.$(oext) sf_isnan.$(oext) s_nan.$(oext) sf_nan.$(oext) s_ldexp.$(oext) sf_ldexp.$(oext) s_frexp.$(oext) sf_frexp.$(oext) s_modf.$(oext) sf_modf.$(oext) s_scalbn.$(oext) sf_scalbn.$(oext) s_finite.$(oext) sf_finite.$(oext) s_copysign.$(oext) sf_copysign.$(oext) s_infconst.$(oext)
LIBC_OBJECTLISTS = $(POSIX_OBJECTLIST) $(SIGNAL_OBJECTLIST) $(SYSCALL_OBJECTLIST) $(UNIX_OBJECTLIST) $(STDIO64_OBJECTLIST) libc/argz/objectlist.awk.in libc/stdlib/objectlist.awk.in libc/time/objectlist.awk.in libc/ctype/objectlist.awk.in libc/search/objectlist.awk.in libc/string/objectlist.awk.in libc/locale/objectlist.awk.in libc/misc/objectlist.awk.in libc/reent/objectlist.awk.in libc/errno/objectlist.awk.in libc/stdio/objectlist.awk.in $(MACHINE_OBJECTLIST) $(SYS_OBJECTLIST) $(SYS_MACH_OBJECTLIST)
#endif
#ifdef FLOATING_POINT
+#include <math.h>
#include <float.h>
/* Currently a test is made to see if long double processing is warranted.
long zeroes, exp_adjust;
char *exp_start = NULL;
unsigned width_left = 0;
+ int nancount = 0;
#ifdef hardway
if (width == 0 || width > sizeof (buf) - 1)
#else
*/
switch (c)
{
-
case '0':
if (flags & NDIGITS)
{
case '7':
case '8':
case '9':
- flags &= ~(SIGNOK | NDIGITS);
- goto fok;
+ if (nancount == 0)
+ {
+ flags &= ~(SIGNOK | NDIGITS);
+ goto fok;
+ }
+ break;
case '+':
case '-':
goto fok;
}
break;
+ case 'n':
+ case 'N':
+ if (nancount == 0
+ && (flags & (SIGNOK | NDIGITS | DPTOK | EXPOK)))
+ {
+ flags &= ~(SIGNOK | DPTOK | EXPOK | NDIGITS);
+ nancount = 1;
+ goto fok;
+ }
+ else if (nancount == 2)
+ {
+ nancount = 3;
+ goto fok;
+ }
+ break;
+ case 'a':
+ case 'A':
+ if (nancount == 1)
+ {
+ nancount = 2;
+ goto fok;
+ }
+ break;
case '.':
if (flags & DPTOK)
{
else
{
flp = va_arg (ap, float *);
- *flp = res;
+ if (isnan (res))
+ *flp = nanf (NULL);
+ else
+ *flp = res;
}
nassigned++;
}
unsigned long z;
__ULong y;
union double_union rv, rv0;
+ int nanflag;
_Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
- sign = nz0 = nz = 0;
+ sign = nz0 = nz = nanflag = 0;
rv.d = 0.;
for (s = s00;; s++)
switch (*s)
goto break2;
}
break2:
- if (*s == '0')
+ if (*s == 'n' || *s == 'N')
+ {
+ ++s;
+ if (*s == 'a' || *s == 'A')
+ {
+ ++s;
+ if (*s == 'n' || *s == 'N')
+ {
+ nanflag = 1;
+ ++s;
+ goto ret;
+ }
+ }
+ s = s00;
+ goto ret;
+ }
+ else if (*s == '0')
{
nz0 = 1;
while (*++s == '0');
ret:
if (se)
*se = (char *) s;
- return sign ? -rv.d : rv.d;
+
+ if (nanflag)
+ return nan (NULL);
+ return (sign && (s != s00)) ? -rv.d : rv.d;
}
#ifndef NO_REENT
_CONST char *s00 _AND
char **se)
{
- return (float)_strtod_r (_REENT, s00, se);
+ double retval = _strtod_r (_REENT, s00, se);
+ if (isnan (retval))
+ return nanf (NULL);
+ return (float)retval;
}
#endif