From 0e867af11e96c3963da9cc04034b33a3a30ba49f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 31 Jan 2011 16:25:13 +0000 Subject: 2011-01-31 Ralf Corsepius * libmisc/stringto/stringtoint.c, libmisc/stringto/stringtounsignedint.c, libmisc/stringto/stringtounsignedchar.c: Rework. --- cpukit/libmisc/stringto/stringtoint.c | 63 +++++++++++++++++++++++--- cpukit/libmisc/stringto/stringtounsignedchar.c | 58 +++++++++++++++++++++--- cpukit/libmisc/stringto/stringtounsignedint.c | 56 ++++++++++++++++++++--- 3 files changed, 158 insertions(+), 19 deletions(-) (limited to 'cpukit/libmisc') diff --git a/cpukit/libmisc/stringto/stringtoint.c b/cpukit/libmisc/stringto/stringtoint.c index c07748ab00..41cf3c288a 100644 --- a/cpukit/libmisc/stringto/stringtoint.c +++ b/cpukit/libmisc/stringto/stringtoint.c @@ -2,6 +2,8 @@ * COPYRIGHT (c) 2009. * On-Line Applications Research Corporation (OAR). * + * Copyright (c) 2011 Ralf Corsépius, Ulm, Germany. + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. @@ -13,12 +15,61 @@ #include "config.h" #endif +#include +#include +#include + +#include + /* * Instantiate an error checking wrapper for strtol (int) */ -#define STRING_TO_INTEGER -#define STRING_TO_TYPE int -#define STRING_TO_NAME rtems_string_to_int -#define STRING_TO_METHOD strtol -#define STRING_TO_MAX LONG_MAX -#include "stringto_template.h" + +rtems_status_code rtems_string_to_int ( + const char *s, + int *n, + char **endptr, + int base +) +{ + long result; + char *end; + + if ( !n ) + return RTEMS_INVALID_ADDRESS; + + errno = 0; + *n = 0; + + result = strtol( s, &end, base ); + + if ( endptr ) + *endptr = end; + + if ( end == s ) + return RTEMS_NOT_DEFINED; + + if ( (result == LONG_MAX) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + if ( (result == LONG_MIN) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + +#if (INT_MAX < LONG_MAX) + if ( result > INT_MAX ) { + errno = ERANGE; + return RTEMS_INVALID_NUMBER; + } +#endif + +#if (INT_MIN < LONG_MIN) + if ( result < INT_MIN ) { + errno = ERANGE; + return RTEMS_INVALID_NUMBER; + } +#endif + + *n = result; + + return RTEMS_SUCCESSFUL; +} diff --git a/cpukit/libmisc/stringto/stringtounsignedchar.c b/cpukit/libmisc/stringto/stringtounsignedchar.c index e1f563b1af..6bd28c6494 100644 --- a/cpukit/libmisc/stringto/stringtounsignedchar.c +++ b/cpukit/libmisc/stringto/stringtounsignedchar.c @@ -2,6 +2,8 @@ * COPYRIGHT (c) 2009. * On-Line Applications Research Corporation (OAR). * + * Copyright (c) 2011 Ralf Corsépius, Ulm, Germany. + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. @@ -13,12 +15,54 @@ #include "config.h" #endif +#include +#include +#include + +#include + /* - * Instantiate an error checking wrapper for strtol (unsigned char) + * Instantiate an error checking wrapper for strtoul (unsigned char) */ -#define STRING_TO_INTEGER -#define STRING_TO_TYPE unsigned char -#define STRING_TO_NAME rtems_string_to_unsigned_char -#define STRING_TO_METHOD strtoul -#define STRING_TO_MAX ULONG_MAX -#include "stringto_template.h" + +rtems_status_code rtems_string_to_unsigned_char ( + const char *s, + unsigned char *n, + char **endptr, + int base +) +{ + unsigned long result; + char *end; + + if ( !n ) + return RTEMS_INVALID_ADDRESS; + + errno = 0; + *n = 0; + + result = strtoul( s, &end, base ); + + if ( endptr ) + *endptr = end; + + if ( end == s ) + return RTEMS_NOT_DEFINED; + + if ( (result == ULONG_MAX) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + if ( (result == 0) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + +#if (UCHAR_MAX < ULONG_MAX) + if ( result > UCHAR_MAX ) { + errno = ERANGE; + return RTEMS_INVALID_NUMBER; + } +#endif + + *n = result; + + return RTEMS_SUCCESSFUL; +} diff --git a/cpukit/libmisc/stringto/stringtounsignedint.c b/cpukit/libmisc/stringto/stringtounsignedint.c index 681a197d14..58baaa9c22 100644 --- a/cpukit/libmisc/stringto/stringtounsignedint.c +++ b/cpukit/libmisc/stringto/stringtounsignedint.c @@ -2,6 +2,8 @@ * COPYRIGHT (c) 2009. * On-Line Applications Research Corporation (OAR). * + * Copyright (c) 2011 Ralf Corsépius, Ulm, Germany. + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. @@ -13,12 +15,54 @@ #include "config.h" #endif +#include +#include +#include + +#include + /* * Instantiate an error checking wrapper for strtoul (unsigned int) */ -#define STRING_TO_INTEGER -#define STRING_TO_TYPE unsigned int -#define STRING_TO_NAME rtems_string_to_unsigned_int -#define STRING_TO_METHOD strtoul -#define STRING_TO_MAX ULONG_MAX -#include "stringto_template.h" + +rtems_status_code rtems_string_to_unsigned_int ( + const char *s, + unsigned int *n, + char **endptr, + int base +) +{ + unsigned long result; + char *end; + + if ( !n ) + return RTEMS_INVALID_ADDRESS; + + errno = 0; + *n = 0; + + result = strtoul( s, &end, base ); + + if ( endptr ) + *endptr = end; + + if ( end == s ) + return RTEMS_NOT_DEFINED; + + if ( (result == ULONG_MAX) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + if ( (result == 0) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + +#if (UINT_MAX < ULONG_MAX) + if ( result > UINT_MAX ) { + errno = ERANGE; + return RTEMS_INVALID_NUMBER; + } +#endif + + *n = result; + + return RTEMS_SUCCESSFUL; +} -- cgit v1.2.3