* [PATCH 5/7] Importing strtoumax inttypes methods from FreeBSD.
@ 2017-07-24 19:35 Aditya Upadhyay
2017-07-24 22:35 ` Gedare Bloom
0 siblings, 1 reply; 3+ messages in thread
From: Aditya Upadhyay @ 2017-07-24 19:35 UTC (permalink / raw)
To: newlib; +Cc: Aditya Upadhyay
---
newlib/libc/stdlib/Makefile.am | 1 +
newlib/libc/stdlib/strtoumax.c | 138 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 139 insertions(+)
create mode 100644 newlib/libc/stdlib/strtoumax.c
diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
index 6cca5f005..c51f51f7f 100644
--- a/newlib/libc/stdlib/Makefile.am
+++ b/newlib/libc/stdlib/Makefile.am
@@ -63,6 +63,7 @@ GENERAL_SOURCES = \
strtol.c \
strtorx.c \
strtoul.c \
+ strtoumax.c \
utoa.c \
wcstod.c \
wcstol.c \
diff --git a/newlib/libc/stdlib/strtoumax.c b/newlib/libc/stdlib/strtoumax.c
new file mode 100644
index 000000000..240a6afed
--- /dev/null
+++ b/newlib/libc/stdlib/strtoumax.c
@@ -0,0 +1,138 @@
+/*-
+ * 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD: head/lib/libc/stdlib/strtoumax.c 251672 2013-06-13 00:19:30Z emaste $");
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <reent.h>
+#include "../locale/setlocale.h"
+
+/*
+ * Convert a string to a uintmax_t integer.
+ *
+ * Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+
+/*
+ *Reentrant version of strtoumax.
+ */
+uintmax_t
+_strtoumax_r(struct _reent *rptr, const char * __restrict nptr,
+ char ** __restrict endptr, int base, locale_t loc)
+{
+ const char *s = (const unsigned char *)nptr;
+ uintmax_t acc;
+ char c;
+ uintmax_t cutoff;
+ int neg = 0, any, cutlim;
+
+ /*
+ * See strtoimax for comments as to the logic used.
+ */
+ do {
+ c = *s++;
+ } while (isspace_l(c, loc));
+ if (c == '-') {
+ neg = 1;
+ c = *s++;
+ } else {
+ neg = 0;
+ if (c == '+')
+ c = *s++;
+ }
+ if ((base == 0 || base == 16) &&
+ c == '0' && (*s == 'x' || *s == 'X')) {
+ 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;
+ rptr->_errno = ERANGE;
+ } else if (!any) {
+noconv:
+ rptr->_errno = EINVAL;
+ } else if (neg)
+ acc = -acc;
+ if (endptr != NULL)
+ *endptr = (char *)(any ? s - 1 : nptr);
+ return (acc);
+}
+uintmax_t
+strtoumax_l(const char * __restrict nptr, char ** __restrict endptr, int base,
+ locale_t loc)
+{
+ return _strtoumax_r(_REENT, nptr, endptr, base, loc);
+}
+uintmax_t
+strtoumax(const char* __restrict nptr, char** __restrict endptr, int base)
+{
+ return _strtoumax_r(_REENT, nptr, endptr, base, __get_current_locale());
+}
--
2.13.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 5/7] Importing strtoumax inttypes methods from FreeBSD.
2017-07-24 19:35 [PATCH 5/7] Importing strtoumax inttypes methods from FreeBSD Aditya Upadhyay
@ 2017-07-24 22:35 ` Gedare Bloom
2017-07-25 12:54 ` Sebastian Huber
0 siblings, 1 reply; 3+ messages in thread
From: Gedare Bloom @ 2017-07-24 22:35 UTC (permalink / raw)
To: Aditya Upadhyay; +Cc: newlib
On Mon, Jul 24, 2017 at 3:35 PM, Aditya Upadhyay <aadit0402@gmail.com> wrote:
> ---
> newlib/libc/stdlib/Makefile.am | 1 +
> newlib/libc/stdlib/strtoumax.c | 138 +++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 139 insertions(+)
> create mode 100644 newlib/libc/stdlib/strtoumax.c
>
> diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
> index 6cca5f005..c51f51f7f 100644
> --- a/newlib/libc/stdlib/Makefile.am
> +++ b/newlib/libc/stdlib/Makefile.am
> @@ -63,6 +63,7 @@ GENERAL_SOURCES = \
> strtol.c \
> strtorx.c \
> strtoul.c \
> + strtoumax.c \
> utoa.c \
> wcstod.c \
> wcstol.c \
> diff --git a/newlib/libc/stdlib/strtoumax.c b/newlib/libc/stdlib/strtoumax.c
> new file mode 100644
> index 000000000..240a6afed
> --- /dev/null
> +++ b/newlib/libc/stdlib/strtoumax.c
> @@ -0,0 +1,138 @@
> +/*-
> + * 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 */
I doubt these 3 lines are needed.
> +#include <sys/cdefs.h>
> +__FBSDID("$FreeBSD: head/lib/libc/stdlib/strtoumax.c 251672 2013-06-13 00:19:30Z emaste $");
> +
> +#include <ctype.h>
> +#include <errno.h>
> +#include <stdlib.h>
> +#include <inttypes.h>
> +#include <stdint.h>
> +#include <reent.h>
> +#include "../locale/setlocale.h"
> +
> +/*
> + * Convert a string to a uintmax_t integer.
> + *
> + * Assumes that the upper and lower case
> + * alphabets and digits are each contiguous.
> + */
> +
> +/*
> + *Reentrant version of strtoumax.
> + */
> +uintmax_t
> +_strtoumax_r(struct _reent *rptr, const char * __restrict nptr,
> + char ** __restrict endptr, int base, locale_t loc)
> +{
> + const char *s = (const unsigned char *)nptr;
> + uintmax_t acc;
> + char c;
> + uintmax_t cutoff;
> + int neg = 0, any, cutlim;
> +
> + /*
> + * See strtoimax for comments as to the logic used.
> + */
> + do {
> + c = *s++;
> + } while (isspace_l(c, loc));
> + if (c == '-') {
> + neg = 1;
> + c = *s++;
> + } else {
> + neg = 0;
> + if (c == '+')
> + c = *s++;
> + }
> + if ((base == 0 || base == 16) &&
> + c == '0' && (*s == 'x' || *s == 'X')) {
> + 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;
> + rptr->_errno = ERANGE;
> + } else if (!any) {
> +noconv:
> + rptr->_errno = EINVAL;
> + } else if (neg)
> + acc = -acc;
> + if (endptr != NULL)
> + *endptr = (char *)(any ? s - 1 : nptr);
> + return (acc);
> +}
> +uintmax_t
> +strtoumax_l(const char * __restrict nptr, char ** __restrict endptr, int base,
> + locale_t loc)
> +{
> + return _strtoumax_r(_REENT, nptr, endptr, base, loc);
> +}
> +uintmax_t
> +strtoumax(const char* __restrict nptr, char** __restrict endptr, int base)
> +{
> + return _strtoumax_r(_REENT, nptr, endptr, base, __get_current_locale());
> +}
> --
> 2.13.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 5/7] Importing strtoumax inttypes methods from FreeBSD.
2017-07-24 22:35 ` Gedare Bloom
@ 2017-07-25 12:54 ` Sebastian Huber
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Huber @ 2017-07-25 12:54 UTC (permalink / raw)
To: newlib
On 25/07/17 00:35, Gedare Bloom wrote:
>> +#if defined(LIBC_SCCS) && !defined(lint)
>> +static char sccsid[] = "from @(#)strtoul.c 8.1 (Berkeley) 6/4/93";
>> +#endif /* LIBC_SCCS and not lint */
> I doubt these 3 lines are needed.
>
If they are in the original file and cause no harm in Newlib, then we
should still keep them.
--
Sebastian Huber, embedded brains GmbH
Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone : +49 89 189 47 41-16
Fax : +49 89 189 47 41-09
E-Mail : sebastian.huber@embedded-brains.de
PGP : Public key available on request.
Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-25 12:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-24 19:35 [PATCH 5/7] Importing strtoumax inttypes methods from FreeBSD Aditya Upadhyay
2017-07-24 22:35 ` Gedare Bloom
2017-07-25 12:54 ` Sebastian Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).