Browse Source
- This change is split into two separate patches in order to simplify the history as interpreted by 'git'. The split is between the move/rename and addition of new files. - Remove dependency on toolchain C library headers and functions in order to ensure behavioural compatibility between toolchains. - Use FreeBSD as reference for C library implementation. - Do not let GCC use default library include paths. - Remove unused definitions in modified headers and implementations. - Move C library files to 'lib/stdlib' and 'include/stdlib'. - Break std.c functions out into separate files. Change-Id: I91cddfb3229775f770ad781589670c57d347a154pull/7/merge
Harry Liebel
11 years ago
committed by
Dan Handley
Dan Handley
17 changed files with 18 additions and 658 deletions
@ -1,106 +0,0 @@ |
|||
/*
|
|||
* Copyright (c) 2013, ARM Limited and Contributors. All rights reserved. |
|||
* |
|||
* Redistribution and use in source and binary forms, with or without |
|||
* modification, are permitted provided that the following conditions are met: |
|||
* |
|||
* Redistributions of source code must retain the above copyright notice, this |
|||
* list of conditions and the following disclaimer. |
|||
* |
|||
* 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. |
|||
* |
|||
* Neither the name of ARM 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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 <stdio.h> |
|||
#include <console.h> |
|||
|
|||
#if defined (__GNUC__) |
|||
|
|||
#include <stdio.h> |
|||
#include <stddef.h> /* size_t */ |
|||
#include <stdarg.h> /* va_list */ |
|||
|
|||
// Code from VTB.
|
|||
#include "mem.c" |
|||
|
|||
// Make mem functions that will operate on DEV mem. "memset_io"?
|
|||
|
|||
|
|||
//Code from VTB
|
|||
#include "strlen.c" |
|||
|
|||
int puts(const char *s) |
|||
{ |
|||
int count = 0; |
|||
while(*s) |
|||
{ |
|||
if (console_putc(*s++)) { |
|||
count++; |
|||
} else { |
|||
count = EOF; // -1 in stdio.h
|
|||
break; |
|||
} |
|||
} |
|||
return count; |
|||
} |
|||
|
|||
// From VTB
|
|||
#include "ctype.h" |
|||
#include "subr_prf.c" |
|||
|
|||
// Choose max of 128 chars for now.
|
|||
#define PRINT_BUFFER_SIZE 128 |
|||
int printf(const char *fmt, ...) |
|||
{ |
|||
va_list args; |
|||
va_start(args, fmt); |
|||
char buf[PRINT_BUFFER_SIZE]; |
|||
vsnprintf(buf, sizeof(buf) - 1, fmt, args); |
|||
buf[PRINT_BUFFER_SIZE - 1] = '\0'; |
|||
return puts(buf); |
|||
} |
|||
|
|||
|
|||
// I just made this up. Probably make it beter.
|
|||
void __assert_func (const char *file, int l, const char *func, const char *error) |
|||
{ |
|||
printf("ASSERT: %s <%d> : %s\n\r", func, l, error); |
|||
while(1); |
|||
} |
|||
|
|||
extern void __assert_fail (const char *assertion, const char *file, |
|||
unsigned int line, const char *function) |
|||
{ |
|||
printf("ASSERT: %s <%d> : %s\n\r", function, line, assertion); |
|||
while(1); |
|||
} |
|||
|
|||
|
|||
// I just made this up. Probably make it beter.
|
|||
void abort (void) |
|||
{ |
|||
printf("ABORT\n\r"); |
|||
while(1); |
|||
} |
|||
|
|||
|
|||
#else |
|||
#error "No standard library binding defined." |
|||
#endif |
|||
@ -1,47 +0,0 @@ |
|||
/*-
|
|||
* Copyright (c) 1990, 1993 |
|||
* The Regents of the University of California. All rights reserved. |
|||
* |
|||
* This code is derived from software contributed to Berkeley by |
|||
* Chris Torek. |
|||
* |
|||
* 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. |
|||
* 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. |
|||
*/ |
|||
|
|||
/*
|
|||
* Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved. |
|||
*/ |
|||
|
|||
/*
|
|||
* Compare strings. |
|||
*/ |
|||
int |
|||
strcmp(const char *s1, const char *s2) |
|||
{ |
|||
while (*s1 == *s2++) |
|||
if (*s1++ == '\0') |
|||
return (0); |
|||
return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1)); |
|||
} |
|||
@ -1,40 +0,0 @@ |
|||
/*
|
|||
* Copyright (c) 2013, ARM Limited and Contributors. All rights reserved. |
|||
* |
|||
* Redistribution and use in source and binary forms, with or without |
|||
* modification, are permitted provided that the following conditions are met: |
|||
* |
|||
* Redistributions of source code must retain the above copyright notice, this |
|||
* list of conditions and the following disclaimer. |
|||
* |
|||
* 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. |
|||
* |
|||
* Neither the name of ARM 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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 "ctype.h" |
|||
|
|||
/* Return pointer to the first non-space character */ |
|||
const char *skip_spaces(const char *str) |
|||
{ |
|||
while (isspace(*str)) |
|||
++str; |
|||
return str; |
|||
} |
|||
@ -1,50 +0,0 @@ |
|||
/*
|
|||
* Copyright (c) 1989, 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. |
|||
* 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. |
|||
*/ |
|||
|
|||
/*
|
|||
* Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved. |
|||
*/ |
|||
|
|||
#include "types.h" |
|||
|
|||
int |
|||
strncmp(const char *s1, const char *s2, size_t n) |
|||
{ |
|||
|
|||
if (n == 0) |
|||
return (0); |
|||
do { |
|||
if (*s1 != *s2++) |
|||
return (*(const unsigned char *)s1 - |
|||
*(const unsigned char *)(s2 - 1)); |
|||
if (*s1++ == '\0') |
|||
break; |
|||
} while (--n != 0); |
|||
return (0); |
|||
} |
|||
@ -1,60 +0,0 @@ |
|||
/*-
|
|||
* Copyright (c) 1990, 1993 |
|||
* The Regents of the University of California. All rights reserved. |
|||
* |
|||
* This code is derived from software contributed to Berkeley by |
|||
* Chris Torek. |
|||
* |
|||
* 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. |
|||
* 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. |
|||
*/ |
|||
|
|||
/*
|
|||
* Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved. |
|||
*/ |
|||
|
|||
#include "types.h" |
|||
|
|||
/*
|
|||
* Copy src to dst, truncating or null-padding to always copy n bytes. |
|||
* Return dst. |
|||
*/ |
|||
char * |
|||
strncpy(char *dst, const char *src, size_t n) |
|||
{ |
|||
if (n != 0) { |
|||
char *d = dst; |
|||
const char *s = src; |
|||
|
|||
do { |
|||
if ((*d++ = *s++) == '\0') { |
|||
/* NUL pad the remaining n-1 bytes */ |
|||
while (--n != 0) |
|||
*d++ = '\0'; |
|||
break; |
|||
} |
|||
} while (--n != 0); |
|||
} |
|||
return (dst); |
|||
} |
|||
@ -1,72 +0,0 @@ |
|||
/*-
|
|||
* 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. |
|||
* 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. |
|||
*/ |
|||
|
|||
/*
|
|||
* Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved. |
|||
*/ |
|||
|
|||
#include "types.h" |
|||
|
|||
/*
|
|||
* Get next token from string *stringp, where tokens are possibly-empty |
|||
* strings separated by characters from delim. |
|||
* |
|||
* Writes NULs into the string at *stringp to end tokens. |
|||
* delim need not remain constant from call to call. |
|||
* On return, *stringp points past the last NUL written (if there might |
|||
* be further tokens), or is NULL (if there are definitely no more tokens). |
|||
* |
|||
* If *stringp is NULL, strsep returns NULL. |
|||
*/ |
|||
char * |
|||
strsep(char **stringp, const char *delim) |
|||
{ |
|||
char *s; |
|||
const char *spanp; |
|||
int c, sc; |
|||
char *tok; |
|||
|
|||
if ((s = *stringp) == NULL) |
|||
return (NULL); |
|||
for (tok = s;;) { |
|||
c = *s++; |
|||
spanp = delim; |
|||
do { |
|||
if ((sc = *spanp++) == c) { |
|||
if (c == 0) |
|||
s = NULL; |
|||
else |
|||
s[-1] = 0; |
|||
*stringp = s; |
|||
return (tok); |
|||
} |
|||
} while (sc != 0); |
|||
} |
|||
/* NOTREACHED */ |
|||
} |
|||
@ -1,144 +0,0 @@ |
|||
/*-
|
|||
* Copyright (c) 1990, 1993 |
|||
* The Regents of the University of California. All rights reserved. |
|||
* |
|||
* This code is derived from software contributed to Berkeley by |
|||
* Chris Torek. |
|||
* |
|||
* 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. |
|||
* 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. |
|||
* |
|||
* From: @(#)strtol.c 8.1 (Berkeley) 6/4/93 |
|||
*/ |
|||
|
|||
/*
|
|||
* Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved. |
|||
*/ |
|||
|
|||
#include "types.h" |
|||
#include "ctype.h" |
|||
#include "limits.h" |
|||
|
|||
/*
|
|||
* Convert a string to a long integer. |
|||
* |
|||
* Ignores `locale' stuff. Assumes that the upper and lower case |
|||
* alphabets and digits are each contiguous. |
|||
*/ |
|||
static long |
|||
bsd_strtol(nptr, endptr, base) |
|||
const char *nptr; |
|||
char **endptr; |
|||
int base; |
|||
{ |
|||
const char *s = nptr; |
|||
unsigned long acc; |
|||
unsigned char c; |
|||
unsigned long cutoff; |
|||
int neg = 0, any, cutlim; |
|||
|
|||
/*
|
|||
* 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. |
|||
*/ |
|||
do { |
|||
c = *s++; |
|||
} while (isspace(c)); |
|||
if (c == '-') { |
|||
neg = 1; |
|||
c = *s++; |
|||
} else 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; |
|||
|
|||
/*
|
|||
* 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 ? -(unsigned long)LONG_MIN : LONG_MAX; |
|||
cutlim = cutoff % (unsigned long)base; |
|||
cutoff /= (unsigned long)base; |
|||
for (acc = 0, any = 0;; c = *s++) { |
|||
if (!isascii(c)) |
|||
break; |
|||
if (isdigit(c)) |
|||
c -= '0'; |
|||
else if (isalpha(c)) |
|||
c -= isupper(c) ? 'A' - 10 : '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 ? LONG_MIN : LONG_MAX; |
|||
} else if (neg) |
|||
acc = -acc; |
|||
if (endptr != 0) |
|||
*((const char **)endptr) = any ? s - 1 : nptr; |
|||
return (acc); |
|||
} |
|||
|
|||
int strict_strtol(const char *str, unsigned int base, long *result) |
|||
{ |
|||
if (*str == '-') |
|||
*result = 0 - bsd_strtol(str + 1, NULL, base); |
|||
else |
|||
*result = bsd_strtol(str, NULL, base); |
|||
return 0; |
|||
} |
|||
|
|||
int strict_strtoul(const char *str, unsigned int base, unsigned long *result) |
|||
{ |
|||
*result = bsd_strtol(str, NULL, base); |
|||
return 0; |
|||
} |
|||
@ -1,115 +0,0 @@ |
|||
/*-
|
|||
* Copyright (c) 1992, 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. |
|||
* 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. |
|||
*/ |
|||
|
|||
/*
|
|||
* Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved. |
|||
*/ |
|||
|
|||
#include "types.h" |
|||
#include "ctype.h" |
|||
#include "limits.h" |
|||
|
|||
/*
|
|||
* Convert a string to an unsigned long long integer. |
|||
* |
|||
* Assumes that the upper and lower case |
|||
* alphabets and digits are each contiguous. |
|||
*/ |
|||
static unsigned long long |
|||
bsd_strtoull(const char *nptr, char **endptr, int base) |
|||
{ |
|||
const char *s; |
|||
unsigned long long acc; |
|||
char c; |
|||
unsigned long long cutoff; |
|||
int neg, any, cutlim; |
|||
|
|||
/*
|
|||
* See strtoq for comments as to the logic used. |
|||
*/ |
|||
s = nptr; |
|||
do { |
|||
c = *s++; |
|||
} while (isspace((unsigned char)c)); |
|||
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; |
|||
|
|||
cutoff = ULLONG_MAX / base; |
|||
cutlim = ULLONG_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 = ULLONG_MAX; |
|||
} else if (neg) |
|||
acc = -acc; |
|||
if (endptr != NULL) |
|||
*endptr = (char *)(any ? s - 1 : nptr); |
|||
return (acc); |
|||
} |
|||
|
|||
int strict_strtoull(const char *str, unsigned int base, long long *result) |
|||
{ |
|||
*result = bsd_strtoull(str, NULL, base); |
|||
return 0; |
|||
} |
|||
Loading…
Reference in new issue