From 301ee6e143634276eb82a5f05c576d694b121c8d Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 22 Aug 2017 17:51:40 +0200 Subject: Remove strtoimax() and strtoumax() This is now provided by Newlib. --- freebsd/lib/libc/stdlib/strtoimax.c | 165 ------------------------------------ freebsd/lib/libc/stdlib/strtoumax.c | 143 ------------------------------- libbsd.py | 2 - libbsd_waf.py | 2 - 4 files changed, 312 deletions(-) delete mode 100644 freebsd/lib/libc/stdlib/strtoimax.c delete mode 100644 freebsd/lib/libc/stdlib/strtoumax.c diff --git a/freebsd/lib/libc/stdlib/strtoimax.c b/freebsd/lib/libc/stdlib/strtoimax.c deleted file mode 100644 index e8a4f455..00000000 --- a/freebsd/lib/libc/stdlib/strtoimax.c +++ /dev/null @@ -1,165 +0,0 @@ -#include - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * Copyright (c) 2011 The FreeBSD Foundation - * All rights reserved. - * Portions of this software were developed by David Chisnall - * under sponsorship from the FreeBSD Foundation. - * - * 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. 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. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "from @(#)strtol.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#ifndef __rtems__ -#include "xlocale_private.h" -#else -#define locale_t void* -#define isspace_l(_c, _l) isspace(_c) -static void* __get_locale(void) { return NULL; } -#endif /* __rtems__ */ - -/* - * Convert a string to an intmax_t integer. - * - * Assumes that the upper and lower case - * alphabets and digits are each contiguous. - */ -intmax_t -strtoimax_l(const char * __restrict nptr, char ** __restrict endptr, int base, - locale_t locale) -{ - const char *s; - uintmax_t acc; - char c; - uintmax_t cutoff; - int neg, any, cutlim; -#ifndef __rtems__ - FIX_LOCALE(locale); -#else - locale = NULL; -#endif /* __rtems__ */ - - /* - * 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 { - c = *s++; - } while (isspace_l((unsigned char)c, locale)); - if (c == '-') { - neg = 1; - c = *s++; - } else { - neg = 0; - if (c == '+') - c = *s++; - } - if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X') && - ((s[1] >= '0' && s[1] <= '9') || - (s[1] >= 'A' && s[1] <= 'F') || - (s[1] >= 'a' && s[1] <= 'f'))) { - c = s[1]; - s += 2; - base = 16; - } - if (base == 0) - base = c == '0' ? 8 : 10; - acc = any = 0; - if (base < 2 || base > 36) - goto noconv; - - /* - * 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 intmax_t is - * [-9223372036854775808..9223372036854775807] and the input base - * is 10, cutoff will be set to 922337203685477580 and cutlim to - * either 7 (neg==0) or 8 (neg==1), meaning that if we have - * accumulated a value > 922337203685477580, 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 ? (uintmax_t)-(INTMAX_MIN + INTMAX_MAX) + INTMAX_MAX - : INTMAX_MAX; - cutlim = cutoff % base; - cutoff /= base; - for ( ; ; c = *s++) { - if (c >= '0' && c <= '9') - c -= '0'; - else if (c >= 'A' && c <= 'Z') - c -= 'A' - 10; - else if (c >= 'a' && c <= 'z') - c -= 'a' - 10; - else - break; - if (c >= base) - break; - if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) - any = -1; - else { - any = 1; - acc *= base; - acc += c; - } - } - if (any < 0) { - acc = neg ? INTMAX_MIN : INTMAX_MAX; - errno = ERANGE; - } else if (!any) { -noconv: - errno = EINVAL; - } else if (neg) - acc = -acc; - if (endptr != NULL) - *endptr = (char *)(any ? s - 1 : nptr); - return (acc); -} -intmax_t -strtoimax(const char * __restrict nptr, char ** __restrict endptr, int base) -{ - return strtoimax_l(nptr, endptr, base, __get_locale()); -} diff --git a/freebsd/lib/libc/stdlib/strtoumax.c b/freebsd/lib/libc/stdlib/strtoumax.c deleted file mode 100644 index e16dbf47..00000000 --- a/freebsd/lib/libc/stdlib/strtoumax.c +++ /dev/null @@ -1,143 +0,0 @@ -#include - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * Copyright (c) 2011 The FreeBSD Foundation - * All rights reserved. - * Portions of this software were developed by David Chisnall - * under sponsorship from the FreeBSD Foundation. - * - * 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. 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. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "from @(#)strtoul.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#ifndef __rtems__ -#include "xlocale_private.h" -#else -#define locale_t void* -#define isspace_l(_c, _l) isspace(_c) -static void* __get_locale(void) { return NULL; } -#endif /* __rtems__ */ - -/* - * Convert a string to a uintmax_t integer. - * - * Assumes that the upper and lower case - * alphabets and digits are each contiguous. - */ -uintmax_t -strtoumax_l(const char * __restrict nptr, char ** __restrict endptr, int base, - locale_t locale) -{ - const char *s; - uintmax_t acc; - char c; - uintmax_t cutoff; - int neg, any, cutlim; -#ifndef __rtems__ - FIX_LOCALE(locale); -#else - locale = NULL; -#endif /* __rtems__ */ - - /* - * See strtoimax for comments as to the logic used. - */ - s = nptr; - do { - c = *s++; - } while (isspace_l((unsigned char)c, locale)); - if (c == '-') { - neg = 1; - c = *s++; - } else { - neg = 0; - if (c == '+') - c = *s++; - } - if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X') && - ((s[1] >= '0' && s[1] <= '9') || - (s[1] >= 'A' && s[1] <= 'F') || - (s[1] >= 'a' && s[1] <= 'f'))) { - c = s[1]; - s += 2; - base = 16; - } - if (base == 0) - base = c == '0' ? 8 : 10; - acc = any = 0; - if (base < 2 || base > 36) - goto noconv; - - cutoff = UINTMAX_MAX / base; - cutlim = UINTMAX_MAX % base; - for ( ; ; c = *s++) { - if (c >= '0' && c <= '9') - c -= '0'; - else if (c >= 'A' && c <= 'Z') - c -= 'A' - 10; - else if (c >= 'a' && c <= 'z') - c -= 'a' - 10; - else - break; - if (c >= base) - break; - if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) - any = -1; - else { - any = 1; - acc *= base; - acc += c; - } - } - if (any < 0) { - acc = UINTMAX_MAX; - errno = ERANGE; - } else if (!any) { -noconv: - errno = EINVAL; - } else if (neg) - acc = -acc; - if (endptr != NULL) - *endptr = (char *)(any ? s - 1 : nptr); - return (acc); -} -uintmax_t -strtoumax(const char * __restrict nptr, char ** __restrict endptr, int base) -{ - return strtoumax_l(nptr, endptr, base, __get_locale()); -} diff --git a/libbsd.py b/libbsd.py index b2f3977d..3ba94cb5 100644 --- a/libbsd.py +++ b/libbsd.py @@ -2530,9 +2530,7 @@ def user_space(mm): 'lib/libc/rpc/svc_simple.c', 'lib/libc/rpc/svc_vc.c', 'lib/libc/stdio/fgetln.c', - 'lib/libc/stdlib/strtoimax.c', 'lib/libc/stdlib/strtonum.c', - 'lib/libc/stdlib/strtoumax.c', 'lib/libc/string/strsep.c', 'lib/libc/xdr/xdr_array.c', 'lib/libc/xdr/xdr.c', diff --git a/libbsd_waf.py b/libbsd_waf.py index 64c8af4d..2198cbf2 100644 --- a/libbsd_waf.py +++ b/libbsd_waf.py @@ -461,9 +461,7 @@ def build(bld): 'freebsd/lib/libc/rpc/svc_simple.c', 'freebsd/lib/libc/rpc/svc_vc.c', 'freebsd/lib/libc/stdio/fgetln.c', - 'freebsd/lib/libc/stdlib/strtoimax.c', 'freebsd/lib/libc/stdlib/strtonum.c', - 'freebsd/lib/libc/stdlib/strtoumax.c', 'freebsd/lib/libc/string/strsep.c', 'freebsd/lib/libc/xdr/xdr.c', 'freebsd/lib/libc/xdr/xdr_array.c', -- cgit v1.2.3