if ( base < 2 || base > 36 ) return 0;
if ( sign == '+' )
{
- rc = _PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LLONG_MAX, (uintmax_t)( LLONG_MAX / base ), (int)( LLONG_MAX % base ), &sign );
+ rc = (long long int)_PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LLONG_MAX, (uintmax_t)( LLONG_MAX / base ), (int)( LLONG_MAX % base ), &sign );
}
else
{
/* FIXME: This breaks on some machines that round negatives wrongly */
/* FIXME: Sign error not caught by testdriver */
- rc = _PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LLONG_MIN, (uintmax_t)( LLONG_MIN / -base ), (int)( -( LLONG_MIN % base ) ), &sign );
+ rc = (long long int)_PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LLONG_MIN, (uintmax_t)( LLONG_MIN / -base ), (int)( -( LLONG_MIN % base ) ), &sign );
}
if ( endptr != NULL ) *endptr = ( p != NULL ) ? (char *) p : (char *) s;
return ( sign == '+' ) ? rc : -rc;
char * endptr;
/* this, to base 36, overflows even a 256 bit integer */
char overflow[] = "-ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ_";
+ /* tricky border case */
+ char tricky[] = "+0xz";
errno = 0;
/* basic functionality */
TESTCASE( strtoll( "123", NULL, 10 ) == 123 );
/* proper detecting of default base 10 */
- TESTCASE( strtoll( "123", NULL, 0 ) == 123 );
+ TESTCASE( strtoll( "456", NULL, 0 ) == 456 );
/* proper functioning to smaller base */
TESTCASE( strtoll( "14", NULL, 8 ) == 12 );
/* proper autodetecting of octal */
- TESTCASE( strtoll( "014", NULL, 0 ) == 12 );
+ TESTCASE( strtoll( "016", NULL, 0 ) == 14 );
/* proper autodetecting of hexadecimal, lowercase 'x' */
TESTCASE( strtoll( "0xFF", NULL, 0 ) == 255 );
/* proper autodetecting of hexadecimal, uppercase 'X' */
- TESTCASE( strtoll( "0XFF", NULL, 0 ) == 255 );
+ TESTCASE( strtoll( "0Xa1", NULL, 0 ) == 161 );
+ /* proper handling of border case: 0x followed by non-hexdigit */
+ TESTCASE( strtoll( tricky, &endptr, 0 ) == 0 );
+ TESTCASE( endptr == tricky + 2 );
+ /* proper handling of border case: 0 followed by non-octdigit */
+ TESTCASE( strtoll( tricky, &endptr, 8 ) == 0 );
+ TESTCASE( endptr == tricky + 2 );
/* errno should still be 0 */
TESTCASE( errno == 0 );
/* overflowing subject sequence must still return proper endptr */
TESTCASE( errno == ERANGE );
TESTCASE( ( endptr - overflow ) == 53 );
/* testing skipping of leading whitespace */
- TESTCASE( strtoll( " \n\v\t\f123", NULL, 0 ) == 123 );
+ TESTCASE( strtoll( " \n\v\t\f789", NULL, 0 ) == 789 );
/* testing conversion failure */
TESTCASE( strtoll( overflow, &endptr, 10 ) == 0 );
TESTCASE( endptr == overflow );
#endif
return TEST_RESULTS;
}
+
#endif