add wcstoll, wcstoimax, wcstoull and wcstoumax. (lib/20656)
- these are defined in C99 (wcsto[ui]max) and SUSv3. - these implementations are written by sigsegv@s25.xrea.com, derived from NetBSD's wcstol/wcstoul. - I just added some comments.
This commit is contained in:
tshiozak
parent
664f01402c
commit
3f9925f700
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: inttypes.h,v 1.1 2001/04/28 15:41:28 kleink Exp $ */
|
/* $NetBSD: inttypes.h,v 1.2 2003/03/11 09:21:22 tshiozak Exp $ */
|
||||||
|
|
||||||
/*-
|
/*-
|
||||||
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
||||||
@ -41,12 +41,17 @@
|
|||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
#include <sys/inttypes.h>
|
#include <sys/inttypes.h>
|
||||||
|
#include <wchar.h>
|
||||||
|
|
||||||
__BEGIN_DECLS
|
__BEGIN_DECLS
|
||||||
intmax_t strtoimax __P((const char * __restrict,
|
intmax_t strtoimax __P((const char * __restrict,
|
||||||
char ** __restrict, int));
|
char ** __restrict, int));
|
||||||
uintmax_t strtoumax __P((const char * __restrict,
|
uintmax_t strtoumax __P((const char * __restrict,
|
||||||
char ** __restrict, int));
|
char ** __restrict, int));
|
||||||
|
intmax_t wcstoimax __P((const wchar_t * __restrict,
|
||||||
|
wchar_t ** __restrict, int));
|
||||||
|
uintmax_t wcstoumax __P((const wchar_t * __restrict,
|
||||||
|
wchar_t ** __restrict, int));
|
||||||
__END_DECLS
|
__END_DECLS
|
||||||
|
|
||||||
#endif /* !_INTTYPES_H_ */
|
#endif /* !_INTTYPES_H_ */
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $ */
|
/* $NetBSD: wchar.h,v 1.17 2003/03/11 09:21:22 tshiozak Exp $ */
|
||||||
|
|
||||||
/*-
|
/*-
|
||||||
* Copyright (c)1999 Citrus Project,
|
* Copyright (c)1999 Citrus Project,
|
||||||
@ -144,11 +144,22 @@ int wcswidth __P((const wchar_t *, size_t));
|
|||||||
int wctob __P((wint_t));
|
int wctob __P((wint_t));
|
||||||
int wcwidth __P((wchar_t));
|
int wcwidth __P((wchar_t));
|
||||||
|
|
||||||
unsigned long int wcstoul __P((const wchar_t * __restrict, wchar_t ** __restrict,
|
unsigned long int wcstoul __P((const wchar_t * __restrict,
|
||||||
int base));
|
wchar_t ** __restrict, int base));
|
||||||
long int wcstol __P((const wchar_t * __restrict, wchar_t ** __restrict, int base));
|
long int wcstol __P((const wchar_t * __restrict,
|
||||||
|
wchar_t ** __restrict, int base));
|
||||||
double wcstod __P((const wchar_t * __restrict, wchar_t ** __restrict));
|
double wcstod __P((const wchar_t * __restrict, wchar_t ** __restrict));
|
||||||
|
|
||||||
|
#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \
|
||||||
|
defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) > 199901L
|
||||||
|
/* LONGLONG */
|
||||||
|
long long int wcstoll __P((const wchar_t * __restrict,
|
||||||
|
wchar_t ** __restrict, int base));
|
||||||
|
/* LONGLONG */
|
||||||
|
unsigned long long int wcstoull __P((const wchar_t * __restrict,
|
||||||
|
wchar_t ** __restrict, int base));
|
||||||
|
#endif
|
||||||
|
|
||||||
wint_t ungetwc __P((wint_t, FILE *));
|
wint_t ungetwc __P((wint_t, FILE *));
|
||||||
wint_t fgetwc __P((FILE *));
|
wint_t fgetwc __P((FILE *));
|
||||||
wchar_t *fgetws __P((wchar_t * __restrict, int, FILE * __restrict));
|
wchar_t *fgetws __P((wchar_t * __restrict, int, FILE * __restrict));
|
||||||
|
|||||||
@ -1,12 +1,13 @@
|
|||||||
# from: @(#)Makefile.inc 5.1 (Berkeley) 2/18/91
|
# from: @(#)Makefile.inc 5.1 (Berkeley) 2/18/91
|
||||||
# $NetBSD: Makefile.inc,v 1.44 2003/03/05 20:18:16 tshiozak Exp $
|
# $NetBSD: Makefile.inc,v 1.45 2003/03/11 09:21:23 tshiozak Exp $
|
||||||
|
|
||||||
# locale sources
|
# locale sources
|
||||||
.PATH: ${ARCHDIR}/locale ${.CURDIR}/locale
|
.PATH: ${ARCHDIR}/locale ${.CURDIR}/locale
|
||||||
|
|
||||||
SRCS+= _def_messages.c _def_monetary.c _def_numeric.c _def_time.c \
|
SRCS+= _def_messages.c _def_monetary.c _def_numeric.c _def_time.c \
|
||||||
ctypeio.c localeconv.c nl_langinfo.c setlocale.c setlocale1.c \
|
ctypeio.c localeconv.c nl_langinfo.c setlocale.c setlocale1.c \
|
||||||
setlocale32.c __mb_cur_max.c wcscoll.c wcstol.c wcstoul.c wcstod.c \
|
setlocale32.c __mb_cur_max.c wcscoll.c wcstod.c \
|
||||||
|
wcstol.c wcstoll.c wcstoimax.c wcstoul.c wcstoull.c wcstoumax.c \
|
||||||
wcsxfrm.c aliasname.c
|
wcsxfrm.c aliasname.c
|
||||||
MAN+= nl_langinfo.3 setlocale.3
|
MAN+= nl_langinfo.3 setlocale.3
|
||||||
|
|
||||||
|
|||||||
149
lib/libc/locale/_wcstol.h
Normal file
149
lib/libc/locale/_wcstol.h
Normal file
@ -0,0 +1,149 @@
|
|||||||
|
/* $NetBSD: _wcstol.h,v 1.1 2003/03/11 09:21:23 tshiozak Exp $ */
|
||||||
|
|
||||||
|
/*-
|
||||||
|
* Copyright (c) 1990, 1993
|
||||||
|
* The Regents of the University of California. All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* 3. All advertising materials mentioning features or use of this software
|
||||||
|
* must display the following acknowledgement:
|
||||||
|
* This product includes software developed by the University of
|
||||||
|
* California, Berkeley and its contributors.
|
||||||
|
* 4. Neither the name of the University nor the names of its contributors
|
||||||
|
* may be used to endorse or promote products derived from this software
|
||||||
|
* without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||||
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||||
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||||
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||||
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||||
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*
|
||||||
|
* Original version ID:
|
||||||
|
* @(#)strtol.c 8.1 (Berkeley) 6/4/93
|
||||||
|
* NetBSD: wcstol.c,v 1.1 2001/09/27 16:30:36 yamt Exp
|
||||||
|
* Citrus: xpg4dl/FreeBSD/lib/libc/locale/wcstol.c,v 1.2 2001/09/21 16:11:41 yamt Exp
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* function template for wcstol, wcstoll and wcstoimax.
|
||||||
|
*
|
||||||
|
* parameters:
|
||||||
|
* _FUNCNAME : function name
|
||||||
|
* __INT : return type
|
||||||
|
* __INT_MIN : lower limit of the return type
|
||||||
|
* __INT_MAX : upper limit of the return type
|
||||||
|
*/
|
||||||
|
|
||||||
|
__INT
|
||||||
|
_FUNCNAME(nptr, endptr, base)
|
||||||
|
const wchar_t *nptr;
|
||||||
|
wchar_t **endptr;
|
||||||
|
int base;
|
||||||
|
{
|
||||||
|
const wchar_t *s;
|
||||||
|
__INT acc, cutoff;
|
||||||
|
wint_t wc;
|
||||||
|
int i;
|
||||||
|
int neg, any, cutlim;
|
||||||
|
|
||||||
|
_DIAGASSERT(nptr != NULL);
|
||||||
|
/* endptr may be NULL */
|
||||||
|
|
||||||
|
#ifdef __GNUC__
|
||||||
|
(void)&acc; (void)&cutoff;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* check base value */
|
||||||
|
if (base && (base < 2 || base > 36)) {
|
||||||
|
errno = EINVAL;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Skip white space and pick up leading +/- sign if any.
|
||||||
|
* If base is 0, allow 0x for hex and 0 for octal, else
|
||||||
|
* assume decimal; if base is already 16, allow 0x.
|
||||||
|
*/
|
||||||
|
s = nptr;
|
||||||
|
do {
|
||||||
|
wc = (wchar_t) *s++;
|
||||||
|
} while (iswspace(wc));
|
||||||
|
if (wc == L'-') {
|
||||||
|
neg = 1;
|
||||||
|
wc = *s++;
|
||||||
|
} else {
|
||||||
|
neg = 0;
|
||||||
|
if (wc == L'+')
|
||||||
|
wc = *s++;
|
||||||
|
}
|
||||||
|
if ((base == 0 || base == 16) &&
|
||||||
|
wc == L'0' && (*s == L'x' || *s == L'X')) {
|
||||||
|
wc = s[1];
|
||||||
|
s += 2;
|
||||||
|
base = 16;
|
||||||
|
}
|
||||||
|
if (base == 0)
|
||||||
|
base = wc == L'0' ? 8 : 10;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* See strtol for comments as to the logic used.
|
||||||
|
*/
|
||||||
|
cutoff = neg ? __INT_MIN : __INT_MAX;
|
||||||
|
cutlim = (int)(cutoff % base);
|
||||||
|
cutoff /= base;
|
||||||
|
if (neg) {
|
||||||
|
if (cutlim > 0) {
|
||||||
|
cutlim -= base;
|
||||||
|
cutoff += 1;
|
||||||
|
}
|
||||||
|
cutlim = -cutlim;
|
||||||
|
}
|
||||||
|
for (acc = 0, any = 0;; wc = (wchar_t) *s++) {
|
||||||
|
i = __wctoint(wc);
|
||||||
|
if (i == -1)
|
||||||
|
break;
|
||||||
|
if (i >= base)
|
||||||
|
break;
|
||||||
|
if (any < 0)
|
||||||
|
continue;
|
||||||
|
if (neg) {
|
||||||
|
if (acc < cutoff || (acc == cutoff && i > cutlim)) {
|
||||||
|
any = -1;
|
||||||
|
acc = __INT_MIN;
|
||||||
|
errno = ERANGE;
|
||||||
|
} else {
|
||||||
|
any = 1;
|
||||||
|
acc *= base;
|
||||||
|
acc -= i;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (acc > cutoff || (acc == cutoff && i > cutlim)) {
|
||||||
|
any = -1;
|
||||||
|
acc = __INT_MAX;
|
||||||
|
errno = ERANGE;
|
||||||
|
} else {
|
||||||
|
any = 1;
|
||||||
|
acc *= base;
|
||||||
|
acc += i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (endptr != 0)
|
||||||
|
/* LINTED interface specification */
|
||||||
|
*endptr = (wchar_t *)(any ? s - 1 : nptr);
|
||||||
|
return (acc);
|
||||||
|
}
|
||||||
125
lib/libc/locale/_wcstoul.h
Normal file
125
lib/libc/locale/_wcstoul.h
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
/* $NetBSD: _wcstoul.h,v 1.1 2003/03/11 09:21:23 tshiozak Exp $ */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (c) 1990, 1993
|
||||||
|
* The Regents of the University of California. All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* 3. All advertising materials mentioning features or use of this software
|
||||||
|
* must display the following acknowledgement:
|
||||||
|
* This product includes software developed by the University of
|
||||||
|
* California, Berkeley and its contributors.
|
||||||
|
* 4. Neither the name of the University nor the names of its contributors
|
||||||
|
* may be used to endorse or promote products derived from this software
|
||||||
|
* without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||||
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||||
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||||
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||||
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||||
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*
|
||||||
|
* Original version ID:
|
||||||
|
* @(#)strtoul.c 8.1 (Berkeley) 6/4/93
|
||||||
|
* Citrus: xpg4dl/FreeBSD/lib/libc/locale/wcstoul.c,v 1.2 2001/09/21 16:11:41 yamt Exp
|
||||||
|
* NetBSD: wcstoul.c,v 1.1 2001/09/27 16:30:37 yamt Exp
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* function template for wcstoul, wcstoull and wcstoumax.
|
||||||
|
*
|
||||||
|
* parameters:
|
||||||
|
* _FUNCNAME : function name
|
||||||
|
* __UINT : return type
|
||||||
|
* __UINT_MAX : upper limit of the return type
|
||||||
|
*/
|
||||||
|
|
||||||
|
__UINT
|
||||||
|
_FUNCNAME(nptr, endptr, base)
|
||||||
|
const wchar_t *nptr;
|
||||||
|
wchar_t **endptr;
|
||||||
|
int base;
|
||||||
|
{
|
||||||
|
const wchar_t *s;
|
||||||
|
__UINT acc, cutoff;
|
||||||
|
wint_t wc;
|
||||||
|
int i;
|
||||||
|
int neg, any, cutlim;
|
||||||
|
|
||||||
|
_DIAGASSERT(nptr != NULL);
|
||||||
|
/* endptr may be NULL */
|
||||||
|
|
||||||
|
if (base && (base < 2 || base > 36)) {
|
||||||
|
errno = EINVAL;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Skip white space and pick up leading +/- sign if any.
|
||||||
|
* If base is 0, allow 0x for hex and 0 for octal, else
|
||||||
|
* assume decimal; if base is already 16, allow 0x.
|
||||||
|
*/
|
||||||
|
s = nptr;
|
||||||
|
do {
|
||||||
|
wc = (wchar_t) *s++;
|
||||||
|
} while (iswspace(wc));
|
||||||
|
if (wc == L'-') {
|
||||||
|
neg = 1;
|
||||||
|
wc = *s++;
|
||||||
|
} else {
|
||||||
|
neg = 0;
|
||||||
|
if (wc == L'+')
|
||||||
|
wc = *s++;
|
||||||
|
}
|
||||||
|
if ((base == 0 || base == 16) &&
|
||||||
|
wc == L'0' && (*s == L'x' || *s == L'X')) {
|
||||||
|
wc = s[1];
|
||||||
|
s += 2;
|
||||||
|
base = 16;
|
||||||
|
}
|
||||||
|
if (base == 0)
|
||||||
|
base = wc == L'0' ? 8 : 10;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* See strtoul for comments as to the logic used.
|
||||||
|
*/
|
||||||
|
cutoff = __UINT_MAX / (__UINT)base;
|
||||||
|
cutlim = (int)(__UINT_MAX % (__UINT)base);
|
||||||
|
for (acc = 0, any = 0;; wc = (wchar_t) *s++) {
|
||||||
|
i = __wctoint(wc);
|
||||||
|
if (i == (wint_t)-1)
|
||||||
|
break;
|
||||||
|
if (i >= base)
|
||||||
|
break;
|
||||||
|
if (any < 0)
|
||||||
|
continue;
|
||||||
|
if (acc > cutoff || (acc == cutoff && i > cutlim)) {
|
||||||
|
any = -1;
|
||||||
|
acc = __UINT_MAX;
|
||||||
|
errno = ERANGE;
|
||||||
|
} else {
|
||||||
|
any = 1;
|
||||||
|
acc *= (__UINT)base;
|
||||||
|
acc += i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (neg && any > 0)
|
||||||
|
acc = -acc;
|
||||||
|
if (endptr != 0)
|
||||||
|
/* LINTED interface specification */
|
||||||
|
*endptr = (wchar_t *)(any ? s - 1 : nptr);
|
||||||
|
return (acc);
|
||||||
|
}
|
||||||
24
lib/libc/locale/wcstoimax.c
Normal file
24
lib/libc/locale/wcstoimax.c
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
/* $NetBSD: wcstoimax.c,v 1.1 2003/03/11 09:21:23 tshiozak Exp $ */
|
||||||
|
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
|
__RCSID("$NetBSD: wcstoimax.c,v 1.1 2003/03/11 09:21:23 tshiozak Exp $");
|
||||||
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <inttypes.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <wchar.h>
|
||||||
|
#include <wctype.h>
|
||||||
|
|
||||||
|
#include "__wctoint.h"
|
||||||
|
|
||||||
|
#define _FUNCNAME wcstoimax
|
||||||
|
#define __INT intmax_t
|
||||||
|
#define __INT_MIN INTMAX_MIN
|
||||||
|
#define __INT_MAX INTMAX_MAX
|
||||||
|
|
||||||
|
#include "_wcstol.h"
|
||||||
@ -1,46 +1,8 @@
|
|||||||
/* $NetBSD: wcstol.c,v 1.1 2001/09/27 16:30:36 yamt Exp $ */
|
/* $NetBSD: wcstol.c,v 1.2 2003/03/11 09:21:23 tshiozak Exp $ */
|
||||||
/* $Citrus: xpg4dl/FreeBSD/lib/libc/locale/wcstol.c,v 1.2 2001/09/21 16:11:41 yamt Exp $ */
|
|
||||||
|
|
||||||
/*-
|
|
||||||
* Copyright (c) 1990, 1993
|
|
||||||
* The Regents of the University of California. All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* 3. All advertising materials mentioning features or use of this software
|
|
||||||
* must display the following acknowledgement:
|
|
||||||
* This product includes software developed by the University of
|
|
||||||
* California, Berkeley and its contributors.
|
|
||||||
* 4. Neither the name of the University nor the names of its contributors
|
|
||||||
* may be used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
||||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
||||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
||||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||||
* SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
#if defined(LIBC_SCCS) && !defined(lint)
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
#if 0
|
__RCSID("$NetBSD: wcstol.c,v 1.2 2003/03/11 09:21:23 tshiozak Exp $");
|
||||||
static char sccsid[] = "@(#)strtol.c 8.1 (Berkeley) 6/4/93";
|
|
||||||
#else
|
|
||||||
__RCSID("$NetBSD: wcstol.c,v 1.1 2001/09/27 16:30:36 yamt Exp $");
|
|
||||||
#endif
|
|
||||||
#endif /* LIBC_SCCS and not lint */
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
@ -53,115 +15,9 @@ __RCSID("$NetBSD: wcstol.c,v 1.1 2001/09/27 16:30:36 yamt Exp $");
|
|||||||
|
|
||||||
#include "__wctoint.h"
|
#include "__wctoint.h"
|
||||||
|
|
||||||
/*
|
#define _FUNCNAME wcstol
|
||||||
* Convert a wide-char string to a long integer.
|
#define __INT long
|
||||||
*/
|
#define __INT_MIN LONG_MIN
|
||||||
long
|
#define __INT_MAX LONG_MAX
|
||||||
wcstol(nptr, endptr, base)
|
|
||||||
const wchar_t *nptr;
|
|
||||||
wchar_t **endptr;
|
|
||||||
int base;
|
|
||||||
{
|
|
||||||
const wchar_t *s;
|
|
||||||
long acc, cutoff;
|
|
||||||
wint_t wc;
|
|
||||||
int i;
|
|
||||||
int neg, any, cutlim;
|
|
||||||
|
|
||||||
_DIAGASSERT(nptr != NULL);
|
#include "_wcstol.h"
|
||||||
/* endptr may be NULL */
|
|
||||||
|
|
||||||
/* check base value */
|
|
||||||
if (base && (base < 2 || base > 36)) {
|
|
||||||
errno = EINVAL;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Skip white space and pick up leading +/- sign if any.
|
|
||||||
* If base is 0, allow 0x for hex and 0 for octal, else
|
|
||||||
* assume decimal; if base is already 16, allow 0x.
|
|
||||||
*/
|
|
||||||
s = nptr;
|
|
||||||
do {
|
|
||||||
wc = (wchar_t) *s++;
|
|
||||||
} while (iswspace(wc));
|
|
||||||
if (wc == L'-') {
|
|
||||||
neg = 1;
|
|
||||||
wc = *s++;
|
|
||||||
} else {
|
|
||||||
neg = 0;
|
|
||||||
if (wc == L'+')
|
|
||||||
wc = *s++;
|
|
||||||
}
|
|
||||||
if ((base == 0 || base == 16) &&
|
|
||||||
wc == L'0' && (*s == L'x' || *s == L'X')) {
|
|
||||||
wc = s[1];
|
|
||||||
s += 2;
|
|
||||||
base = 16;
|
|
||||||
}
|
|
||||||
if (base == 0)
|
|
||||||
base = wc == '0' ? 8 : 10;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Compute the cutoff value between legal numbers and illegal
|
|
||||||
* numbers. That is the largest legal value, divided by the
|
|
||||||
* base. An input number that is greater than this value, if
|
|
||||||
* followed by a legal input character, is too big. One that
|
|
||||||
* is equal to this value may be valid or not; the limit
|
|
||||||
* between valid and invalid numbers is then based on the last
|
|
||||||
* digit. For instance, if the range for longs is
|
|
||||||
* [-2147483648..2147483647] and the input base is 10,
|
|
||||||
* cutoff will be set to 214748364 and cutlim to either
|
|
||||||
* 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
|
|
||||||
* a value > 214748364, or equal but the next digit is > 7 (or 8),
|
|
||||||
* the number is too big, and we will return a range error.
|
|
||||||
*
|
|
||||||
* Set any if any `digits' consumed; make it negative to indicate
|
|
||||||
* overflow.
|
|
||||||
*/
|
|
||||||
cutoff = neg ? LONG_MIN : LONG_MAX;
|
|
||||||
cutlim = (int)(cutoff % base);
|
|
||||||
cutoff /= base;
|
|
||||||
if (neg) {
|
|
||||||
if (cutlim > 0) {
|
|
||||||
cutlim -= base;
|
|
||||||
cutoff += 1;
|
|
||||||
}
|
|
||||||
cutlim = -cutlim;
|
|
||||||
}
|
|
||||||
for (acc = 0, any = 0;; wc = (wchar_t) *s++) {
|
|
||||||
i = __wctoint(wc);
|
|
||||||
if (i == -1)
|
|
||||||
break;
|
|
||||||
if (i >= base)
|
|
||||||
break;
|
|
||||||
if (any < 0)
|
|
||||||
continue;
|
|
||||||
if (neg) {
|
|
||||||
if (acc < cutoff || (acc == cutoff && i > cutlim)) {
|
|
||||||
any = -1;
|
|
||||||
acc = LONG_MIN;
|
|
||||||
errno = ERANGE;
|
|
||||||
} else {
|
|
||||||
any = 1;
|
|
||||||
acc *= base;
|
|
||||||
acc -= i;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (acc > cutoff || (acc == cutoff && i > cutlim)) {
|
|
||||||
any = -1;
|
|
||||||
acc = LONG_MAX;
|
|
||||||
errno = ERANGE;
|
|
||||||
} else {
|
|
||||||
any = 1;
|
|
||||||
acc *= base;
|
|
||||||
acc += i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (endptr != 0)
|
|
||||||
/* LINTED interface specification */
|
|
||||||
*endptr = (wchar_t *)(any ? s - 1 : nptr);
|
|
||||||
return (acc);
|
|
||||||
}
|
|
||||||
|
|||||||
23
lib/libc/locale/wcstoll.c
Normal file
23
lib/libc/locale/wcstoll.c
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
/* $NetBSD: wcstoll.c,v 1.1 2003/03/11 09:21:23 tshiozak Exp $ */
|
||||||
|
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
|
__RCSID("$NetBSD: wcstoll.c,v 1.1 2003/03/11 09:21:23 tshiozak Exp $");
|
||||||
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <wchar.h>
|
||||||
|
#include <wctype.h>
|
||||||
|
|
||||||
|
#include "__wctoint.h"
|
||||||
|
|
||||||
|
#define _FUNCNAME wcstoll
|
||||||
|
#define __INT /* LONGLONG */ long long int
|
||||||
|
#define __INT_MIN LLONG_MIN
|
||||||
|
#define __INT_MAX LLONG_MAX
|
||||||
|
|
||||||
|
#include "_wcstol.h"
|
||||||
@ -1,46 +1,8 @@
|
|||||||
/* $NetBSD: wcstoul.c,v 1.1 2001/09/27 16:30:37 yamt Exp $ */
|
/* $NetBSD: wcstoul.c,v 1.2 2003/03/11 09:21:24 tshiozak Exp $ */
|
||||||
/* $Citrus: xpg4dl/FreeBSD/lib/libc/locale/wcstoul.c,v 1.2 2001/09/21 16:11:41 yamt Exp $ */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (c) 1990, 1993
|
|
||||||
* The Regents of the University of California. All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* 3. All advertising materials mentioning features or use of this software
|
|
||||||
* must display the following acknowledgement:
|
|
||||||
* This product includes software developed by the University of
|
|
||||||
* California, Berkeley and its contributors.
|
|
||||||
* 4. Neither the name of the University nor the names of its contributors
|
|
||||||
* may be used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
||||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
||||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
||||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||||
* SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
#if defined(LIBC_SCCS) && !defined(lint)
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
#if 0
|
__RCSID("$NetBSD: wcstoul.c,v 1.2 2003/03/11 09:21:24 tshiozak Exp $");
|
||||||
static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93";
|
|
||||||
#else
|
|
||||||
__RCSID("$NetBSD: wcstoul.c,v 1.1 2001/09/27 16:30:37 yamt Exp $");
|
|
||||||
#endif
|
|
||||||
#endif /* LIBC_SCCS and not lint */
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
@ -53,78 +15,8 @@ __RCSID("$NetBSD: wcstoul.c,v 1.1 2001/09/27 16:30:37 yamt Exp $");
|
|||||||
|
|
||||||
#include "__wctoint.h"
|
#include "__wctoint.h"
|
||||||
|
|
||||||
/*
|
#define _FUNCNAME wcstoul
|
||||||
* Convert a wide-char string to an unsigned long integer.
|
#define __UINT unsigned long
|
||||||
*/
|
#define __UINT_MAX ULONG_MAX
|
||||||
unsigned long
|
|
||||||
wcstoul(nptr, endptr, base)
|
|
||||||
const wchar_t *nptr;
|
|
||||||
wchar_t **endptr;
|
|
||||||
int base;
|
|
||||||
{
|
|
||||||
const wchar_t *s;
|
|
||||||
unsigned long acc, cutoff;
|
|
||||||
wint_t wc;
|
|
||||||
int i;
|
|
||||||
int neg, any, cutlim;
|
|
||||||
|
|
||||||
_DIAGASSERT(nptr != NULL);
|
#include "_wcstoul.h"
|
||||||
/* endptr may be NULL */
|
|
||||||
|
|
||||||
/* check base value */
|
|
||||||
if (base && (base < 2 || base > 36)) {
|
|
||||||
errno = EINVAL;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* See strtol for comments as to the logic used.
|
|
||||||
*/
|
|
||||||
s = nptr;
|
|
||||||
do {
|
|
||||||
wc = (wchar_t) *s++;
|
|
||||||
} while (iswspace(wc));
|
|
||||||
if (wc == L'-') {
|
|
||||||
neg = 1;
|
|
||||||
wc = *s++;
|
|
||||||
} else {
|
|
||||||
neg = 0;
|
|
||||||
if (wc == L'+')
|
|
||||||
wc = *s++;
|
|
||||||
}
|
|
||||||
if ((base == 0 || base == 16) &&
|
|
||||||
wc == L'0' && (*s == L'x' || *s == L'X')) {
|
|
||||||
wc = s[1];
|
|
||||||
s += 2;
|
|
||||||
base = 16;
|
|
||||||
}
|
|
||||||
if (base == 0)
|
|
||||||
base = wc == L'0' ? 8 : 10;
|
|
||||||
|
|
||||||
cutoff = ULONG_MAX / (unsigned long)base;
|
|
||||||
cutlim = (int)(ULONG_MAX % (unsigned long)base);
|
|
||||||
for (acc = 0, any = 0;; wc = (wchar_t) *s++) {
|
|
||||||
i = __wctoint(wc);
|
|
||||||
if (i == (wint_t)-1)
|
|
||||||
break;
|
|
||||||
if (i >= base)
|
|
||||||
break;
|
|
||||||
if (any < 0)
|
|
||||||
continue;
|
|
||||||
if (acc > cutoff || (acc == cutoff && i > cutlim)) {
|
|
||||||
any = -1;
|
|
||||||
acc = ULONG_MAX;
|
|
||||||
errno = ERANGE;
|
|
||||||
} else {
|
|
||||||
any = 1;
|
|
||||||
acc *= (unsigned long)base;
|
|
||||||
acc += i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (neg && any > 0)
|
|
||||||
acc = -acc;
|
|
||||||
if (endptr != 0)
|
|
||||||
/* LINTED interface specification */
|
|
||||||
*endptr = (wchar_t *)(any ? s - 1 : nptr);
|
|
||||||
return (acc);
|
|
||||||
}
|
|
||||||
|
|||||||
22
lib/libc/locale/wcstoull.c
Normal file
22
lib/libc/locale/wcstoull.c
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
/* $NetBSD: wcstoull.c,v 1.1 2003/03/11 09:21:24 tshiozak Exp $ */
|
||||||
|
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
|
__RCSID("$NetBSD: wcstoull.c,v 1.1 2003/03/11 09:21:24 tshiozak Exp $");
|
||||||
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <wchar.h>
|
||||||
|
#include <wctype.h>
|
||||||
|
|
||||||
|
#include "__wctoint.h"
|
||||||
|
|
||||||
|
#define _FUNCNAME wcstoull
|
||||||
|
#define __UINT /* LONGLONG */ unsigned long long int
|
||||||
|
#define __UINT_MAX ULLONG_MAX
|
||||||
|
|
||||||
|
#include "_wcstoul.h"
|
||||||
23
lib/libc/locale/wcstoumax.c
Normal file
23
lib/libc/locale/wcstoumax.c
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
/* $NetBSD: wcstoumax.c,v 1.1 2003/03/11 09:21:24 tshiozak Exp $ */
|
||||||
|
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
|
__RCSID("$NetBSD: wcstoumax.c,v 1.1 2003/03/11 09:21:24 tshiozak Exp $");
|
||||||
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <inttypes.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <wchar.h>
|
||||||
|
#include <wctype.h>
|
||||||
|
|
||||||
|
#include "__wctoint.h"
|
||||||
|
|
||||||
|
#define _FUNCNAME wcstoumax
|
||||||
|
#define __UINT uintmax_t
|
||||||
|
#define __UINT_MAX UINTMAX_MAX
|
||||||
|
|
||||||
|
#include "_wcstoul.h"
|
||||||
Loading…
Reference in New Issue
Block a user