X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrncmp.c;h=ad9e6209565508fbf6ea16d1369413096ea86741;hb=3a2027b97e7a6c7ecb9fcd4c24b4c74459faddbc;hp=9e5e615f4c42e7a4c90fb3625c297f01c329c90e;hpb=c8f799d852e3698468a78954d82588e841cc0b70;p=pdclib.old

diff --git a/functions/string/strncmp.c b/functions/string/strncmp.c
index 9e5e615..ad9e620 100644
--- a/functions/string/strncmp.c
+++ b/functions/string/strncmp.c
@@ -1,22 +1,54 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-#include <__size_t.h>
+/* strncmp( const char *, const char *, size_t )
 
-int strncmp( const char * src_1, const char * src_2, size_t n )
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <string.h>
+
+#ifndef REGTEST
+
+int strncmp( const char * s1, const char * s2, size_t n )
 {
-    while ( ( n-- != 0 ) && ( *src_1 == *src_2 ) )
+    while ( *s1 && n && ( *s1 == *s2 ) )
     {
-        ++src_1;
-        ++src_2;
+        ++s1;
+        ++s2;
+        --n;
     }
-    if ( ( n == 0 ) )
+    if ( n == 0 )
     {
         return 0;
     }
-    return ( *src_1 - *src_2 );
+    else
+    {
+        return ( *(unsigned char *)s1 - *(unsigned char *)s2 );
+    }
+}
+
+#endif
+
+#ifdef TEST
+#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 );
+    TESTCASE( strncmp( abcde, cmpabcde, 10 ) == 0 );
+    TESTCASE( strncmp( abcde, abcdx, 5 ) < 0 );
+    TESTCASE( strncmp( abcdx, abcde, 5 ) > 0 );
+    TESTCASE( strncmp( empty, abcde, 5 ) < 0 );
+    TESTCASE( strncmp( abcde, empty, 5 ) > 0 );
+    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