diff options
author | Roland McGrath <roland@gnu.org> | 1995-03-16 05:32:45 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1995-03-16 05:32:45 +0000 |
commit | f0bf9cb92c28c9ec0ac3376d87055e9d14610082 (patch) | |
tree | c058250695dd90b4eb5b870620826727d559f925 /stdlib/strtol.c | |
parent | 67a3a8ac7fef11753205c69da9df9c4ef30f6076 (diff) | |
download | glibc-f0bf9cb92c28c9ec0ac3376d87055e9d14610082.tar.gz |
Thu Mar 16 00:04:41 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/C-ctype.c: New correct data generated by drepper.
* Rules: Don't use $(libc.a).
Parsing of grouped numbers contributed by Ulrich Drepper.
* stdlib/strtol.c (__strtol_internal): Renamed from strtol. Take
new flag arg; if nonzero, parse locale-dependent thousands
grouping and interpret only the prefix that is correctly grouped.
(strtol): Define this to call _strtol_internal with zero for the flag.
Use a weak symbol for the definition.
* stdlib/strtod.c (strtod, __strtod_internal): Likewise.
Check for the exponent of the number overflowing the float format.
* stdlib/stdlib.h (__strtof, __strtold): Declarations removed.
(__strto{f,d,ld,l,ul,q,uq}_internal): Declare these functions.
[__OPTIMIZE__]: Define inline functions calling those.
* stdlib/grouping.h: New file, written by drepper.
* stdlib/Makefile (distribute): Add grouping.h.
* stdio/vfscanf.c: Grok %' modifier to numeric conversions. Call
__strtoX_internal with the grouping flag set iff the modifier is
present.
Wed Mar 15 00:40:54 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/generic/memchr.c: Fix typos: limit.h -> limits.h.
* mach/Machrules: Produce static deps for all object flavors.
[interface-library]: Remove all these variables and rules.
($(interface-library)-routines): Define this variable.
(extra-libs): Append $(interface-library) to this.
* mach/Makefile (interface-library): Omit .a suffix.
* hurd/Makefile: Likewise.
Tue Mar 14 23:40:31 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* stdio/internals.c (flushbuf): If !FLUSH_ONLY, don't skip out
early if no new data in buffer after priming.
* Makerules (object-suffixes, libtypes): Move all these variables
to Makeconfig.
* Makeconfig (object-suffixes, libtypes): Moved here from Makerules.
* Makerules (build-extra-lib): New canned sequence.
* sysdeps/mach/hurd/euidaccess.c: Include fcntl.h. Declare ERR;
fix uses of FILE and PORT. Remove bogus weak alias for `access'.
* sysdeps/mach/hurd/dirfd.c: Include hurd/fd.h and errno.h.
Add missing semicolon.
* sysdeps/mach/hurd/opendir.c: Include hurd/fd.h. Use a `struct
hurd_fd *' temp var, since DIRP->__fd is a `void *'.
* sysdeps/mach/hurd/readdir.c: Include hurd/fd.h.
* stdlib/wcstombs.c: #if 0 out code for non-ASCII chars until the
locale data format is implemented.
* sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler):
Pass &__sigreturn on the stack to the trampoline code, so it is
not position-dependent.
* stdio/printf_fp.c (NDEBUG): Define this to disable assert.
Don't include <stdarg.h>.
(__printf_fp): Last arg ARGS is now `const void **const';
dereference ARGS[0] instead of using va_arg.
* locale/setlocale.c: In LC_ALL case, initialize CATEGORY before
loop to install data.
* locale/loadlocale.c (_nl_category_num_items): Use _NL_ITEM_INDEX
to extract number from item code.
(_nl_load_locale): Close the descriptor when finished.
* malloc/realloc.c (_realloc_internal): Call _malloc_internal in
place of malloc.
* time/tzfile.c (__tzfile_default): Initialize RULE_STDOFF to zero.
Diffstat (limited to 'stdlib/strtol.c')
-rw-r--r-- | stdlib/strtol.c | 87 |
1 files changed, 76 insertions, 11 deletions
diff --git a/stdlib/strtol.c b/stdlib/strtol.c index 888a94e4d7..1c63afb6fe 100644 --- a/stdlib/strtol.c +++ b/stdlib/strtol.c @@ -22,11 +22,17 @@ Cambridge, MA 02139, USA. */ #include <stddef.h> #include <stdlib.h> #include <errno.h> +#include "../locale/localeinfo.h" -/* Nonzero if we are defining `strtoul' or `strtouq', operating on unsigned - integers. */ -#ifndef UNSIGNED + +/* 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 /* If QUAD is defined, we are defining `strtoq' or `strtouq', @@ -54,22 +60,27 @@ static const unsigned long long int maxquad = ULONG_LONG_MAX; #define LONG long #endif + +#define INTERNAL(x) INTERNAL1(x) +#define INTERNAL1(x) __##x##_internal + +/* This file defines a function to check for correct grouping. */ +#include "grouping.h" + + /* 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; @@ -77,9 +88,34 @@ strtol (nptr, endptr, base) register unsigned LONG int i; register const char *s; register unsigned char c; - const char *save; + const char *save, *end; int overflow; + /* The thousands character of the current locale. */ + wchar_t thousands; + /* The numeric grouping specification of the current locale, + in the format described in <locale.h>. */ + 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; + + if (base < 0 || base == 1 || base > 36) base = 10; @@ -126,6 +162,20 @@ strtol (nptr, endptr, base) /* Save the pointer so we can check later if anything happened. */ save = s; + 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); + } + cutoff = ULONG_MAX / (unsigned LONG int) base; cutlim = ULONG_MAX % (unsigned LONG int) base; @@ -133,6 +183,8 @@ strtol (nptr, endptr, base) i = 0; for (c = *s; c != '\0'; c = *++s) { + if (group && s == end) + break; if (isdigit (c)) c -= '0'; else if (isalpha (c)) @@ -187,3 +239,16 @@ noconv: *endptr = (char *) nptr; return 0L; } + +/* External user entry point. */ + +weak_symbol (strtol) + +INT +strtol (nptr, endptr, base) + const char *nptr; + char **endptr; + int base; +{ + return INTERNAL (strtol) (nptr, endptr, base, 0); +} |