X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstring%2Fstrncpy.c;h=2c58d538fbb0be3fc463af51e82404d0d6cef1a0;hp=ed5965d148ddbd5236288cbc521d39423911db0c;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=02c1ddcae6c88b55d2f4de825ee6c6456150b8ae

diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c
index ed5965d..2c58d53 100644
--- a/functions/string/strncpy.c
+++ b/functions/string/strncpy.c
@@ -1,31 +1,54 @@
-/* $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
+#include "_PDCLIB_test.h"
+
+int main( void )
+{
+    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