-/* $Id$ */
-
-/* Release $Name$ */
-
/* strtol( const char *, char * *, int )
This file is part of the Public Domain C Library (PDCLib).
#ifndef REGTEST
+#include <stdint.h>
+
long int strtol( const char * s, char ** endptr, int base )
{
long int rc;
char sign = '+';
const char * p = _PDCLIB_strtox_prelim( s, &sign, &base );
+ if ( base < 2 || base > 36 ) return 0;
if ( sign == '+' )
{
- rc = _PDCLIB_strtox_main( &p, base, LONG_MAX, LONG_MAX / base, LONG_MAX % base, &sign );
+ rc = (long int)_PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LONG_MAX, (uintmax_t)( LONG_MAX / base ), (int)( LONG_MAX % base ), &sign );
}
else
{
- /* FIXME: This breaks on some machines that round negatives wrongly */
- rc = _PDCLIB_strtox_main( &p, base, LONG_MIN, LONG_MIN / -base, -( LONG_MIN % base ), &sign );
+ rc = (long int)_PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LONG_MIN, (uintmax_t)( LONG_MIN / -base ), (int)( -( LONG_MIN % base ) ), &sign );
}
if ( endptr != NULL ) *endptr = ( p != NULL ) ? (char *) p : (char *) s;
return ( sign == '+' ) ? rc : -rc;
#endif
#ifdef TEST
-#include <_PDCLIB_test.h>
-
-#ifndef _PDCLIB_INT_H
-#define _PDCLIB_INT_H
-#include <_PDCLIB_int.h>
-#endif
+#include "_PDCLIB_test.h"
#include <errno.h>
-int main()
+int main( void )
{
char * endptr;
/* this, to base 36, overflows even a 256 bit integer */
char overflow[] = "-ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ_";
- BEGIN_TESTS;
+ /* tricky border case */
+ char tricky[] = "+0xz";
errno = 0;
/* basic functionality */
TESTCASE( strtol( "123", NULL, 10 ) == 123 );
/* proper detecting of default base 10 */
- TESTCASE( strtol( "123", NULL, 0 ) == 123 );
+ TESTCASE( strtol( "456", NULL, 0 ) == 456 );
/* proper functioning to smaller base */
TESTCASE( strtol( "14", NULL, 8 ) == 12 );
/* proper autodetecting of octal */
- TESTCASE( strtol( "014", NULL, 0 ) == 12 );
+ TESTCASE( strtol( "016", NULL, 0 ) == 14 );
/* proper autodetecting of hexadecimal, lowercase 'x' */
TESTCASE( strtol( "0xFF", NULL, 0 ) == 255 );
/* proper autodetecting of hexadecimal, uppercase 'X' */
- TESTCASE( strtol( "0XFF", NULL, 0 ) == 255 );
+ TESTCASE( strtol( "0Xa1", NULL, 0 ) == 161 );
+ /* proper handling of border case: 0x followed by non-hexdigit */
+ TESTCASE( strtol( tricky, &endptr, 0 ) == 0 );
+ TESTCASE( endptr == tricky + 2 );
+ /* proper handling of border case: 0 followed by non-octdigit */
+ TESTCASE( strtol( 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( strtol( " \n\v\t\f123", NULL, 0 ) == 123 );
+ TESTCASE( strtol( " \n\v\t\f789", NULL, 0 ) == 789 );
/* testing conversion failure */
TESTCASE( strtol( overflow, &endptr, 10 ) == 0 );
TESTCASE( endptr == overflow );
endptr = NULL;
TESTCASE( strtol( overflow, &endptr, 0 ) == 0 );
TESTCASE( endptr == overflow );
- /* These tests assume two-complement, but conversion should work for */
- /* one-complement and signed magnitude just as well. Anyone having a */
- /* platform to test this on? */
+ /* TODO: These tests assume two-complement, but conversion should work */
+ /* for one-complement and signed magnitude just as well. Anyone having */
+ /* a platform to test this on? */
errno = 0;
-#if _PDCLIB_LONG_BYTES == 4
+#if LONG_MAX >> 30 == 1
/* testing "even" overflow, i.e. base is power of two */
- TESTCASE( strtol( "0x7FFFFFFF", NULL, 0 ) == 0x7fffffff );
+ TESTCASE( strtol( "2147483647", NULL, 0 ) == 0x7fffffff );
TESTCASE( errno == 0 );
- TESTCASE( strtol( "0x80000000", NULL, 0 ) == LONG_MAX );
+ errno = 0;
+ TESTCASE( strtol( "2147483648", NULL, 0 ) == LONG_MAX );
TESTCASE( errno == ERANGE );
errno = 0;
- TESTCASE( strtol( "-0x7FFFFFFF", NULL, 0 ) == 0x80000001 );
+ TESTCASE( strtol( "-2147483647", NULL, 0 ) == (long)0x80000001 );
TESTCASE( errno == 0 );
- TESTCASE( strtol( "-0x80000000", NULL, 0 ) == LONG_MIN );
+ errno = 0;
+ TESTCASE( strtol( "-2147483648", NULL, 0 ) == LONG_MIN );
TESTCASE( errno == 0 );
- TESTCASE( strtol( "-0x80000001", NULL, 0 ) == LONG_MIN );
+ errno = 0;
+ TESTCASE( strtol( "-2147483649", NULL, 0 ) == LONG_MIN );
TESTCASE( errno == ERANGE );
/* TODO: test "odd" overflow, i.e. base is not power of two */
-#elif _PDCLIB_LONG_BYTES == 8
+#elif LONG_MAX >> 62 == 1
/* testing "even" overflow, i.e. base is power of two */
- TESTCASE( strtol( "0x7FFFFFFFFFFFFFFF", NULL, 0 ) == 0x7fffffffffffffff );
+ TESTCASE( strtol( "9223372036854775807", NULL, 0 ) == 0x7fffffffffffffff );
TESTCASE( errno == 0 );
- TESTCASE( strtol( "0x8000000000000000", NULL, 0 ) == LONG_MAX );
+ errno = 0;
+ TESTCASE( strtol( "9223372036854775808", NULL, 0 ) == LONG_MAX );
TESTCASE( errno == ERANGE );
errno = 0;
- TESTCASE( strtol( "-0x7FFFFFFFFFFFFFFF", NULL, 0 ) == -0x8000000000000001 );
+ TESTCASE( strtol( "-9223372036854775807", NULL, 0 ) == (long)0x8000000000000001 );
TESTCASE( errno == 0 );
- TESTCASE( strtol( "-0x8000000000000000", NULL, 0 ) == LONG_MIN );
+ errno = 0;
+ TESTCASE( strtol( "-9223372036854775808", NULL, 0 ) == LONG_MIN );
TESTCASE( errno == 0 );
- TESTCASE( strtol( "-0x8000000000000001", NULL, 0 ) == LONG_MIN );
+ errno = 0;
+ TESTCASE( strtol( "-9223372036854775809", NULL, 0 ) == LONG_MIN );
TESTCASE( errno == ERANGE );
/* TODO: test "odd" overflow, i.e. base is not power of two */
#else
projects / pdclib / blobdiff