mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
75cd5204dd
* time/strftime.c: Use canonical autoconf nugget for time.h+sys/time.h include. Mon Apr 29 02:48:26 1996 Ulrich Drepper <drepper@cygnus.com> * ctype/ctype-info.c: (__ctype_width): New variable. (__ctype_names): Initialize correctly without offset. * locale/C-collate.c, locale/C-ctype.c, locale/C-messages.c, locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Change copyright. * locale/C-ctype.c (_nl_C_LC_CTYPE_class32): Correct endianess for initialization value. * locale/lc-ctype.c (current): Add parameter for offset. (__ctype32_b, __ctype_width): Add initialization for these variables. * locale/programs/charmap.c: Finish support for WIDTH information. (new_width): New function. * locale/programs/charset.h (width_rule): new data structure. (charset_t): Add elements for width information. * locale/programs/ld-ctype.c (locale_ctype_t): Add element for width information. (allocate_arrays): Add new argument for charset. (ctype_finish): Make sure all characters named in charset width table are known to name table. (ctype_output): Correct handling of class and map name information and write out width information. (find_idx): Prepare for being called with NULL pointer as TABLE argument. This means only allocate name entry. (allocate_arrays): Correct handling of array element -1. Because EOF == -1 the value of element 127 must *not* be mirrored here. Fill width information from charset tables. * locale/programs/localedef.c (main): Correct loop over all categories after change of order from Thu Mar 28 14:22:51 1996. Add new charset argument to call of `write_all_categories'. * locale/programs/locales.h (ctype_finish, ctype_output): New charset argument. * locale/programs/locfile.c (write_all_categories): Call `ctype_output' with additional argument charset. * posix/getconf.c (vars): Add _POSIX_SYNC_IO, _POSIX_ASYNC_IO, and _POSIX_PRIO_IO definitions. * posix/posix2_lim.h: Add definition of _POSIX2_CHARCLASS_NAME_MAX and CHARCLASS_NAME_MAX. * posix/unistd.h: Document _POSIX_SYNC_IO, _POSIX_ASYNC_IO, and _POSIX_PRIO_IO. * stdlib/grouping.h: Prepare for use in wide string functions. * stdlib/stdlib.h: Correct prototypes for __strto*_internal functions. * stdlib/strtod.c: Extend for use as `wcsto{f,d,ld}'. * stdlib/strtol.c: Extend for use as `wcsto{l,ul,q,uq}'. * string/strcoll.c: Extend for use as `wcscoll'. * string/strxfrm.c: Extend for use as `wcsxfrm'. * sysdeps/generic/confname.h: Add definition of _PC_SYNC_IO, _PC_ASYNC_IO, _PC_PRIO_IO and _SC_CHARCLASS_NAME_MAX. * sysdeps/generic/stpncpy.c: Correct return value. * sysdeps/posix/fpathconf.c: Add handling of _PC_SYNC_IO, _PC_ASYNC_IO, and _PC_PRIO_IO. * sysdeps/posix/sysconf.c: Add handling of _SC_REALTIME_SIGNALS, _SC_PRIORITY_SCHEDULING, _SC_TIMERS, _SC_ASYNCHRONOUS_IO, _SC_PRIORITIZED_IO, _SC_SYNCHRONIZED_IO, _SC_FSYNC, _SC_MAPPED_FILES, _SC_MEMLOCK, _SC_MEMLOCK_RANGE, _SC_MEMORY_PROTECTION, _SC_MESSAGE_PASSING, _SC_SEMAPHORES, _SC_SHARED_MEMORY_OBJECTS, and _SC_CHARCLASS_NAME_MAX. * sysdeps/stub/sysconf.c: Ditto. * sysdeps/unix/sysv/sysv4/sysconf.c: Ditto. * sysdeps/unix/sysv/linux/Dist: Add sys/sysctl.h. * sysdeps/unix/sysv/linux/Makefile [subdir == misc] (sysdep_routines): Add s_sysctl and sysctl. * sysdeps/unix/sysv/linux/sys/mman.h: Add declaration of mremap. * sysdeps/unix/sysv/linux/sys/socket.h: New file. Wrapper around kernel header. * sysdeps/unix/sysv/linux/sys/sysctl.h: New file. Define interface to `sysctl' function. * sysdeps/unix/sysv/linux/syscalls.list: Add mremap and _sysctl. * sysdeps/unix/sysv/linux/sysconf.c: Add handling of _SC_CHARCLASS_NAME_MAX. * sysdeps/unix/sysv/linux/sysctl.c: new file. Implement caller of _sysctl system call. * sysvipc/Makefile (routines): Add ftok. * sysvipc/ftok.c: use variable `proj_id' not `id'. Patch by David Mosberger-Tang. * wcsmbs/Makefile (routines): Add wcpcpy, wcpncpy, wcstol, wcstoul, wcstoq, wcstouq, wcstod, wcstold, wcstof, wcscoll, wcsxfrm, wcwidth, and wcswidth. * wcsmbs/wchar.h: Add declarations for wcpcpy, wcpncpy, wcstol, wcstoul, wcstoq, wcstouq, wcstod, wcstold, wcstof, wcscoll, wcsxfrm, wcwidth, and wcswidth. Declare internal interfaces for wcsto* functions. [OPTIMIZE]: Define inline functions for wcsto* functions to call internal interface functions. * wcsmbs/wcpcpy.c, wcsmbs/wcpncpy.c: New files. Implement non- standard function equivalent to stpcpy/stpncpy. * wcsmbs/wcscoll.c: Implement `wcscoll' function by using `strcoll' implementation. * wcsmbs/wcscpy.c, wcsmbs/wcsncpy.c: Use wint_t instead of wchar_t. * wcsmbs/wcstod.c: Implement `wcstod' function by using `strtod' implementation. * wcsmbs/wcstof.c: Same for `wcstof'. * wcsmbs/wcstold.c: Same for `strtold'. * wcsmbs/wcstol.c: Implement `wcstol' function by using `strtol' implementation. * wcsmbs/wcstoq.c: Same for `wcstoq'. * wcsmbs/wcstoul.c: Same for `wcstoul'. * wcsmbs/wcstouq.c: Same for `wcstouq'. * wcsmbs/wcswidth.c: Implement `wcswidth' function from X/Open CAE. * wcsmbs/wcwidth.c: Ditto for `wcwidth'. * wcsmbs/wcwidth.h: Common function for definitions of above two functions. * wcsmbs/wcsxfrm.c: Implement `wcsxfrm function by using `strxfrm implementation. * wctype/wctype.c: Remove case for `wctype_t' being 16 bit type. * wctype/wctype.h (wint_t): Protect against multiple definition. (wctype_t): Always define as `unsigned long int'. * wctype.h: New file. Wrapper around wctype/wctype.h. * hurd/hurdstartup.c (_hurd_split_args): Function removed. (_hurd_startup): Use argz functions. * hurd/hurdexec.c: Use argz functions.
344 lines
7.8 KiB
C
344 lines
7.8 KiB
C
/* Copyright (C) 1991, 92, 94, 95, 96 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., 675 Mass Ave,
|
||
Cambridge, MA 02139, USA. */
|
||
|
||
#ifdef 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
|
||
|
||
#ifdef HAVE_LIMITS_H
|
||
# include <limits.h>
|
||
#endif
|
||
|
||
#ifdef STDC_HEADERS
|
||
# include <stddef.h>
|
||
# include <stdlib.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 `strtouq', operating on
|
||
unsigned integers. */
|
||
#ifndef UNSIGNED
|
||
# define UNSIGNED 0
|
||
# define INT LONG int
|
||
#else
|
||
# define INT unsigned LONG int
|
||
#endif
|
||
|
||
/* Determine the name. */
|
||
#if UNSIGNED
|
||
# ifdef USE_WIDE_CHAR
|
||
# ifdef QUAD
|
||
# define strtol wcstouq
|
||
# else
|
||
# define strtol wcstoul
|
||
# endif
|
||
# else
|
||
# ifdef QUAD
|
||
# define strtol strtouq
|
||
# else
|
||
# define strtol strtoul
|
||
# endif
|
||
# endif
|
||
#else
|
||
# ifdef USE_WIDE_CHAR
|
||
# ifdef QUAD
|
||
# define strtol wcstoq
|
||
# else
|
||
# define strtol wcstol
|
||
# endif
|
||
# else
|
||
# ifdef QUAD
|
||
# define strtol strtoq
|
||
# endif
|
||
# endif
|
||
#endif
|
||
|
||
/* If QUAD is defined, we are defining `strtoq' or `strtouq',
|
||
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
|
||
#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
|
||
# define ISSPACE(ch) iswspace (ch)
|
||
# define ISALPHA(ch) iswalpha (ch)
|
||
# define TOUPPER(ch) towupper (ch)
|
||
#else
|
||
# define L_(ch) ch
|
||
# define UCHAR_TYPE unsigned char
|
||
# define STRING_TYPE char
|
||
# define ISSPACE(ch) isspace (ch)
|
||
# define ISALPHA(ch) isalpha (ch)
|
||
# define TOUPPER(ch) toupper (ch)
|
||
#endif
|
||
|
||
#ifdef __STDC__
|
||
# define INTERNAL(x) INTERNAL1(x)
|
||
# define INTERNAL1(x) __##x##_internal
|
||
#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)
|
||
const STRING_TYPE *nptr;
|
||
STRING_TYPE **endptr;
|
||
int base;
|
||
int group;
|
||
{
|
||
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
|
||
/* 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)
|
||
base = 10;
|
||
|
||
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 (c != thousands && (c < L_('0') || c > L_('9'))
|
||
&& (!ISALPHA (c) || 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 (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 (i > (negative ?
|
||
-(unsigned LONG int) LONG_MIN : (unsigned LONG int) LONG_MAX))
|
||
overflow = 1;
|
||
#endif
|
||
|
||
if (overflow)
|
||
{
|
||
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 and '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. */
|
||
|
||
INT
|
||
strtol (nptr, endptr, base)
|
||
const STRING_TYPE *nptr;
|
||
STRING_TYPE **endptr;
|
||
int base;
|
||
{
|
||
return INTERNAL (strtol) (nptr, endptr, base, 0);
|
||
}
|
||
|
||
#ifdef weak_symbol
|
||
/* We need this indirection when `strtol' is defined as a macro
|
||
for one of the other names. */
|
||
#define weak1(x) weak_symbol(x)
|
||
weak1 (strtol)
|
||
#endif
|