diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/Makefile | 2 | ||||
| -rw-r--r-- | stdlib/stdlib.h | 155 | ||||
| -rw-r--r-- | stdlib/strtod.c | 52 | ||||
| -rw-r--r-- | stdlib/strtof.c | 2 | ||||
| -rw-r--r-- | stdlib/strtol.c | 16 | ||||
| -rw-r--r-- | stdlib/strtold.c | 2 | ||||
| -rw-r--r-- | stdlib/strtoll.c (renamed from stdlib/strtoq.c) | 2 | ||||
| -rw-r--r-- | stdlib/strtoull.c (renamed from stdlib/strtouq.c) | 2 | ||||
| -rw-r--r-- | stdlib/tst-strtol.c | 4 |
9 files changed, 156 insertions, 81 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile index b2641e4ba8..af80c0b3d8 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -38,7 +38,7 @@ routines := \ drand48_r erand48_r lrand48_r nrand48_r mrand48_r jrand48_r \ srand48_r seed48_r lcong48_r \ drand48-iter \ - strtol strtoul strtoq strtouq \ + strtol strtoul strtoll strtoull \ strtof strtod strtold \ system canonicalize \ a64l l64a \ diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 758241ee43..aaabbc8edc 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -79,108 +79,129 @@ extern int atoi __P ((__const char *__nptr)); /* Convert a string to a long integer. */ extern long int atol __P ((__const char *__nptr)); -#if defined (__GNUC__) && defined (__USE_MISC) +#if defined __USE_ISOC9X || (defined __GNUC__ && defined __USE_MISC) /* These functions will part of the standard C library in ISO C 9X. */ extern long long int atoll __P ((__const char *__nptr)); #endif /* Convert a string to a floating-point number. */ -extern double strtod __P ((__const char *__nptr, char **__endptr)); +extern double strtod __P ((__const char *__restrict __nptr, + char **__restrict __endptr)); #ifdef __USE_GNU /* Likewise for `float' and `long double' sizes of floating-point numbers. */ -extern float strtof __P ((__const char *__nptr, char **__endptr)); -extern __long_double_t strtold __P ((__const char *__nptr, char **__endptr)); +extern float strtof __P ((__const char *__restrict __nptr, + char **__restrict __endptr)); + +extern __long_double_t strtold __P ((__const char *__restrict __nptr, + char **__restrict __endptr)); #endif /* Convert a string to a long integer. */ -extern long int strtol __P ((__const char *__nptr, char **__endptr, - int __base)); +extern long int strtol __P ((__const char *__restrict __nptr, + char **__restrict __endptr, int __base)); /* Convert a string to an unsigned long integer. */ -extern unsigned long int strtoul __P ((__const char *__nptr, - char **__endptr, int __base)); +extern unsigned long int strtoul __P ((__const char *__restrict __nptr, + char **__restrict __endptr, + int __base)); -#if defined (__GNUC__) && defined (__USE_BSD) +#if defined __GNUC__ && defined __USE_BSD /* Convert a string to a quadword integer. */ -extern long long int strtoq __P ((__const char *__nptr, char **__endptr, - int __base)); +extern long long int strtoq __P ((__const char *__restrict __nptr, + char **__restrict __endptr, int __base)); /* Convert a string to an unsigned quadword integer. */ -extern unsigned long long int strtouq __P ((__const char *__nptr, - char **__endptr, int __base)); +extern unsigned long long int strtouq __P ((__const char *__restrict __nptr, + char **__restrict __endptr, + int __base)); #endif /* GCC and use BSD. */ -#if defined (__GNUC__) && defined (__USE_MISC) +#if defined __USE_ISOC9X || (defined __GNUC__ && defined __USE_MISC) /* These functions will part of the standard C library in ISO C 9X. */ /* Convert a string to a quadword integer. */ -extern long long int strtoll __P ((__const char *__nptr, char **__endptr, - int __base)); +extern long long int strtoll __P ((__const char *__restrict __nptr, + char **__restrict __endptr, int __base)); /* Convert a string to an unsigned quadword integer. */ -extern unsigned long long int strtoull __P ((__const char *__nptr, - char **__endptr, int __base)); -#endif /* GCC and use MISC. */ +extern unsigned long long int strtoull __P ((__const char *__restrict __nptr, + char **__restrict __endptr, + int __base)); +#endif /* ISO C 9X or GCC and use MISC. */ /* The internal entry points for `strtoX' take an extra flag argument saying whether or not to parse locale-dependent number grouping. */ -extern double __strtod_internal __P ((__const char *__nptr, - char **__endptr, int __group)); -extern float __strtof_internal __P ((__const char *__nptr, char **__endptr, - int __group)); -extern __long_double_t __strtold_internal __P ((__const char *__nptr, - char **__endptr, int __group)); -extern long int __strtol_internal __P ((__const char *__nptr, char **__endptr, +extern double __strtod_internal __P ((__const char *__restrict __nptr, + char **__restrict __endptr, + int __group)); +extern float __strtof_internal __P ((__const char *__restrict __nptr, + char **__restrict __endptr, int __group)); +extern __long_double_t __strtold_internal __P ((__const char * + __restrict __nptr, + char **__restrict __endptr, + int __group)); +extern long int __strtol_internal __P ((__const char *__restrict __nptr, + char **__restrict __endptr, int __base, int __group)); -extern unsigned long int __strtoul_internal __P ((__const char *__nptr, - char **__endptr, int __base, - int __group)); +extern unsigned long int __strtoul_internal __P ((__const char * + __restrict __nptr, + char **__restrict __endptr, + int __base, int __group)); #ifdef __GNUC__ -extern long long int __strtoq_internal __P ((__const char *__nptr, - char **__endptr, int __base, - int __group)); -extern unsigned long long int __strtouq_internal __P ((__const char *__nptr, - char **__endptr, - int __base, - int __group)); +extern long long int __strtoll_internal __P ((__const char *__restrict __nptr, + char **__restrict __endptr, + int __base, int __group)); +extern unsigned long long int __strtoull_internal __P ((__const char * + __restrict __nptr, + char ** + __restrict __endptr, + int __base, + int __group)); #endif /* GCC */ #if defined (__OPTIMIZE__) && __GNUC__ >= 2 /* Define inline functions which call the internal entry points. */ -extern __inline double strtod (__const char *__nptr, char **__endptr) +extern __inline double strtod (__const char *__restrict __nptr, + char **__restrict __endptr) { return __strtod_internal (__nptr, __endptr, 0); } -extern __inline long int strtol (__const char *__nptr, - char **__endptr, int __base) +extern __inline long int strtol (__const char *__restrict __nptr, + char **__restrict __endptr, int __base) { return __strtol_internal (__nptr, __endptr, __base, 0); } -extern __inline unsigned long int strtoul (__const char *__nptr, - char **__endptr, int __base) +extern __inline unsigned long int strtoul (__const char *__restrict __nptr, + char **__restrict __endptr, + int __base) { return __strtoul_internal (__nptr, __endptr, __base, 0); } #ifdef __USE_GNU -extern __inline float strtof (__const char *__nptr, char **__endptr) +extern __inline float strtof (__const char *__restrict __nptr, + char **__restrict __endptr) { return __strtof_internal (__nptr, __endptr, 0); } -extern __inline __long_double_t strtold (__const char *__nptr, char **__endptr) +extern __inline __long_double_t strtold (__const char *__restrict __nptr, + char **__restrict __endptr) { return __strtold_internal (__nptr, __endptr, 0); } #endif #ifdef __USE_BSD -extern __inline long long int strtoq (__const char *__nptr, char **__endptr, - int __base) -{ return __strtoq_internal (__nptr, __endptr, __base, 0); } -extern __inline unsigned long long int strtouq (__const char *__nptr, - char **__endptr, int __base) -{ return __strtouq_internal (__nptr, __endptr, __base, 0); } +extern __inline long long int strtoq (__const char *__restrict __nptr, + char **__restrict __endptr, int __base) +{ return __strtoll_internal (__nptr, __endptr, __base, 0); } +extern __inline unsigned long long int strtouq (__const char *__restrict __nptr, + char **__restrict __endptr, + int __base) +{ return __strtoull_internal (__nptr, __endptr, __base, 0); } #endif -#ifdef __USE_MISC -extern __inline long long int strtoll (__const char *__nptr, char **__endptr, - int __base) -{ return __strtoq_internal (__nptr, __endptr, __base, 0); } -extern __inline unsigned long long int strtoull (__const char *__nptr, - char **__endptr, int __base) -{ return __strtouq_internal (__nptr, __endptr, __base, 0); } +#if defined __USE_MISC || defined __USE_ISOC9X +extern __inline long long int strtoll (__const char *__restrict __nptr, + char **__restrict __endptr, int __base) +{ return __strtoll_internal (__nptr, __endptr, __base, 0); } +extern __inline unsigned long long int strtoull (__const char * + __restrict __nptr, + char **__restrict __endptr, + int __base) +{ return __strtoull_internal (__nptr, __endptr, __base, 0); } #endif extern __inline double atof (__const char *__nptr) @@ -483,8 +504,9 @@ extern void qsort __P ((__ptr_t __base, size_t __nmemb, size_t __size, /* Return the absolute value of X. */ extern int abs __P ((int __x)) __attribute__ ((__const__)); extern long int labs __P ((long int __x)) __attribute__ ((__const__)); -#ifdef __USE_GNU -extern long long int llabs __P ((long long int __x)) __attribute__ ((__const__)); +#if defined __USE_ISOC9X +extern long long int llabs __P ((long long int __x)) + __attribute__ ((__const__)); #endif @@ -492,9 +514,11 @@ extern long long int llabs __P ((long long int __x)) __attribute__ ((__const__)) of the value of NUMER over DENOM. */ /* GCC may have built-ins for these someday. */ extern div_t div __P ((int __numer, int __denom)) __attribute__ ((__const__)); -extern ldiv_t ldiv __P ((long int __numer, long int __denom)) __attribute__ ((__const__)); -#ifdef __USE_GNU -extern lldiv_t lldiv __P ((long long int __numer, long long int __denom)) __attribute__ ((__const__)); +extern ldiv_t ldiv __P ((long int __numer, long int __denom)) + __attribute__ ((__const__)); +#ifdef __USE_ISOC9X +extern lldiv_t lldiv __P ((long long int __numer, long long int __denom)) + __attribute__ ((__const__)); #endif @@ -548,7 +572,8 @@ extern int qfcvt_r __P ((__long_double_t __value, int __ndigit, int *__decpt, extern int mblen __P ((__const char *__s, size_t __n)); /* Return the length of the given multibyte character, putting its `wchar_t' representation in *PWC. */ -extern int mbtowc __P ((wchar_t *__pwc, __const char *__s, size_t __n)); +extern int mbtowc __P ((wchar_t *__restrict __pwc, + __const char *__restrict __s, size_t __n)); /* Put the multibyte character represented by WCHAR in S, returning its length. */ extern int wctomb __P ((char *__s, wchar_t __wchar)); @@ -560,9 +585,11 @@ extern __inline int mblen (__const char *__s, size_t __n) /* Convert a multibyte string to a wide char string. */ -extern size_t mbstowcs __P ((wchar_t *__pwcs, __const char *__s, size_t __n)); +extern size_t mbstowcs __P ((wchar_t *__restrict __pwcs, + __const char *__restrict __s, size_t __n)); /* Convert a wide char string to multibyte string. */ -extern size_t wcstombs __P ((char *__s, __const wchar_t *__pwcs, size_t __n)); +extern size_t wcstombs __P ((char *__restrict __s, + __const wchar_t *__restrict __pwcs, size_t __n)); #ifdef __USE_SVID diff --git a/stdlib/strtod.c b/stdlib/strtod.c index e5951f01a4..ed24c08f2b 100644 --- a/stdlib/strtod.c +++ b/stdlib/strtod.c @@ -41,18 +41,21 @@ # define L_(Ch) L##Ch # define ISSPACE(Ch) iswspace (Ch) # define TOLOWER(Ch) towlower (Ch) +# define STRNCASECMP(S1, S2, N) __wcsncasecmp ((S1), (S2), (N)) #else # define STRING_TYPE char # define CHAR_TYPE char # define L_(Ch) Ch # define ISSPACE(Ch) isspace (Ch) # define TOLOWER(Ch) tolower (Ch) +# define STRNCASECMP(S1, S2, N) __strncasecmp ((S1), (S2), (N)) #endif /* End of configuration part. */ #include <ctype.h> #include <errno.h> #include <float.h> +#include <ieee754.h> #include "../locale/localeinfo.h" #include <math.h> #include <stdlib.h> @@ -433,7 +436,54 @@ INTERNAL (STRTOF) (nptr, endptr, group) No character is used even if a sign was found. */ if ((c < L_('0') || c > L_('9')) && ((wint_t) c != decimal || cp[1] < L_('0') || cp[1] > L_('9'))) - RETURN (0.0, nptr); + { + int matched = 0; + /* Check for `INF' or `INFINITY'. */ + if (TOLOWER (c) == L_('i') && ((STRNCASECMP (cp, L_("nf"), 2) == 0 + && (matched = 2)) + || (STRNCASECMP (cp, L_("nfinity"), 7) + == 0 + && (matched = 7)))) + { + /* Return +/- inifity. */ + if (endptr != NULL) + *endptr = (STRING_TYPE *) (cp + matched); + + return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL; + } + + if (TOLOWER (c) == L_('n') && STRNCASECMP (cp, L_("an"), 2) == 0) + { + /* Return NaN. */ + if (endptr != NULL) + { + cp += 2; + + /* Match `(n-char-sequence-digit)'. */ + if (*cp == L_('(')) + { + const STRING_TYPE *startp = cp; + do + ++cp; + while ((*cp >= '0' && *cp <= '9') + || (TOLOWER (*cp) >= 'a' && TOLOWER (*cp) <= 'z') + || *cp == L_('_')); + + if (*cp != L_(')')) + /* The closing brace is missing. Only match the NAN + part. */ + cp = startp; + } + + *endptr = (STRING_TYPE *) cp; + } + + return NAN; + } + + /* It is really a text we do not recognize. */ + RETURN (0.0, nptr); + } /* Record the start of the digits, in case we will check their grouping. */ start_of_digits = startp = cp; diff --git a/stdlib/strtof.c b/stdlib/strtof.c index 1d1c41f46a..8692a3ac8f 100644 --- a/stdlib/strtof.c +++ b/stdlib/strtof.c @@ -5,6 +5,6 @@ #define FLT FLT #define STRTOF strtof #define MPN2FLOAT __mpn_construct_float -#define FLOAT_HUGE_VAL HUGE_VALf +#define FLOAT_HUGE_VAL HUGE_VALF #include "strtod.c" diff --git a/stdlib/strtol.c b/stdlib/strtol.c index 396e2ecd74..6ec096daf6 100644 --- a/stdlib/strtol.c +++ b/stdlib/strtol.c @@ -1,4 +1,4 @@ -/* strtol - Convert string representation of a number into an integer value. +/* Convert string representation of a number into an integer value. Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -54,7 +54,7 @@ extern int errno; # include "../locale/localeinfo.h" #endif -/* Nonzero if we are defining `strtoul' or `strtouq', operating on +/* Nonzero if we are defining `strtoul' or `strtoull', operating on unsigned integers. */ #ifndef UNSIGNED # define UNSIGNED 0 @@ -67,13 +67,13 @@ extern int errno; #if UNSIGNED # ifdef USE_WIDE_CHAR # ifdef QUAD -# define strtol wcstouq +# define strtol wcstoull # else # define strtol wcstoul # endif # else # ifdef QUAD -# define strtol strtouq +# define strtol strtoull # else # define strtol strtoul # endif @@ -81,18 +81,18 @@ extern int errno; #else # ifdef USE_WIDE_CHAR # ifdef QUAD -# define strtol wcstoq +# define strtol wcstoll # else # define strtol wcstol # endif # else # ifdef QUAD -# define strtol strtoq +# define strtol strtoll # endif # endif #endif -/* If QUAD is defined, we are defining `strtoq' or `strtouq', +/* If QUAD is defined, we are defining `strtoll' or `strtoull', operating on `long long int's. */ #ifdef QUAD # define LONG long long @@ -312,8 +312,6 @@ INTERNAL (strtol) (nptr, endptr, base, group) ? -((unsigned LONG int) (LONG_MIN + 1)) + 1 : (unsigned LONG int) LONG_MAX)) overflow = 1; -#else - overflow |= negative; #endif if (overflow) diff --git a/stdlib/strtold.c b/stdlib/strtold.c index ec2b49b279..9d80543377 100644 --- a/stdlib/strtold.c +++ b/stdlib/strtold.c @@ -5,6 +5,6 @@ #define FLT LDBL #define STRTOF strtold #define MPN2FLOAT __mpn_construct_long_double -#define FLOAT_HUGE_VAL HUGE_VALl +#define FLOAT_HUGE_VAL HUGE_VALL #include "strtod.c" diff --git a/stdlib/strtoq.c b/stdlib/strtoll.c index 259611c3a2..e9487addc7 100644 --- a/stdlib/strtoq.c +++ b/stdlib/strtoll.c @@ -21,4 +21,4 @@ #include <strtol.c> -weak_alias (strtoq, strtoll) +weak_alias (strtoll, strtoq) diff --git a/stdlib/strtouq.c b/stdlib/strtoull.c index 68f293610a..419d28964f 100644 --- a/stdlib/strtouq.c +++ b/stdlib/strtoull.c @@ -21,4 +21,4 @@ #include <strtoul.c> -weak_alias (strtouq, strtoull) +weak_alias (strtoull, strtouq) diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c index 1d398b4558..e351e97ceb 100644 --- a/stdlib/tst-strtol.c +++ b/stdlib/tst-strtol.c @@ -38,7 +38,7 @@ static const struct ltest tests[] = { "0xffffffffg", 0xffffffff, 0, 'g', 0 }, { "0xf1f2f3f4f5", 0xffffffff, 0, 0, ERANGE }, { "-0x123456789", 0xffffffff, 0, 0, ERANGE }, - { "-0xfedcba98", 0xffffffff, 0, 0, ERANGE }, + { "-0xfedcba98", 0x01234568, 0, 0, 0 }, { NULL, 0, 0, 0, 0 }, #else /* assume 64 bit long... */ @@ -66,7 +66,7 @@ static const struct ltest tests[] = { "0xffffffffffffffffg", 0xffffffffffffffff, 0, 'g', 0 }, { "0xf1f2f3f4f5f6f7f8f9", 0xffffffffffffffff, 0, 0, ERANGE }, { "-0x123456789abcdef01", 0xffffffffffffffff, 0, 0, ERANGE }, - { "-0xfedcba987654321", 0xffffffffffffffff, 0, 0, ERANGE }, + { "-0xfedcba987654321", 0x0123456789abcdf, 0, 0, 0 }, { NULL, 0, 0, 0, 0 }, #endif }; |