mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
e852e88944
1998-07-28 Ulrich Drepper <drepper@cygnus.com> * math/libm-test.c (tgamma_test): Remove redundant tests. 1998-07-28 16:20 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/glob.c: Correct problems with */foo and GLOB_NOCHECK where foo does not exist in any of the subdirectories. Reported by Paul D. Smith <psmith@BayNetworks.COM>. * posix/globtest.sh: Add test for this bug. 1998-07-28 Mark Kettenis <kettenis@phys.uva.nl> * io/sys/statfs.h: Fix typos. * io/sys/statvfs.h: Fix typos. 1998-07-28 Ulrich Drepper <drepper@cygnus.com> * version.h (VERSION): Bump to 2.0.95. * math/Makefile (libm-calls): Remove w_gamma, add w_tgamma. * math/Versions [GLIBC_2.1]: Add tgamma, tgammaf, and tgammal. * math/libm-test.c: Split old gamma_test and move half of it in new function tgamma_test. * math/bits/mathcalls.h: Add declaration of tgamma. * sysdeps/libm-ieee754/k_standard.c: Change gamma errors into tgamma errors. * sysdeps/libm-ieee754/w_gamma.c: Remove lgamma compatibility code and rename to ... * sysdeps/libm-ieee754/w_tgamma.c: ... this. New file. * sysdeps/libm-ieee754/w_gammaf.c: Remove lgammaf compatibility code and rename to ... * sysdeps/libm-ieee754/w_tgammaf.c: ... this. New file. * sysdeps/libm-ieee754/w_gammal.c: Remove lgammal compatibility code and rename to ... * sysdeps/libm-ieee754/w_tgammal.c: ... this. New file. * sysdeps/libm-ieee754/w_lgamma.c: Add gamma as weak alias. * sysdeps/libm-ieee754/w_lgammaf.c: Likewise. * sysdeps/libm-ieee754/w_lgammal.c: Likewise. * stgdio-common/printf-parse.h: Implement handling of j, t, and z modifiers. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * manual/stdio.texi: Document new printf/scanf modifiers. * sysdeps/unix/sysv/linux/recvmsg.c: Remove alias __recvmsg. * sysdeps/unix/sysv/linux/sendmsg.c: Remove alias __sendmsg. 1998-07-28 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * sunrpc/Makefile (routines): Add clnt_unix and svc_unix. * sunrpc/Versions: Add new *unix_create functions. * sunrpc/clnt_gen.c: Add support for RPC over AF_UNIX. * sunrpc/clnt_unix.c: New, client side of RPC over AF_UNIX. * sunrpc/key_call.c: Use RPC over AF_UNIX for communication with keyserv daemon. * sunrpc/rpc/clnt.h: Add AF_UNIX based RPC function prototypes. * sunrpc/rpc/svc.h: Likewise. * sunrpc/svc_authux.c: Copy internal auth flavor if none is given. * sunrpc/svc_tcp.c: Fix typos. * sunrpc/svc_unix.c: New, server side of AF_UNIX based RPC. * nis/Makefile: Remove currently not working cache functions. * nis/Versions: Add __nisbind_* functions for rpc.nisd. * nis/nis_call.c: Rewrite binding to a NIS+ server to reuse CLIENT handles. * nis/nis_file.c: Fix memory leaks. * nis/nis_intern.h: Move internal structs from here ... * nis/rpcsvc/nislib.h: ... to here for NIS+ server and tools. * nis/nis_lookup.c: Try at first if last client handle works. * nis/nis_table.c: Likewise. * nis/nis_checkpoint.c: Adjust __do_niscall2 parameters. * nis/nis_mkdir.c: Likewise. * nis/nis_ping.c: Likewise. * nis/nis_rmdir.c: Likewise. * nis/nis_server.c: Likewise. * nis/nis_util.c: Likewise. * nis/nis_findserv.c (__nis_findfastest): Little optimization. 1998-07-28 Andreas Jaeger <aj@arthur.rhein-neckar.de> * stdlib/strtol.c (STRTOL_LONG_MAX): Correct typo in last patch - define as LONG_MAX. 1998-07-28 09:31 Ulrich Drepper <drepper@cygnus.com> * nscd/connections.c (gr_send_answer): Deal with missing UIO_MAXIOV. Correct test whether writev send all data. * nscd/nscd_getgr_r.c (__nscd_getgr_r): Correct test whether readv received all data. 1998-07-28 Mark Kettenis <kettenis@phys.uva.nl> * nscd/nscd_getgr_r.c (__nscd_getgr_r): Deal with missing UIO_MAXIOV. 1998-07-28 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/mach/hurd/dl-sysdep.c (open_file): Change assert call to allow mode to be 0. (__xstat): New function. (__fxstat): New function. (_dl_sysdep_read_whole_file): Removed. The implementation in `elf/dl-misc.c' now also works for the Hurd.
444 lines
10 KiB
C
444 lines
10 KiB
C
/* Convert string representation of a number into an integer value.
|
||
Copyright (C) 1991, 92, 94, 95, 96, 97, 98 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
|
||
# define STRTOL_LONG_MIN LONG_LONG_MIN
|
||
# define STRTOL_LONG_MAX LONG_LONG_MAX
|
||
# define STRTOL_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 STRTOL_ULONG_MAX
|
||
# define STRTOL_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
|
||
# define STRTOL_LONG_MIN LONG_MIN
|
||
# define STRTOL_LONG_MAX LONG_MAX
|
||
# define STRTOL_ULONG_MAX ULONG_MAX
|
||
#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
|
||
|
||
#if defined _LIBC || defined HAVE_WCHAR_H
|
||
# include <wchar.h>
|
||
#endif
|
||
|
||
#ifdef USE_WIDE_CHAR
|
||
# 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
|
||
# if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII)
|
||
# define IN_CTYPE_DOMAIN(c) 1
|
||
# else
|
||
# define IN_CTYPE_DOMAIN(c) isascii(c)
|
||
# endif
|
||
# 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) (IN_CTYPE_DOMAIN (Ch) && isspace (Ch))
|
||
# define ISALPHA(Ch) (IN_CTYPE_DOMAIN (Ch) && isalpha (Ch))
|
||
# define TOUPPER(Ch) (IN_CTYPE_DOMAIN (Ch) ? toupper (Ch) : (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 = L'\0';
|
||
/* 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 defined _LIBC || defined _HAVE_BTOWC
|
||
thousands = __btowc (*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP));
|
||
if (thousands == WEOF)
|
||
thousands = L'\0';
|
||
# endif
|
||
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;
|
||
|
||
/* Recognize number prefix and if BASE is zero, figure it out ourselves. */
|
||
if (*s == L_('0'))
|
||
{
|
||
if (TOUPPER (s[1]) == L_('X'))
|
||
{
|
||
s += 2;
|
||
base = 16;
|
||
}
|
||
else if (base == 0)
|
||
base = 8;
|
||
}
|
||
else if (base == 0)
|
||
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 = STRTOL_ULONG_MAX / (unsigned LONG int) base;
|
||
cutlim = STRTOL_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) (STRTOL_LONG_MIN + 1)) + 1
|
||
: (unsigned LONG int) STRTOL_LONG_MAX))
|
||
overflow = 1;
|
||
#endif
|
||
|
||
if (overflow)
|
||
{
|
||
__set_errno (ERANGE);
|
||
#if UNSIGNED
|
||
return STRTOL_ULONG_MAX;
|
||
#else
|
||
return negative ? STRTOL_LONG_MIN : STRTOL_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);
|
||
}
|