# HG changeset patch # User Jim Meyering # Date 807129729 0 # Node ID 87277db64453e89a37be4d441acdeba71eb953aa # Parent ccbb39fbb3be72438b2171075114a8c6fe1efb8d New version -- now derived from the line in libc. diff -r ccbb39fbb3be -r 87277db64453 lib/strtol.c --- a/lib/strtol.c Sun Jul 30 05:30:04 1995 +0000 +++ b/lib/strtol.c Sun Jul 30 18:42:09 1995 +0000 @@ -1,9 +1,12 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1994, 1995 Free Software Foundation, Inc. + + 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 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. + 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,10 +15,16 @@ 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. */ + Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifdef HAVE_CONFIG_H -#include +# include +#endif + +#ifdef _LIBC +# define USE_NUMBER_GROUPING +# define STDC_HEADERS +# define HAVE_LIMITS_H #endif #include @@ -25,58 +34,119 @@ #endif #if HAVE_LIMITS_H -#include +# include +#endif + +#ifdef STDC_HEADERS +# include +# include +#else +# ifndef NULL +# define NULL 0 +# endif #endif -#ifndef ULONG_MAX -#define ULONG_MAX ((unsigned long) ~(unsigned long) 0) +#ifdef USE_NUMBER_GROUPING +# include "../locale/localeinfo.h" #endif -#ifndef LONG_MAX -#define LONG_MAX (~(1 << (sizeof (long) * 8 - 1))) +/* Nonzero if we are defining `strtoul' or `strtouq', operating on + unsigned integers. */ +#ifndef UNSIGNED +# define UNSIGNED 0 +# define INT LONG int +#else +# define strtol strtoul +# define INT unsigned LONG int #endif -#ifndef LONG_MIN -#define LONG_MIN (-LONG_MAX - 1) +/* If QUAD is defined, we are defining `strtoq' or `strtouq', + operating on `long long int's. */ +#ifdef QUAD +# if UNSIGNED +# define strtoul strtouq +# else +# define strtol strtoq +# endif +# define LONG long long +# undef LONG_MIN +# define LONG_MIN LONG_LONG_MIN +# undef LONG_MAX +# define LONG_MAX LONG_LONG_MAX +# undef ULONG_MAX +# define ULONG_MAX ULONG_LONG_MAX +# if __GNUC__ == 2 && __GNUC_MINOR__ < 7 + /* Work around gcc bug with using this constant. */ + static const unsigned long long int maxquad = ULONG_LONG_MAX; +# undef ULONG_MAX +# define ULONG_MAX maxquad +# endif +#else +# define LONG long #endif -#if STDC_HEADERS -#include -#include +#ifdef __STDC__ +# define INTERNAL(x) INTERNAL1(x) +# define INTERNAL1(x) __##x##_internal #else -#define NULL 0 +# define INTERNAL(x) __/**/x/**/_internal #endif -#ifndef UNSIGNED -#define UNSIGNED 0 +#ifdef USE_NUMBER_GROUPING +/* This file defines a function to check for correct grouping. */ +# include "grouping.h" #endif + /* Convert NPTR to an `unsigned long int' or `long int' in base BASE. If BASE is 0 the base is determined by the presence of a leading zero, indicating octal or a leading "0x" or "0X", indicating hexadecimal. If BASE is < 2 or > 36, it is reset to 10. If ENDPTR is not NULL, a pointer to the character after the last one converted is stored in *ENDPTR. */ -#if UNSIGNED -unsigned long int -#define strtol strtoul -#else -long int -#endif -strtol (nptr, endptr, base) + +INT +INTERNAL (strtol) (nptr, endptr, base, group) const char *nptr; char **endptr; int base; + int group; { int negative; - register unsigned long int cutoff; + register unsigned LONG int cutoff; register unsigned int cutlim; - register unsigned long int i; + register unsigned LONG int i; register const char *s; register unsigned char c; - const char *save; + const char *save, *end; int overflow; +#ifdef USE_NUMBER_GROUPING + /* The thousands character of the current locale. */ + wchar_t thousands; + /* The numeric grouping specification of the current locale, + in the format described in . */ + const char *grouping; + + if (group) + { + grouping = _NL_CURRENT (LC_NUMERIC, GROUPING); + if (*grouping <= 0 || *grouping == CHAR_MAX) + grouping = NULL; + else + { + /* Figure out the thousands separator character. */ + if (mbtowc (&thousands, _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP), + strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0) + thousands = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP); + if (thousands == L'\0') + grouping = NULL; + } + } + else + grouping = NULL; +#endif + if (base < 0 || base == 1 || base > 36) base = 10; @@ -107,31 +177,49 @@ /* If BASE is zero, figure it out ourselves. */ if (base == 0) - { - if (*s == '0') - { - if (toupper (s[1]) == 'X') - { - s += 2; - base = 16; - } - else - base = 8; - } - else - base = 10; - } + if (*s == '0') + { + if (toupper (s[1]) == 'X') + { + s += 2; + base = 16; + } + else + base = 8; + } + else + base = 10; /* Save the pointer so we can check later if anything happened. */ save = s; - cutoff = ULONG_MAX / (unsigned long int) base; - cutlim = ULONG_MAX % (unsigned long int) base; +#ifdef USE_NUMBER_GROUPING + if (group) + { + /* Find the end of the digit string and check its grouping. */ + end = s; + for (c = *end; c != '\0'; c = *++end) + if (c != thousands && !isdigit (c) && + (!isalpha (c) || toupper (c) - 'A' + 10 >= base)) + break; + if (*s == thousands) + end = s; + else + end = correctly_grouped_prefix (s, end, thousands, grouping); + } + else +#endif + end = NULL; + + cutoff = ULONG_MAX / (unsigned LONG int) base; + cutlim = ULONG_MAX % (unsigned LONG int) base; overflow = 0; i = 0; for (c = *s; c != '\0'; c = *++s) { + if (s == end) + break; if (isdigit (c)) c -= '0'; else if (isalpha (c)) @@ -145,7 +233,7 @@ overflow = 1; else { - i *= (unsigned long int) base; + i *= (unsigned LONG int) base; i += c; } } @@ -159,18 +247,18 @@ if (endptr != NULL) *endptr = (char *) s; -#if !UNSIGNED +#if !UNSIGNED /* Check for a value that is within the range of - `unsigned long int', but outside the range of `long int'. */ + `unsigned LONG int', but outside the range of `LONG int'. */ if (i > (negative ? - -(unsigned long int) LONG_MIN : (unsigned long int) LONG_MAX)) + -(unsigned LONG int) LONG_MIN : (unsigned LONG int) LONG_MAX)) overflow = 1; #endif if (overflow) { errno = ERANGE; -#if UNSIGNED +#if UNSIGNED return ULONG_MAX; #else return negative ? LONG_MIN : LONG_MAX; @@ -180,9 +268,24 @@ /* Return the result of the appropriate sign. */ return (negative ? -i : i); -noconv:; +noconv: /* There was no number to convert. */ if (endptr != NULL) *endptr = (char *) nptr; return 0L; } + +/* External user entry point. */ + +#ifdef weak_symbol +weak_symbol (strtol) +#endif + +INT +strtol (nptr, endptr, base) + const char *nptr; + char **endptr; + int base; +{ + return INTERNAL (strtol) (nptr, endptr, base, 0); +}