/* $Id$ */
-/* Release $Name$ */
-
/* _PDCLIB_strtox_prelim( const char *, char *, int * )
This file is part of the Public Domain C Library (PDCLib).
*/
#include <ctype.h>
+#include <stddef.h>
+#include <string.h>
const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base )
{
{
*base = 16;
++p;
+ /* catching a border case here: "0x" followed by a non-digit should
+ be parsed as the unprefixed zero.
+ We have to "rewind" the parsing; having the base set to 16 if it
+ was zero previously does not hurt, as the result is zero anyway.
+ */
+ if ( memchr( _PDCLIB_digits, tolower(*p), *base ) == NULL )
+ {
+ p -= 2;
+ }
}
else if ( *base == 0 )
{
{
*base = 10;
}
- return p;
+ return ( ( *base >= 2 ) && ( *base <= 36 ) ) ? p : NULL;
}
#ifdef TEST
#include <_PDCLIB_test.h>
-int main()
+int main( void )
{
int base = 0;
char sign = '\0';
char test1[] = " 123";
char test2[] = "\t+0123";
char test3[] = "\v-0x123";
- BEGIN_TESTS;
TESTCASE( _PDCLIB_strtox_prelim( test1, &sign, &base ) == &test1[2] );
TESTCASE( sign == '+' );
TESTCASE( base == 10 );
TESTCASE( _PDCLIB_strtox_prelim( test3, &sign, &base ) == &test3[2] );
TESTCASE( sign == '-' );
TESTCASE( base == 10 );
+ base = 1;
+ TESTCASE( _PDCLIB_strtox_prelim( test3, &sign, &base ) == NULL );
+ base = 37;
+ TESTCASE( _PDCLIB_strtox_prelim( test3, &sign, &base ) == NULL );
return TEST_RESULTS;
}