Fixed end-of-string bug. Thanks to Paul Barker for reporting this.

[pdclib] / functions / string / strncmp.c

diff --git a/functions/string/strncmp.c b/functions/string/strncmp.c
index 35a9511da11174497d831d91857d56a8511d3dcb..0d1e7f036922c963df4e0dfc1420e3510fd82f43 100644 (file)
--- 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 ( n && *s1 && ( *s1 == *s2 ) )
     {
         ++s1;
         ++s2;
@@ -28,15 +28,16 @@ int strncmp( const char * s1, const char * s2, size_t n )
     }
 }
 
+#endif
+
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
-int main()
+int main( void )
 {
     char cmpabcde[] = "abcde";
     char empty[] = "";
     char x[] = "x";
-    BEGIN_TESTS;
     TESTCASE( strncmp( abcde, cmpabcde, 5 ) == 0 );
     TESTCASE( strncmp( abcde, abcdx, 5 ) < 0 );
     TESTCASE( strncmp( abcdx, abcde, 5 ) > 0 );