X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrncmp.c;h=1e9119dbd56ec0d70888a681a257452bad549e4d;hb=d865c4403fc91d1f1ac95ba76febcee9f429bb97;hp=cbd16e4fe83ab305ad550f1ecd5ac5acca5b545e;hpb=b08f4b52b1cd1f7a9553c0f357a7c90859fa3e73;p=pdclib

diff --git a/functions/string/strncmp.c b/functions/string/strncmp.c
index cbd16e4..1e9119d 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).
@@ -12,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;
@@ -24,21 +22,24 @@ 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 );
@@ -46,6 +47,8 @@ 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