X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fstrtox_main.c;h=57e184555cf1e66f99a58c4561c249289542b300;hb=ec01598cc2925e0bb00a50dd60ccd5ab5d3cbe57;hp=6ab56cd2d5322011e61a78e016f3861b7fbdd927;hpb=6ff0d9f87b0852fc9dd7a1b8bb3d771b93ba2bdb;p=pdclib

diff --git a/functions/_PDCLIB/strtox_main.c b/functions/_PDCLIB/strtox_main.c
index 6ab56cd..57e1845 100644
--- a/functions/_PDCLIB/strtox_main.c
+++ b/functions/_PDCLIB/strtox_main.c
@@ -8,12 +8,13 @@
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
+#define _PDCLIB_INT_H _PDCLIB_INT_H
 #include <_PDCLIB_int.h>
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
 
-_PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, int base, _PDCLIB_uintmax_t error, _PDCLIB_uintmax_t limval, int limdigit )
+_PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, int base, _PDCLIB_uintmax_t error, _PDCLIB_uintmax_t limval, _PDCLIB_uintmax_t limdigit, char * sign )
 {
     _PDCLIB_uintmax_t rc = 0;
     int digit = -1;
@@ -31,6 +32,8 @@ _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, int base, _PDCLIB_uintma
             errno = ERANGE;
             /* TODO: Only if endptr != NULL */
             while ( memchr( _PDCLIB_digits, **p, base ) != NULL ) ++(*p);
+            /* TODO: This is ugly, but keeps caller from negating the error value */
+            *sign = '+';
             return error;
         }
     }
@@ -51,27 +54,30 @@ int main()
     const char * p;
     char test[] = "123_";
     char fail[] = "xxx";
+    char sign = '-';
     BEGIN_TESTS;
     /* basic functionality */
     p = test;
     errno = 0;
-    TESTCASE( _PDCLIB_strtox_main( &p, 10, 999, 12, 3 ) == 123 );
+    TESTCASE( _PDCLIB_strtox_main( &p, 10, 999, 12, 3, &sign ) == 123 );
     TESTCASE( errno == 0 );
     TESTCASE( p == &test[3] );
     /* proper functioning to smaller base */
     p = test;
-    TESTCASE( _PDCLIB_strtox_main( &p, 8, 999, 12, 3 ) == 0123 );
+    TESTCASE( _PDCLIB_strtox_main( &p, 8, 999, 12, 3, &sign ) == 0123 );
     TESTCASE( errno == 0 );
     TESTCASE( p == &test[3] );
     /* overflowing subject sequence must still return proper endptr */
     p = test;
-    TESTCASE( _PDCLIB_strtox_main( &p, 4, 999, 1, 2 ) == 999 );
+    TESTCASE( _PDCLIB_strtox_main( &p, 4, 999, 1, 2, &sign ) == 999 );
     TESTCASE( errno == ERANGE );
     TESTCASE( p == &test[3] );
+    TESTCASE( sign == '+' );
     /* testing conversion failure */
     errno = 0;
     p = fail;
-    TESTCASE( _PDCLIB_strtox_main( &p, 10, 999, 99, 8 ) == 0 );
+    sign = '-';
+    TESTCASE( _PDCLIB_strtox_main( &p, 10, 999, 99, 8, &sign ) == 0 );
     TESTCASE( p == NULL );
     return TEST_RESULTS;
 }