X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdlib%2Fstrtoll.c;h=8222d3442f39162ed928ffdc8c6bff8d12b34c9c;hb=8fca29703edff11c81af1e6039bcf115a83b6bbc;hp=aa91163842a09bc4923a64c95a1e65333d9c49d2;hpb=0d54a75af25ca44411e7c4190cc2a93a390e61a2;p=pdclib.old

diff --git a/functions/stdlib/strtoll.c b/functions/stdlib/strtoll.c
index aa91163..8222d34 100644
--- a/functions/stdlib/strtoll.c
+++ b/functions/stdlib/strtoll.c
@@ -38,11 +38,6 @@ long long int strtoll( 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 )
@@ -50,19 +45,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( strtoll( "123", NULL, 10 ) == 123 );
     /* proper detecting of default base 10 */
-    TESTCASE( strtoll( "123", NULL, 0 ) == 123 );
+    TESTCASE( strtoll( "456", NULL, 0 ) == 456 );
     /* proper functioning to smaller base */
     TESTCASE( strtoll( "14", NULL, 8 ) == 12 );
     /* proper autodetecting of octal */
-    TESTCASE( strtoll( "014", NULL, 0 ) == 12 );
+    TESTCASE( strtoll( "016", NULL, 0 ) == 14 );
     /* proper autodetecting of hexadecimal, lowercase 'x' */
     TESTCASE( strtoll( "0xFF", NULL, 0 ) == 255 );
     /* proper autodetecting of hexadecimal, uppercase 'X' */
-    TESTCASE( strtoll( "0XFF", NULL, 0 ) == 255 );
+    TESTCASE( strtoll( "0Xa1", NULL, 0 ) == 161 );
+    /* proper handling of border case: 0x followed by non-hexdigit */
+    TESTCASE( strtoll( tricky, &endptr, 0 ) == 0 );
+    TESTCASE( endptr == tricky + 2 );
+    /* proper handling of border case: 0 followed by non-octdigit */
+    TESTCASE( strtoll( tricky, &endptr, 8 ) == 0 );
+    TESTCASE( endptr == tricky + 2 );
     /* errno should still be 0 */
     TESTCASE( errno == 0 );
     /* overflowing subject sequence must still return proper endptr */
@@ -75,7 +78,7 @@ int main( void )
     TESTCASE( errno == ERANGE );
     TESTCASE( ( endptr - overflow ) == 53 );
     /* testing skipping of leading whitespace */
-    TESTCASE( strtoll( " \n\v\t\f123", NULL, 0 ) == 123 );
+    TESTCASE( strtoll( " \n\v\t\f789", NULL, 0 ) == 789 );
     /* testing conversion failure */
     TESTCASE( strtoll( overflow, &endptr, 10 ) == 0 );
     TESTCASE( endptr == overflow );
@@ -86,7 +89,7 @@ int main( void )
     /* one-complement and signed magnitude just as well. Anyone having a   */
     /* platform to test this on?                                           */
     errno = 0;
-#if _PDCLIB_LLONG_BYTES == 8
+#if LLONG_MAX == 0x7fffffffffffffffLL
     /* testing "even" overflow, i.e. base is power of two */
     TESTCASE( strtoll( "0x7FFFFFFFFFFFFFFF", NULL, 0 ) == 0x7fffffffffffffff );
     TESTCASE( errno == 0 );
@@ -100,7 +103,7 @@ int main( void )
     TESTCASE( strtoll( "-0x8000000000000001", NULL, 0 ) == LLONG_MIN );
     TESTCASE( errno == ERANGE );
     /* TODO: test "odd" overflow, i.e. base is not power of two */
-#elif _PDCLIB_LONG_BYTES == 16
+#elif LLONG_MAX == 0x7fffffffffffffffffffffffffffffffLL
     /* testing "even" overflow, i.e. base is power of two */
     TESTCASE( strtoll( "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", NULL, 0 ) == 0x7fffffffffffffffffffffffffffffff );
     TESTCASE( errno == 0 );
@@ -119,4 +122,5 @@ int main( void )
 #endif
     return TEST_RESULTS;
 }
+
 #endif