From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103135 invoked by alias); 2 Aug 2017 03:22:07 -0000 Mailing-List: contact newlib-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-owner@sourceware.org Received: (qmail 103076 invoked by uid 89); 2 Aug 2017 03:22:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=BAYES_00,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_BL_SPAMCOP_NET,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-pg0-f67.google.com Received: from mail-pg0-f67.google.com (HELO mail-pg0-f67.google.com) (74.125.83.67) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 02 Aug 2017 03:22:03 +0000 Received: by mail-pg0-f67.google.com with SMTP id 83so4987410pgb.4 for ; Tue, 01 Aug 2017 20:22:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xd0G9WBrlL7EcwST/y8l+IHL1B6tEqC/xYCyc2F/0gw=; b=t3IJ1YdnvfSw9Ts/I8nutxtXH2B6fynRJagH7CeyJAs+q4ywv8Nlp4veAnNZCh+pZ5 7TGFpKd3moIuGHeXudHXZHrrQi0z6QdheaA7eB3bfMXSJ37ls5jC0j+rnwupaKp0oY1z lU71NEQqIpd6hxwkv1490LBw1grmBcfeKLHZjeCm6dBOdL7bo+GMUPvrtu21CyEN7/eC u56THvLkSw77jTlPtsnpRX8fof8LIWvObUuaCqx5T6/bkKiP+0xirGoMelw5E71324yX 9WQN2fmYWPhieEFEMarzCMPWsZs97mXU6VIz7eGcJO4IYRarAWOvqGdP5uNIEM03KeKh QzDA== X-Gm-Message-State: AIVw112YOkT9yP5R+Kt8AyEBQgQp2RLwhaaXCUkIqCweq40E969hNKPz 6vJ/XqfoxCJ/wQ2E X-Received: by 10.84.196.1 with SMTP id k1mr16757818pld.137.1501644121127; Tue, 01 Aug 2017 20:22:01 -0700 (PDT) Received: from localhost.localdomain ([203.192.233.164]) by smtp.gmail.com with ESMTPSA id b84sm11908456pfj.128.2017.08.01.20.21.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Aug 2017 20:22:00 -0700 (PDT) From: Aditya Upadhyay To: newlib@sourceware.org Cc: Aditya Upadhyay Subject: [PATCH 4/4] Importing wcstoumax inttypes method from FreeBSD. Date: Wed, 02 Aug 2017 03:22:00 -0000 Message-Id: <1501644080-480-1-git-send-email-aadit0402@gmail.com> X-IsSubscribed: yes X-SW-Source: 2017/txt/msg00712.txt.bz2 --- newlib/libc/include/inttypes.h | 2 + newlib/libc/stdlib/Makefile.am | 1 + newlib/libc/stdlib/wcstoumax.c | 155 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 158 insertions(+) create mode 100644 newlib/libc/stdlib/wcstoumax.c diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/include/inttypes.h index 8ec05fb..694ba8f 100644 --- a/newlib/libc/include/inttypes.h +++ b/newlib/libc/include/inttypes.h @@ -329,11 +329,13 @@ extern uintmax_t _strtoumax_r(struct _reent *, const char *__restrict, char **__ extern intmax_t wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int); extern intmax_t _wcstoimax_r(struct _reent *, const wchar_t *__restrict, wchar_t **__restrict, int); extern uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int); +extern uintmax_t _wcstoumax_r(struct _reent *, const wchar_t *__restrict, wchar_t **__restrict, int); #if __BSD_VISIBLE extern intmax_t strtoimax_l(const char *__restrict, char **_restrict, int, locale_t); extern uintmax_t strtoumax_l(const char *__restrict, char **_restrict, int, locale_t); extern intmax_t wcstoimax_l(const wchar_t *__restrict, wchar_t **_restrict, int, locale_t); +extern uintmax_t wcstoumax_l(const wchar_t *__restrict, wchar_t **_restrict, int, locale_t); #endif #ifdef __cplusplus diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am index b687c0f..f9bab0b 100644 --- a/newlib/libc/stdlib/Makefile.am +++ b/newlib/libc/stdlib/Makefile.am @@ -69,6 +69,7 @@ GENERAL_SOURCES = \ wcstoimax.c \ wcstol.c \ wcstoul.c \ + wcstoumax.c \ wcstombs.c \ wcstombs_r.c \ wctomb.c \ diff --git a/newlib/libc/stdlib/wcstoumax.c b/newlib/libc/stdlib/wcstoumax.c new file mode 100644 index 0000000..d797c9c --- /dev/null +++ b/newlib/libc/stdlib/wcstoumax.c @@ -0,0 +1,155 @@ +/*- + * 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. + */ + +#include +#if 0 +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "from @(#)strtoul.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ +__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.8 2002/09/06 11:23:59 tjr Exp "); +#endif +__FBSDID("$FreeBSD: head/lib/libc/locale/wcstoumax.c 314436 2017-02-28 23:42:47Z imp $"); + +#include +#include +#include +#include +#include +#include +#include +#include "../locale/setlocale.h" + +/* + * Convert a wide character string to a uintmax_t integer. + */ + +/* + *Reentrant version of wcstoumax. + */ +static uintmax_t +_wcstoumax_l(struct _reent *rptr,const wchar_t * __restrict nptr, + wchar_t ** __restrict endptr, int base, locale_t loc) +{ + const wchar_t *s = nptr; + uintmax_t acc; + wchar_t c; + uintmax_t cutoff; + int neg = 0, any, cutlim; + + /* + * See strtoimax for comments as to the logic used. + */ + do { + c = *s++; + } while (iswspace_l(c, loc)); + if (c == L'-') { + neg = 1; + c = *s++; + } else { + neg = 0; + if (c == L'+') + c = *s++; + } + if ((base == 0 || base == 16) && + c == L'0' && (*s == L'x' || *s == L'X')) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == L'0' ? 8 : 10; + acc = any = 0; + if (base < 2 || base > 36) + goto noconv; + + cutoff = UINTMAX_MAX / base; + cutlim = UINTMAX_MAX % base; + for ( ; ; c = *s++) { +#ifdef notyet + if (iswdigit_l(c, loc)) + c = digittoint_l(c, loc); + else +#endif + if (c >= L'0' && c <= L'9') + c -= L'0'; + else if (c >= L'A' && c <= L'Z') + c -= L'A' - 10; + else if (c >= L'a' && c <= L'z') + c -= L'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; + rptr->_errno = ERANGE; + } else if (!any) { +noconv: + rptr->_errno = EINVAL; + } else if (neg) + acc = -acc; + if (endptr != NULL) + *endptr = (wchar_t *)(any ? s - 1 : nptr); + return (acc); +} +uintmax_t +_wcstoumax_r(struct _reent *rptr, const wchar_t *__restrict nptr, + wchar_t **__restrict endptr, int base) +{ + return _wcstoumax_l(rptr, nptr, endptr, base, __get_current_locale()); +} + +#ifndef _REENT_ONLY + +uintmax_t +wcstoumax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, + int base, locale_t loc) +{ + return _wcstoumax_l(_REENT, nptr, endptr, base, loc); +} +uintmax_t +wcstoumax(const wchar_t* __restrict nptr, wchar_t** __restrict endptr, int base) +{ + return _wcstoumax_l(_REENT, nptr, endptr, base, __get_current_locale()); +} + +#endif -- 2.7.4