X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdlib%2Fstrtol.c;h=085abbb612c074fcfcdf3595a29a216914718a9a;hb=45f394553721285e7bc6187419613c33915cce21;hp=4a3b5a68f8c56e89fffddf53d961a1be03582759;hpb=b08f4b52b1cd1f7a9553c0f357a7c90859fa3e73;p=pdclib

diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c
index 4a3b5a6..085abbb 100644
--- a/functions/stdlib/strtol.c
+++ b/functions/stdlib/strtol.c
@@ -21,12 +21,12 @@ long int strtol( const char * s, char ** endptr, int base )
     if ( base < 2 || base > 36 ) return 0;
     if ( sign == '+' )
     {
-        rc = _PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LONG_MAX, (uintmax_t)( LONG_MAX / base ), (uintmax_t)( 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, (unsigned)base, (uintmax_t)LONG_MIN, (uintmax_t)( LONG_MIN / -base ), (uintmax_t)( -( 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;
@@ -37,11 +37,6 @@ long int strtol( const char * s, char ** endptr, int base )
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
-#ifndef _PDCLIB_INT_H
-#define _PDCLIB_INT_H
-#include <_PDCLIB_int.h>
-#endif
-
 #include <errno.h>
 
 int main( void )
@@ -49,19 +44,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( 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 */
@@ -74,43 +77,49 @@ int main( void )
     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 == 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 ) == 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 == 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 ) == -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