mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
0501d60367
1997-05-24 03:51 Ulrich Drepper <drepper@cygnus.com> * stdlib/Makefile (routines): Add strtol_l, strtoul_l, strtoll_l, strtoull_l, strtof_l, strtod_l, and strtold_l. * stdlib/stdlib.h: Add prototypes for new functions. * stdlib/strtod.c: Change for compiling as strtoX_l. * stdlib/strtol.c: Likewise. * stdlib/strtof.c: Likewise. * stdlib/strtold.c: Likewise. * stdlib/strtod_l.c: New file. * stdlib/strtof_l.c: New file. * stdlib/strtold_l.c: New file. * stdlib/strtol_l.c: New file. * stdlib/strtoul_l.c: New file. * stdlib/strtoll_l.c: New file. * stdlib/strtoull_l.c: New file. * string/Makefile (routines): Add strcasecmp_l and strncase_l. * string/string.h: Add prototypes for new functions. * sysdeps/generic/strcasecmp.c: Change for compiling as strcasecmp_l. * sysdeps/generic/strncase.c: Change for compiling as strncasecmp_l. * sysdeps/generic/strcasecmp_l.c: New file. * sysdeps/generic/strncase_l.c: New file. * wcsmbs/Makefile (routines): Add wcstol_l, wcstoul_l, wcstoll_l, wcstoull_l, wcstod_l, wcstold_l, wcstof_l, wcscasecmp_l, and wcsncase_l. * wcsmbs/wchar.h: Add prototypes for new functions. * wcsmbs/wcscasecmp.c: Change for compiling as wcscasecmp_l. * wcsmbs/wcsncase.c: Change for compiling as wcsncasecmp_l. * wcsmbs/wcscasecmp_l.c: New file. * wcsmbs/wcsncase_l.c: New file. * wcsmbs/wcstof.c: Change for compiling as wcstof_l.c * wcsmbs/wcstold.c: Change for compiling as wcstold_l.c * wcsmcs/wcstod_l.c: New file. * wcsmcs/wcstof_l.c: New file. * wcsmcs/wcstold_l.c: New file. * wcsmcs/wcstol_l.c: New file. * wcsmcs/wcstoul_l.c: New file. * wcsmcs/wcstoll_l.c: New file. * wcsmcs/wcstoull_l.c: New file. * Makeconfig (binfmt-subdir): New variable. Set to `elf' if $(elf) is defined. More to come later when other binary formats are supported. * Makefile (subdirs): Remove elf. Add $(binfmt-subdir). Suggested by Philip Blundell. * stdlib/Makefile (headers): Add fmtmsg.h. (routines): Add fmtmsg. * stdlib/fmtmsg.c: New file. * stdlib/fmtmsg.h: New file. * manual/stdio.texi: Add description of fmtmsg and addseverity. * manual/examples/fmtmsgexpl.c: Example program for fmtmsg documentation. 1997-05-23 15:26 Philip Blundell <pjb27@cam.ac.uk> * resolv/res_query.c (res_querydomain): Avoid potential buffer overrun. Reported by Dan A. Dickey <ddickey@transition.com>. 1997-05-22 18:36 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * elf/dl-support.c (_dl_sysdep_open_zero_fill, _dl_sysdep_read_whole_file): Moved functions to ... * elf/dl-misc.c: This new file. * sysdeps/generic/dl-sysdepio.c: Delete file and move functions... * elf/dl-misc.c: ... here. * sysdeps/generic/dl-sysdep.c (_dl_sysdep_open_zero_fill, _dl_sysdep_read_whole_file): Delete functions; they now come from elf/dl-misc.c (dl-support.c had contained identical versions). * sysdeps/mach/hurd/dl-sysdepio.c: Delete file; move functions... * sysdeps/mach/hurd/dl-sysdep.c: ... here, but mark them weak so that the regular ones in dl-misc work once we've initialized. * elf/Makefile (dl-routines): Remove dl-sysdepio.c. Add dl-misc.c. 1997-05-22 21:55 Philip Blundell <pjb27@cam.ac.uk> * inet/Makefile (headers): Add netinet/inbits.h. * inet/netinet/in.h: New file. * sysdeps/generic/netinet/inbits.h: Likewise. * sysdeps/unix/sysv/linux/netinet/inbits.h: Likewise. * sysdeps/generic/netinet/ip6.h: Move to... * inet/netinet/ip6.h: ... here. * sysdeps/generic/netinet/icmp6.h: Move to... * inet/netinet/icmp6.h: ... here. * sysdeps/unix/sysv/linux/netinet/in.h: Remove. * sysdeps/generic/netinet/in.h: Remove. 1997-05-22 05:40 Richard Henderson <rth@tamu.edu> * sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): If we are not looking at the new thread-safe .plt, don't be lazy about relocs. (_dl_runtime_resolve): Fix up arithmetic for new .plt layout. (elf_alpha_fix_plt): Insert wmb as appropriate to ensure safety. * elf/dynamic-link.h (ELF_DYNAMIC_RELOCATE): Let elf_machine_runtime_setup() decide if we can actually be lazy. * elf/rtld.c (_dl_start): So don't call it. * elf/dl-reloc.c (_dl_relocate_object): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_runtime_setup): Return lazy. * sysdeps/m68k/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/mips/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/powerpc/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/sparc/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/stub/dl-machine.h (elf_machine_runtime_setup): Update skeleton definition. 1997-05-22 18:45 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/fpu/__math.h (logb): Remove second value placed on stack by fxtract. 1997-05-22 13:07 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sunrpc/rpcsvc/rusers.x: Provide and correct prototypes, add cast to (xdrproc_t) where necessary to prevent warnings. 1997-05-22 12:18 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Remove I/O functions. * sunrpc/rpcinfo.c (get_inet_address): Use INADDR_NONE and INADDR_ANY * sysdeps/libm-ieee754/s_cexp.c: Fix typo: string_alias -> * nss/XXX-lookup.c: Add missing explanation.
439 lines
10 KiB
C
439 lines
10 KiB
C
/* 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.
|
||
|
||
The GNU C Library is free software; you can redistribute it and/or
|
||
modify it under the terms of the GNU Library General Public License as
|
||
published by the Free Software Foundation; either version 2 of the
|
||
License, or (at your option) any later version.
|
||
|
||
The GNU C Library 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
|
||
Library General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Library General Public
|
||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
Boston, MA 02111-1307, USA. */
|
||
|
||
#if HAVE_CONFIG_H
|
||
# include <config.h>
|
||
#endif
|
||
|
||
#ifdef _LIBC
|
||
# define USE_NUMBER_GROUPING
|
||
# define STDC_HEADERS
|
||
# define HAVE_LIMITS_H
|
||
#endif
|
||
|
||
#include <ctype.h>
|
||
#include <errno.h>
|
||
#ifndef errno
|
||
extern int errno;
|
||
#endif
|
||
#ifndef __set_errno
|
||
# define __set_errno(Val) errno = (Val)
|
||
#endif
|
||
|
||
#ifdef HAVE_LIMITS_H
|
||
# include <limits.h>
|
||
#endif
|
||
|
||
#ifdef STDC_HEADERS
|
||
# include <stddef.h>
|
||
# include <stdlib.h>
|
||
# include <string.h>
|
||
#else
|
||
# ifndef NULL
|
||
# define NULL 0
|
||
# endif
|
||
#endif
|
||
|
||
#ifdef USE_NUMBER_GROUPING
|
||
# include "../locale/localeinfo.h"
|
||
#endif
|
||
|
||
/* Nonzero if we are defining `strtoul' or `strtoull', operating on
|
||
unsigned integers. */
|
||
#ifndef UNSIGNED
|
||
# define UNSIGNED 0
|
||
# define INT LONG int
|
||
#else
|
||
# define INT unsigned LONG int
|
||
#endif
|
||
|
||
/* Determine the name. */
|
||
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
||
# if UNSIGNED
|
||
# ifdef USE_WIDE_CHAR
|
||
# ifdef QUAD
|
||
# define strtol __wcstoull_l
|
||
# else
|
||
# define strtol __wcstoul_l
|
||
# endif
|
||
# else
|
||
# ifdef QUAD
|
||
# define strtol __strtoull_l
|
||
# else
|
||
# define strtol __strtoul_l
|
||
# endif
|
||
# endif
|
||
# else
|
||
# ifdef USE_WIDE_CHAR
|
||
# ifdef QUAD
|
||
# define strtol __wcstoll_l
|
||
# else
|
||
# define strtol __wcstol_l
|
||
# endif
|
||
# else
|
||
# ifdef QUAD
|
||
# define strtol __strtoll_l
|
||
# else
|
||
# define strtol __strtol_l
|
||
# endif
|
||
# endif
|
||
# endif
|
||
#else
|
||
# if UNSIGNED
|
||
# ifdef USE_WIDE_CHAR
|
||
# ifdef QUAD
|
||
# define strtol wcstoull
|
||
# else
|
||
# define strtol wcstoul
|
||
# endif
|
||
# else
|
||
# ifdef QUAD
|
||
# define strtol strtoull
|
||
# else
|
||
# define strtol strtoul
|
||
# endif
|
||
# endif
|
||
# else
|
||
# ifdef USE_WIDE_CHAR
|
||
# ifdef QUAD
|
||
# define strtol wcstoll
|
||
# else
|
||
# define strtol wcstol
|
||
# endif
|
||
# else
|
||
# ifdef QUAD
|
||
# define strtol strtoll
|
||
# endif
|
||
# endif
|
||
# endif
|
||
#endif
|
||
|
||
/* If QUAD is defined, we are defining `strtoll' or `strtoull',
|
||
operating on `long long int's. */
|
||
#ifdef QUAD
|
||
# 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
|
||
|
||
#ifndef ULONG_MAX
|
||
# define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
|
||
#endif
|
||
#ifndef LONG_MAX
|
||
# define LONG_MAX ((long int) (ULONG_MAX >> 1))
|
||
#endif
|
||
#endif
|
||
|
||
|
||
/* We use this code also for the extended locale handling where the
|
||
function gets as an additional argument the locale which has to be
|
||
used. To access the values we have to redefine the _NL_CURRENT
|
||
macro. */
|
||
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
||
# undef _NL_CURRENT
|
||
# define _NL_CURRENT(category, item) \
|
||
(current->values[_NL_ITEM_INDEX (item)].string)
|
||
# define LOCALE_PARAM , loc
|
||
# define LOCALE_PARAM_DECL __locale_t loc;
|
||
#else
|
||
# define LOCALE_PARAM
|
||
# define LOCALE_PARAM_DECL
|
||
#endif
|
||
|
||
|
||
#ifdef USE_WIDE_CHAR
|
||
# include <wchar.h>
|
||
# include <wctype.h>
|
||
# define L_(Ch) L##Ch
|
||
# define UCHAR_TYPE wint_t
|
||
# define STRING_TYPE wchar_t
|
||
# ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
||
# define ISSPACE(Ch) __iswspace_l ((Ch), loc)
|
||
# define ISALPHA(Ch) __iswalpha_l ((Ch), loc)
|
||
# define TOUPPER(Ch) __towupper_l ((Ch), loc)
|
||
# else
|
||
# define ISSPACE(Ch) iswspace (Ch)
|
||
# define ISALPHA(Ch) iswalpha (Ch)
|
||
# define TOUPPER(Ch) towupper (Ch)
|
||
# endif
|
||
# else
|
||
# define L_(Ch) Ch
|
||
# define UCHAR_TYPE unsigned char
|
||
# define STRING_TYPE char
|
||
# ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
||
# define ISSPACE(Ch) __isspace_l ((Ch), loc)
|
||
# define ISALPHA(Ch) __isalpha_l ((Ch), loc)
|
||
# define TOUPPER(Ch) __toupper_l ((Ch), loc)
|
||
# else
|
||
# define ISSPACE(Ch) isspace (Ch)
|
||
# define ISALPHA(Ch) isalpha (Ch)
|
||
# define TOUPPER(Ch) toupper (Ch)
|
||
# endif
|
||
#endif
|
||
|
||
#ifdef __STDC__
|
||
# define INTERNAL(X) INTERNAL1(X)
|
||
# define INTERNAL1(X) __##X##_internal
|
||
# define WEAKNAME(X) WEAKNAME1(X)
|
||
#else
|
||
# define INTERNAL(X) __/**/X/**/_internal
|
||
#endif
|
||
|
||
#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. */
|
||
|
||
INT
|
||
INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM)
|
||
const STRING_TYPE *nptr;
|
||
STRING_TYPE **endptr;
|
||
int base;
|
||
int group;
|
||
LOCALE_PARAM_DECL
|
||
{
|
||
int negative;
|
||
register unsigned LONG int cutoff;
|
||
register unsigned int cutlim;
|
||
register unsigned LONG int i;
|
||
register const STRING_TYPE *s;
|
||
register UCHAR_TYPE c;
|
||
const STRING_TYPE *save, *end;
|
||
int overflow;
|
||
|
||
#ifdef USE_NUMBER_GROUPING
|
||
# ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
||
struct locale_data *current = loc->__locales[LC_NUMERIC];
|
||
# endif
|
||
/* 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;
|
||
#endif
|
||
|
||
if (base < 0 || base == 1 || base > 36)
|
||
{
|
||
__set_errno (EINVAL);
|
||
return 0;
|
||
}
|
||
|
||
save = s = nptr;
|
||
|
||
/* Skip white space. */
|
||
while (ISSPACE (*s))
|
||
++s;
|
||
if (*s == L_('\0'))
|
||
goto noconv;
|
||
|
||
/* Check for a sign. */
|
||
if (*s == L_('-'))
|
||
{
|
||
negative = 1;
|
||
++s;
|
||
}
|
||
else if (*s == L_('+'))
|
||
{
|
||
negative = 0;
|
||
++s;
|
||
}
|
||
else
|
||
negative = 0;
|
||
|
||
if (base == 16 && s[0] == L_('0') && TOUPPER (s[1]) == L_('X'))
|
||
s += 2;
|
||
|
||
/* If BASE is zero, figure it out ourselves. */
|
||
if (base == 0)
|
||
if (*s == L_('0'))
|
||
{
|
||
if (TOUPPER (s[1]) == L_('X'))
|
||
{
|
||
s += 2;
|
||
base = 16;
|
||
}
|
||
else
|
||
base = 8;
|
||
}
|
||
else
|
||
base = 10;
|
||
|
||
/* Save the pointer so we can check later if anything happened. */
|
||
save = s;
|
||
|
||
#ifdef USE_NUMBER_GROUPING
|
||
if (group)
|
||
{
|
||
/* Find the end of the digit string and check its grouping. */
|
||
end = s;
|
||
for (c = *end; c != L_('\0'); c = *++end)
|
||
if ((wchar_t) c != thousands
|
||
&& ((wchar_t) c < L_('0') || (wchar_t) c > L_('9'))
|
||
&& (!ISALPHA (c) || (int) (TOUPPER (c) - L_('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 != L_('\0'); c = *++s)
|
||
{
|
||
if (s == end)
|
||
break;
|
||
if (c >= L_('0') && c <= L_('9'))
|
||
c -= L_('0');
|
||
else if (ISALPHA (c))
|
||
c = TOUPPER (c) - L_('A') + 10;
|
||
else
|
||
break;
|
||
if ((int) c >= base)
|
||
break;
|
||
/* Check for overflow. */
|
||
if (i > cutoff || (i == cutoff && c > cutlim))
|
||
overflow = 1;
|
||
else
|
||
{
|
||
i *= (unsigned LONG int) base;
|
||
i += c;
|
||
}
|
||
}
|
||
|
||
/* Check if anything actually happened. */
|
||
if (s == save)
|
||
goto noconv;
|
||
|
||
/* Store in ENDPTR the address of one character
|
||
past the last character we converted. */
|
||
if (endptr != NULL)
|
||
*endptr = (STRING_TYPE *) s;
|
||
|
||
#if !UNSIGNED
|
||
/* Check for a value that is within the range of
|
||
`unsigned LONG int', but outside the range of `LONG int'. */
|
||
if (overflow == 0
|
||
&& i > (negative
|
||
? -((unsigned LONG int) (LONG_MIN + 1)) + 1
|
||
: (unsigned LONG int) LONG_MAX))
|
||
overflow = 1;
|
||
#endif
|
||
|
||
if (overflow)
|
||
{
|
||
__set_errno (ERANGE);
|
||
#if UNSIGNED
|
||
return ULONG_MAX;
|
||
#else
|
||
return negative ? LONG_MIN : LONG_MAX;
|
||
#endif
|
||
}
|
||
|
||
/* Return the result of the appropriate sign. */
|
||
return (negative ? -i : i);
|
||
|
||
noconv:
|
||
/* We must handle a special case here: the base is 0 or 16 and the
|
||
first two characters are '0' and 'x', but the rest are no
|
||
hexadecimal digits. This is no error case. We return 0 and
|
||
ENDPTR points to the `x`. */
|
||
if (endptr != NULL)
|
||
if (save - nptr >= 2 && TOUPPER (save[-1]) == L_('X')
|
||
&& save[-2] == L_('0'))
|
||
*endptr = (STRING_TYPE *) &save[-1];
|
||
else
|
||
/* There was no number to convert. */
|
||
*endptr = (STRING_TYPE *) nptr;
|
||
|
||
return 0L;
|
||
}
|
||
|
||
/* External user entry point. */
|
||
|
||
#if _LIBC - 0 == 0
|
||
# undef PARAMS
|
||
# if defined (__STDC__) && __STDC__
|
||
# define PARAMS(Args) Args
|
||
# else
|
||
# define PARAMS(Args) ()
|
||
# endif
|
||
|
||
/* Prototype. */
|
||
INT strtol PARAMS ((const STRING_TYPE *nptr, STRING_TYPE **endptr, int base));
|
||
#endif
|
||
|
||
|
||
INT
|
||
#ifdef weak_function
|
||
weak_function
|
||
#endif
|
||
strtol (nptr, endptr, base LOCALE_PARAM)
|
||
const STRING_TYPE *nptr;
|
||
STRING_TYPE **endptr;
|
||
int base;
|
||
LOCALE_PARAM_DECL
|
||
{
|
||
return INTERNAL (strtol) (nptr, endptr, base, 0 LOCALE_PARAM);
|
||
}
|