X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrncmp.c;h=75b399d1c3298cc9f69181b48f59aab0521b2d90;hb=d6f1494a4f38a212b29a13ee713885058dcf0fe7;hp=0ba2bee63a7a86a5d7903cb70133cdf58e425708;hpb=d02f38605b53cdff5460cc6b9e1b2a80c3a2ba4c;p=pdclib

diff --git a/functions/string/strncmp.c b/functions/string/strncmp.c
index 0ba2bee..75b399d 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,21 +22,23 @@ int strncmp( const char * s1, const char * s2, size_t n )
     }
     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";
+    char cmpabcde[] = "abcde\0f";
+    char cmpabcd_[] = "abcde\xfc";
     char empty[] = "";
     char x[] = "x";
     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 );
@@ -48,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