X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fstrtox_prelim.c;h=67625152103ad7ebfa6d982635214e6d2152de29;hb=d6f1494a4f38a212b29a13ee713885058dcf0fe7;hp=d36837e49ae911369009643e7b383a88c18dc373;hpb=f8dfae46eb161173a4460a98075669e810c8bb7b;p=pdclib

diff --git a/functions/_PDCLIB/strtox_prelim.c b/functions/_PDCLIB/strtox_prelim.c
index d36837e..6762515 100644
--- a/functions/_PDCLIB/strtox_prelim.c
+++ b/functions/_PDCLIB/strtox_prelim.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* _PDCLIB_strtox_prelim( const char *, char *, int * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -8,6 +6,7 @@
 
 #include <ctype.h>
 #include <stddef.h>
+#include <string.h>
 
 const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base )
 {
@@ -24,6 +23,15 @@ const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base )
         {
             *base = 16;
             ++p;
+            /* catching a border case here: "0x" followed by a non-digit should
+               be parsed as the unprefixed zero.
+               We have to "rewind" the parsing; having the base set to 16 if it
+               was zero previously does not hurt, as the result is zero anyway.
+            */
+            if ( memchr( _PDCLIB_digits, tolower(*p), *base ) == NULL )
+            {
+                p -= 2;
+            }
         }
         else if ( *base == 0 )
         {
@@ -42,7 +50,7 @@ const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base )
 }
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {