X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrncmp.c;h=43321709ee515a0d4fcc1380b0bf2b8e0d250d26;hb=0d54a75af25ca44411e7c4190cc2a93a390e61a2;hp=35a9511da11174497d831d91857d56a8511d3dcb;hpb=8f2e7cffffecca3d7c937be102fcf9d5ec17241c;p=pdclib.old

diff --git a/functions/string/strncmp.c b/functions/string/strncmp.c
index 35a9511..4332170 100644
--- a/functions/string/strncmp.c
+++ b/functions/string/strncmp.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* strncmp( const char *, const char *, size_t )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,9 +8,11 @@
 
 #include <string.h>
 
+#ifndef REGTEST
+
 int strncmp( const char * s1, const char * s2, size_t n )
 {
-    while ( n && ( *s1 == *s2 ) )
+    while ( *s1 && n && ( *s1 == *s2 ) )
     {
         ++s1;
         ++s2;
@@ -24,20 +24,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>
 
-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 );
@@ -45,6 +48,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