diff options
author | Jim Meyering <jim@meyering.net> | 1994-09-27 22:02:00 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1994-09-27 22:02:00 +0000 |
commit | 0a0800fe2507f48a2ae246d148b6f2b056109e04 (patch) | |
tree | fd947e3bd752610de97b43df7b79b0758be6730d /lib/strtod.c | |
parent | e13a0b7f4982846cb8165e5188bd306ce8499445 (diff) | |
download | coreutils-0a0800fe2507f48a2ae246d148b6f2b056109e04.tar.xz |
merge with 1.10n2
Diffstat (limited to 'lib/strtod.c')
-rw-r--r-- | lib/strtod.c | 84 |
1 files changed, 37 insertions, 47 deletions
diff --git a/lib/strtod.c b/lib/strtod.c index 2f6b894cf..34b82232e 100644 --- a/lib/strtod.c +++ b/lib/strtod.c @@ -1,60 +1,46 @@ /* Copyright (C) 1991, 1992 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug-glibc@prep.ai.mit.edu. - This program 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 General Public License for more details. +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +This program 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 General Public License for more details. -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <ansidecl.h> +#include <localeinfo.h> #include <errno.h> -#include <ctype.h> -#include <math.h> - -#ifdef HAVE_FLOAT_H #include <float.h> -#else -#define DBL_MAX 1.7976931348623159e+308 -#define DBL_MIN 2.2250738585072010e-308 -#endif - -#if STDC_HEADERS +#include <ctype.h> #include <stdlib.h> #include <string.h> -#else -#define NULL 0 -extern int errno; -#ifndef HUGE_VAL -#define HUGE_VAL HUGE -#endif -#endif +#include <math.h> + /* Convert NPTR to a double. If ENDPTR is not NULL, a pointer to the character after the last one used in the number is put in *ENDPTR. */ double -strtod (nptr, endptr) - const char *nptr; - char **endptr; +DEFUN(strtod, (nptr, endptr), CONST char *nptr AND char **endptr) { - register const char *s; + register CONST char *s; short int sign; + wchar_t decimal; /* Decimal point character. */ /* The number so far. */ double num; - int got_dot; /* Found a decimal point. */ - int got_digit; /* Seen any digits. */ + int got_dot; /* Found a decimal point. */ + int got_digit; /* Seen any digits. */ /* The exponent of the number. */ long int exponent; @@ -65,10 +51,14 @@ strtod (nptr, endptr) goto noconv; } + /* Figure out the decimal point character. */ + if (mbtowc(&decimal, _numeric_info->decimal_point, 1) <= 0) + decimal = (wchar_t) *_numeric_info->decimal_point; + s = nptr; /* Eat whitespace. */ - while (isspace (*s)) + while (isspace(*s)) ++s; /* Get the sign. */ @@ -104,7 +94,7 @@ strtod (nptr, endptr) if (got_dot) --exponent; } - else if (!got_dot && *s == '.') + else if (!got_dot && (wchar_t) *s == decimal) /* Record that we have found the decimal point. */ got_dot = 1; else @@ -115,7 +105,7 @@ strtod (nptr, endptr) if (!got_digit) goto noconv; - if (tolower (*s) == 'e') + if (tolower(*s) == 'e') { /* Get the exponent specified after the `e' or `E'. */ int save = errno; @@ -124,7 +114,7 @@ strtod (nptr, endptr) errno = 0; ++s; - exp = strtol (s, &end, 10); + exp = strtol(s, &end, 10); if (errno == ERANGE) { /* The exponent overflowed a `long int'. It is probably a safe @@ -157,32 +147,32 @@ strtod (nptr, endptr) if (exponent < 0) { - if (num < DBL_MIN * pow (10.0, (double) -exponent)) + if (num < DBL_MIN * pow(10.0, (double) -exponent)) goto underflow; } else if (exponent > 0) { - if (num > DBL_MAX * pow (10.0, (double) -exponent)) + if (num > DBL_MAX * pow(10.0, (double) -exponent)) goto overflow; } - num *= pow (10.0, (double) exponent); + num *= pow(10.0, (double) exponent); return num * sign; -overflow: + overflow: /* Return an overflow error. */ errno = ERANGE; return HUGE_VAL * sign; -underflow: + underflow: /* Return an underflow error. */ if (endptr != NULL) *endptr = (char *) nptr; errno = ERANGE; return 0.0; -noconv: + noconv: /* There was no number. */ if (endptr != NULL) *endptr = (char *) nptr; |