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

diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c
index 8fc95b0..ea54b98 100644
--- a/functions/stdlib/strtol.c
+++ b/functions/stdlib/strtol.c
@@ -49,19 +49,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,7 +82,7 @@ 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 );