X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdlib%2Fstrtol.c;h=367b6789fdd44e75d53f048be3a17b3741951ad2;hb=598c0675c5229ecfd5a7aa31a9f02c392b9e1e9d;hp=085abbb612c074fcfcdf3595a29a216914718a9a;hpb=45f394553721285e7bc6187419613c33915cce21;p=pdclib diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c index 085abbb..367b678 100644 --- a/functions/stdlib/strtol.c +++ b/functions/stdlib/strtol.c @@ -25,7 +25,6 @@ long int strtol( const char * s, char ** endptr, int base ) } else { - /* FIXME: This breaks on some machines that round negatives wrongly */ 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; @@ -88,7 +87,7 @@ int main( void ) /* for one-complement and signed magnitude just as well. Anyone having */ /* a platform to test this on? */ errno = 0; -#if LONG_MAX == 0x7fffffffL +#if LONG_MAX >> 30 == 1 /* testing "even" overflow, i.e. base is power of two */ TESTCASE( strtol( "2147483647", NULL, 0 ) == 0x7fffffff ); TESTCASE( errno == 0 ); @@ -105,7 +104,7 @@ int main( void ) TESTCASE( strtol( "-2147483649", NULL, 0 ) == LONG_MIN ); TESTCASE( errno == ERANGE ); /* TODO: test "odd" overflow, i.e. base is not power of two */ -#elif LONG_MAX == 0x7fffffffffffffffL +#elif LONG_MAX >> 62 == 1 /* testing "even" overflow, i.e. base is power of two */ TESTCASE( strtol( "9223372036854775807", NULL, 0 ) == 0x7fffffffffffffff ); TESTCASE( errno == 0 );