From e5859f9c40964fe349460a3fecc05c3ce2e69d47 Mon Sep 17 00:00:00 2001
From: solar <unknown>
Date: Mon, 22 May 2006 06:10:42 +0000
Subject: [PATCH] Failed to terminate correctly at n < strlen(s2). Fixed.
 Thanks to the bug reporter.

---
 functions/string/strncpy.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c
index 91f97da..2fb3f00 100644
--- a/functions/string/strncpy.c
+++ b/functions/string/strncpy.c
@@ -8,6 +8,9 @@
 
 #include <string.h>
 
+/* TODO: Debuggung only */
+#include <stdio.h>
+
 #ifndef REGTEST
 
 char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
@@ -16,13 +19,19 @@ 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.
         */
         --n;
     }
-    while ( --n )
+    /* TODO: This works correctly, but somehow the handling of n is ugly as
+       hell.
+    */
+    if ( n > 0 )
     {
-        *s1++ = '\0';
+        while ( --n )
+        {
+            *s1++ = '\0';
+        }
     }
     return rc;
 }
@@ -45,6 +54,10 @@ 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
-- 
2.40.0