X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdlib%2Fstrtol.c;h=ce75539e4268c54babf288976daa0316b4506189;hp=ea54b98c6ebc0442a87870b5b7bb9289db8bc322;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=54fc1aef7a9754a3daa803e47a59d76a8173d703

diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c
index ea54b98..ce75539 100644
--- a/functions/stdlib/strtol.c
+++ b/functions/stdlib/strtol.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* strtol( const char *, char * *, int )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -25,7 +23,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;
@@ -35,12 +32,7 @@ long int strtol( const char * s, char ** endptr, int base )
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
-
-#ifndef _PDCLIB_INT_H
-#define _PDCLIB_INT_H
-#include <_PDCLIB_int.h>
-#endif
+#include "_PDCLIB_test.h"
 
 #include <errno.h>
 
@@ -89,36 +81,42 @@ int main( void )
     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 >> 30 == 1
     /* 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 _PDCLIB_LONG_BYTES == 8
+#elif LONG_MAX >> 62 == 1
     /* 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