Don't implement strtoul() on top of strtoull() as strtoull() is much bigger and only used on linux currently. Also put it in a separate object so it won't get linked in.
Signed-off-by: Piotr Jaroszyński <[email protected]> --- src/core/strtoull.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/include/stdlib.h | 2 + 2 files changed, 70 insertions(+), 0 deletions(-) create mode 100644 src/core/strtoull.c diff --git a/src/core/strtoull.c b/src/core/strtoull.c new file mode 100644 index 0000000..d92c167 --- /dev/null +++ b/src/core/strtoull.c @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2006 Michael Brown <[email protected]> + * Copyright (C) 2010 Piotr Jaroszyński <[email protected]> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +FILE_LICENCE ( GPL2_OR_LATER ); + +#include <stdlib.h> +#include <ctype.h> + +/* + * Despite being exactly the same as strtoul() except the long long instead of + * long it ends up being much bigger so provide a separate implementation in a + * separate object so that it won't be linked in if not used. + */ +unsigned long long strtoull ( const char *p, char **endp, int base ) { + unsigned long long ret = 0; + unsigned int charval; + + while ( isspace ( *p ) ) + p++; + + if ( base == 0 ) { + base = 10; + if ( *p == '0' ) { + p++; + base = 8; + if ( ( *p | 0x20 ) == 'x' ) { + p++; + base = 16; + } + } + } + + while ( 1 ) { + charval = *p; + if ( charval >= 'a' ) { + charval = ( charval - 'a' + 10 ); + } else if ( charval >= 'A' ) { + charval = ( charval - 'A' + 10 ); + } else if ( charval <= '9' ) { + charval = ( charval - '0' ); + } + if ( charval >= ( unsigned int ) base ) + break; + ret = ( ( ret * base ) + charval ); + p++; + } + + if ( endp ) + *endp = ( char * ) p; + + return ( ret ); +} diff --git a/src/include/stdlib.h b/src/include/stdlib.h index 254e39b..7c23972 100644 --- a/src/include/stdlib.h +++ b/src/include/stdlib.h @@ -14,6 +14,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); */ extern unsigned long strtoul ( const char *p, char **endp, int base ); +extern unsigned long long strtoull ( const char *p, char **endp, int base ); + /***************************************************************************** * -- 1.7.1 _______________________________________________ gPXE-devel mailing list [email protected] http://etherboot.org/mailman/listinfo/gpxe-devel
