X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrncpy.c;h=da1397a93caaf2a7a1b6b3ebf5499f941f1f8236;hb=d865c4403fc91d1f1ac95ba76febcee9f429bb97;hp=91f97da3d28f39e9d15a8d6e7380b9c38ee97120;hpb=b08f4b52b1cd1f7a9553c0f357a7c90859fa3e73;p=pdclib

diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c
index 91f97da..da1397a 100644
--- a/functions/string/strncpy.c
+++ b/functions/string/strncpy.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* strncpy( char *, const char *, size_t )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -16,11 +14,13 @@ char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si
     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';
     }
@@ -30,7 +30,8 @@ char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+
+#include "_PDCLIB_test.h"
 
 int main( void )
 {
@@ -45,6 +46,11 @@ int main( void )
     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