Extended test drivers to cover sign error.

[pdclib] / functions / stdlib / strtoul.c

diff --git a/functions/stdlib/strtoul.c b/functions/stdlib/strtoul.c
index 415aadf3e7903c976794962dda5e4649956a4c1e..568029756b69af9267be04b790ad5a086f0ba4bc 100644 (file)
--- a/functions/stdlib/strtoul.c
+++ b/functions/stdlib/strtoul.c
@@ -19,7 +19,7 @@ unsigned long int strtoul( const char * s, char ** endptr, int base )
     char sign = '+';
     const char * p = _PDCLIB_strtox_prelim( s, &sign, &base );
     if ( base < 2 || base > 36 ) return 0;
-    rc = _PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)ULONG_MAX, (uintmax_t)( ULONG_MAX / base ), (uintmax_t)( ULONG_MAX % base ), &sign );
+    rc = (unsigned long int)_PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)ULONG_MAX, (uintmax_t)( ULONG_MAX / base ), (int)( ULONG_MAX % base ), &sign );
     if ( endptr != NULL ) *endptr = ( p != NULL ) ? (char *) p : (char *) s;
     return ( sign == '+' ) ? rc : -rc;
 }
@@ -35,19 +35,27 @@ int main( void )
     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( strtoul( "123", NULL, 10 ) == 123 );
     /* proper detecting of default base 10 */
-    TESTCASE( strtoul( "123", NULL, 0 ) == 123 );
+    TESTCASE( strtoul( "456", NULL, 0 ) == 456 );
     /* proper functioning to smaller base */
     TESTCASE( strtoul( "14", NULL, 8 ) == 12 );
     /* proper autodetecting of octal */
-    TESTCASE( strtoul( "014", NULL, 0 ) == 12 );
+    TESTCASE( strtoul( "016", NULL, 0 ) == 14 );
     /* proper autodetecting of hexadecimal, lowercase 'x' */
     TESTCASE( strtoul( "0xFF", NULL, 0 ) == 255 );
     /* proper autodetecting of hexadecimal, uppercase 'X' */
-    TESTCASE( strtoul( "0XFF", NULL, 0 ) == 255 );
+    TESTCASE( strtoul( "0Xa1", NULL, 0 ) == 161 );
+    /* proper handling of border case: 0x followed by non-hexdigit */
+    TESTCASE( strtoul( tricky, &endptr, 0 ) == 0 );
+    TESTCASE( endptr == tricky + 2 );
+    /* proper handling of border case: 0 followed by non-octdigit */
+    TESTCASE( strtoul( tricky, &endptr, 8 ) == 0 );
+    TESTCASE( endptr == tricky + 2 );
     /* errno should still be 0 */
     TESTCASE( errno == 0 );
     /* overflowing subject sequence must still return proper endptr */
@@ -60,13 +68,37 @@ int main( void )
     TESTCASE( errno == ERANGE );
     TESTCASE( ( endptr - overflow ) == 53 );
     /* testing skipping of leading whitespace */
-    TESTCASE( strtoul( " \n\v\t\f123", NULL, 0 ) == 123 );
+    TESTCASE( strtoul( " \n\v\t\f789", NULL, 0 ) == 789 );
     /* testing conversion failure */
     TESTCASE( strtoul( overflow, &endptr, 10 ) == 0 );
     TESTCASE( endptr == overflow );
     endptr = NULL;
     TESTCASE( strtoul( overflow, &endptr, 0 ) == 0 );
     TESTCASE( endptr == overflow );
+    /* 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 ULONG_MAX == 0xffffffffL
+    /* testing "even" overflow, i.e. base is power of two */
+    TESTCASE( strtoul( "4294967295", NULL, 0 ) == ULONG_MAX );
+    TESTCASE( errno == 0 );
+    errno = 0;
+    TESTCASE( strtoul( "4294967296", NULL, 0 ) == ULONG_MAX );
+    TESTCASE( errno == ERANGE );
+    /* TODO: test "odd" overflow, i.e. base is not power of two */
+#elif ULONG_MAX == 0xffffffffffffffffL
+    /* testing "even" overflow, i.e. base is power of two */
+    TESTCASE( strtoul( "18446744073709551615", NULL, 0 ) == ULONG_MAX );
+    TESTCASE( errno == 0 );
+    errno = 0;
+    TESTCASE( strtoul( "18446744073709551616", NULL, 0 ) == ULONG_MAX );
+    TESTCASE( errno == ERANGE );
+    /* TODO: test "odd" overflow, i.e. base is not power of two */
+#else
+#error Unsupported width of 'long' (neither 32 nor 64 bit).
+#endif
     return TEST_RESULTS;
 }
+
 #endif