X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstring%2Fstrncmp.c;h=e1ec0de66e9797c9739555b4b901116ea4813920;hp=ac9c10f38b51cf5397cd2caa98d5215ff5ec79c9;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=a5d6aa23d413d22e6eed9c9d813b063f70cddb16 diff --git a/functions/string/strncmp.c b/functions/string/strncmp.c index ac9c10f..e1ec0de 100644 --- a/functions/string/strncmp.c +++ b/functions/string/strncmp.c @@ -1,5 +1,3 @@ -/* $Id$ */ - /* strncmp( const char *, const char *, size_t ) This file is part of the Public Domain C Library (PDCLib). @@ -18,24 +16,25 @@ int strncmp( const char * s1, const char * s2, size_t n ) ++s2; --n; } - if ( ( n == 0 ) ) + if ( n == 0 ) { return 0; } else { - return ( *s1 - *s2 ); + return ( *(unsigned char *)s1 - *(unsigned char *)s2 ); } } #endif #ifdef TEST -#include <_PDCLIB_test.h> +#include "_PDCLIB_test.h" int main( void ) { char cmpabcde[] = "abcde\0f"; + char cmpabcd_[] = "abcde\xfc"; char empty[] = ""; char x[] = "x"; TESTCASE( strncmp( abcde, cmpabcde, 5 ) == 0 ); @@ -47,6 +46,7 @@ int main( void ) TESTCASE( strncmp( abcde, abcdx, 4 ) == 0 ); TESTCASE( strncmp( abcde, x, 0 ) == 0 ); TESTCASE( strncmp( abcde, x, 1 ) < 0 ); + TESTCASE( strncmp( abcde, cmpabcd_, 10 ) < 0 ); return TEST_RESULTS; } #endif