Proper testing of overflow digit handling.

diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c
index 05271e05054e8cc877b79eb94326c1a42a900987..ff5aa8b0cb791609f0bbe526248fd54d135b0825 100644 (file)
--- a/functions/stdlib/strtol.c
+++ b/functions/stdlib/strtol.c
@@ -90,30 +90,36 @@ int main( void )
     errno = 0;
 #if LONG_MAX == 0x7fffffffL
     /* 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 ) == (long)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 LONG_MAX == 0x7fffffffffffffffL
     /* 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 ) == (long)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

diff --git a/functions/stdlib/strtoll.c b/functions/stdlib/strtoll.c
index 8222d3442f39162ed928ffdc8c6bff8d12b34c9c..13a1a1de6cf609b27784b0b1262dd9bb76102d8f 100644 (file)
--- a/functions/stdlib/strtoll.c
+++ b/functions/stdlib/strtoll.c
@@ -26,7 +26,6 @@ long long int strtoll( const char * s, char ** endptr, int base )
     else
     {
         /* FIXME: This breaks on some machines that round negatives wrongly */
-        /* FIXME: Sign error not caught by testdriver */
         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;
@@ -91,30 +90,30 @@ int main( void )
     errno = 0;
 #if LLONG_MAX == 0x7fffffffffffffffLL
     /* testing "even" overflow, i.e. base is power of two */
-    TESTCASE( strtoll( "0x7FFFFFFFFFFFFFFF", NULL, 0 ) == 0x7fffffffffffffff );
+    TESTCASE( strtoll( "9223372036854775807", NULL, 0 ) == 0x7fffffffffffffff );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "0x8000000000000000", NULL, 0 ) == LLONG_MAX );
+    TESTCASE( strtoll( "9223372036854775808", NULL, 0 ) == LLONG_MAX );
     TESTCASE( errno == ERANGE );
     errno = 0;
-    TESTCASE( strtoll( "-0x7FFFFFFFFFFFFFFF", NULL, 0 ) == (long long)0x8000000000000001 );
+    TESTCASE( strtoll( "-9223372036854775807", NULL, 0 ) == (long long)0x8000000000000001 );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "-0x8000000000000000", NULL, 0 ) == LLONG_MIN );
+    TESTCASE( strtoll( "-9223372036854775808", NULL, 0 ) == LLONG_MIN );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "-0x8000000000000001", NULL, 0 ) == LLONG_MIN );
+    TESTCASE( strtoll( "-9223372036854775809", NULL, 0 ) == LLONG_MIN );
     TESTCASE( errno == ERANGE );
     /* TODO: test "odd" overflow, i.e. base is not power of two */
 #elif LLONG_MAX == 0x7fffffffffffffffffffffffffffffffLL
     /* testing "even" overflow, i.e. base is power of two */
-    TESTCASE( strtoll( "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", NULL, 0 ) == 0x7fffffffffffffffffffffffffffffff );
+    TESTCASE( strtoll( "170141183460469231731687303715884105728", NULL, 0 ) == 0x7fffffffffffffffffffffffffffffff );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "0x80000000000000000000000000000000", NULL, 0 ) == LLONG_MAX );
+    TESTCASE( strtoll( "170141183460469231731687303715884105729", NULL, 0 ) == LLONG_MAX );
     TESTCASE( errno == ERANGE );
     errno = 0;
-    TESTCASE( strtoll( "-0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", NULL, 0 ) == -0x80000000000000000000000000000001 );
+    TESTCASE( strtoll( "-170141183460469231731687303715884105728", NULL, 0 ) == -0x80000000000000000000000000000001 );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "-0x80000000000000000000000000000000", NULL, 0 ) == LLONG_MIN );
+    TESTCASE( strtoll( "-170141183460469231731687303715884105729", NULL, 0 ) == LLONG_MIN );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "-0x80000000000000000000000000000001", NULL, 0 ) == LLONG_MIN );
+    TESTCASE( strtoll( "-170141183460469231731687303715884105730", NULL, 0 ) == LLONG_MIN );
     TESTCASE( errno == ERANGE );
     /* TODO: test "odd" overflow, i.e. base is not power of two */
 #else