X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrncpy.c;h=efb6480468391a0bf35fae0e8001bee7d0d5c1d9;hb=cd6cfe0f578c4f744ddc9a342243aff6b42f8027;hp=b47be758b056c5ff5bcf0e0f8c67f0cc4bdbbbbc;hpb=1d1bcc009f3ebb75d549b078cfd0017f1298fae3;p=pdclib.old

diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c
index b47be75..efb6480 100644
--- a/functions/string/strncpy.c
+++ b/functions/string/strncpy.c
@@ -1,38 +1,56 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* strncpy( char *, const char *, size_t )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#include <_PDCLIB_aux.h>
 #include <string.h>
 
+#ifndef REGTEST
+
 char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
 {
     char * rc = s1;
     while ( ( n > 0 ) && ( *s1++ = *s2++ ) )
     {
         /* Cannot do "n--" in the conditional as size_t is unsigned and we have
-           to check it again for >0 in the next loop.
+           to check it again for >0 in the next loop below, so we must not risk
+           underflow.
         */
         --n;
     }
-    while ( n-- )
+    /* Checking against 1 as we missed the last --n in the loop above. */
+    while ( n-- > 1 )
     {
         *s1++ = '\0';
     }
     return rc;
 }
 
-#warning Test driver missing.
+#endif
 
 #ifdef TEST
-int main()
+#include <_PDCLIB_test.h>
+
+int main( void )
 {
-    return 0;
+    char s[] = "xxxxxxx";
+    TESTCASE( strncpy( s, "", 1 ) == s );
+    TESTCASE( s[0] == '\0' );
+    TESTCASE( s[1] == 'x' );
+    TESTCASE( strncpy( s, abcde, 6 ) == s );
+    TESTCASE( s[0] == 'a' );
+    TESTCASE( s[4] == 'e' );
+    TESTCASE( s[5] == '\0' );
+    TESTCASE( s[6] == 'x' );
+    TESTCASE( strncpy( s, abcde, 7 ) == s );
+    TESTCASE( s[6] == '\0' );
+    TESTCASE( strncpy( s, "xxxx", 3 ) == s );
+    TESTCASE( s[0] == 'x' );
+    TESTCASE( s[2] == 'x' );
+    TESTCASE( s[3] == 'd' );
+    return TEST_RESULTS;
 }
 #endif