X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrncmp.c;h=55262c49a067472cd6abe4b1ad42cd5cbe2115ec;hb=b1fc26afebd4d557ff89a44bc21767a8704c3809;hp=286d41ed6baedaf951428f918828eb9e548a9bdd;hpb=40d0246771c8e593d4b5fdc97dd87b4afd260be2;p=pdclib

diff --git a/functions/string/strncmp.c b/functions/string/strncmp.c
index 286d41e..55262c4 100644
--- a/functions/string/strncmp.c
+++ b/functions/string/strncmp.c
@@ -1,7 +1,3 @@
-/* $Id$ */
-
-/* Release $Name$ */
-
 /* strncmp( const char *, const char *, size_t )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -14,7 +10,7 @@
 
 int strncmp( const char * s1, const char * s2, size_t n )
 {
-    while ( n && ( *s1 == *s2 ) )
+    while ( *s1 && n && ( *s1 == *s2 ) )
     {
         ++s1;
         ++s2;
@@ -26,7 +22,7 @@ int strncmp( const char * s1, const char * s2, size_t n )
     }
     else
     {
-        return ( *s1 - *s2 );
+        return ( *(unsigned char *)s1 - *(unsigned char *)s2 );
     }
 }
 
@@ -35,13 +31,14 @@ int strncmp( const char * s1, const char * s2, size_t n )
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
-int main()
+int main( void )
 {
-    char cmpabcde[] = "abcde";
+    char cmpabcde[] = "abcde\0f";
+    char cmpabcd_[] = "abcde\xfc";
     char empty[] = "";
     char x[] = "x";
-    BEGIN_TESTS;
     TESTCASE( strncmp( abcde, cmpabcde, 5 ) == 0 );
+    TESTCASE( strncmp( abcde, cmpabcde, 10 ) == 0 );
     TESTCASE( strncmp( abcde, abcdx, 5 ) < 0 );
     TESTCASE( strncmp( abcdx, abcde, 5 ) > 0 );
     TESTCASE( strncmp( empty, abcde, 5 ) < 0 );
@@ -49,6 +46,7 @@ int main()
     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