X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdlib%2Fstrtoul.c;h=0bcb7dd2b608f621dd254cf926616918036720ee;hp=e38dbd678f36b95b736949467a3a244fe2385ae0;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=d0efaaaab9fdaccd83ced5aa74b40a9b3a391466

diff --git a/functions/stdlib/strtoul.c b/functions/stdlib/strtoul.c
index e38dbd6..0bcb7dd 100644
--- a/functions/stdlib/strtoul.c
+++ b/functions/stdlib/strtoul.c
@@ -1,26 +1,23 @@
-/* $Id$ */
-
-/* Release $Name$ */
-
 /* strtoul( const char *, char * *, int )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#include <_PDCLIB_int.h>
 #include <limits.h>
-#include <stddef.h>
 #include <stdlib.h>
 
 #ifndef REGTEST
 
+#include <stdint.h>
+
 unsigned long int strtoul( const char * s, char ** endptr, int base )
 {
     unsigned long int rc;
     char sign = '+';
     const char * p = _PDCLIB_strtox_prelim( s, &sign, &base );
-    rc = _PDCLIB_strtox_main( &p, base, ULONG_MAX, ULONG_MAX / base, ULONG_MAX % base, &sign );
+    if ( base < 2 || base > 36 ) return 0;
+    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;
 }
@@ -28,28 +25,35 @@ unsigned long int strtoul( const char * s, char ** endptr, int base )
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#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( 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 */
@@ -62,13 +66,39 @@ int main()
     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;
+/* long -> 32 bit */
+#if ULONG_MAX >> 31 == 1
+    /* 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 */
+/* long -> 64 bit */
+#elif ULONG_MAX >> 63 == 1
+    /* 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