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

diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c
index 2fb3f00..2c58d53 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).
@@ -8,9 +6,6 @@
 
 #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 )
@@ -19,19 +14,15 @@ 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;
     }
-    /* TODO: This works correctly, but somehow the handling of n is ugly as
-       hell.
-    */
-    if ( n > 0 )
+    /* Checking against 1 as we missed the last --n in the loop above. */
+    while ( n-- > 1 )
     {
-        while ( --n )
-        {
-            *s1++ = '\0';
-        }
+        *s1++ = '\0';
     }
     return rc;
 }
@@ -39,7 +30,7 @@ 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 )
 {