Bug #36 (strtok does not return last token if string does not end with delimiter...

[pdclib.old] / functions / string / strncpy.c

diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c
index ea88d3f8a6648d41fca4fc341625c3bcb503496c..2fb3f000e947a179ee77e5f279cfd23acb1974dd 100644 (file)
--- a/functions/string/strncpy.c
+++ b/functions/string/strncpy.c
@@ -1,16 +1,16 @@
 /* $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>
 
+/* TODO: Debuggung only */
+#include <stdio.h>
+
 #ifndef REGTEST
 
 char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
@@ -19,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;
 }
@@ -35,10 +41,9 @@ char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
-int main()
+int main( void )
 {
     char s[] = "xxxxxxx";
-    BEGIN_TESTS;
     TESTCASE( strncpy( s, "", 1 ) == s );
     TESTCASE( s[0] == '\0' );
     TESTCASE( s[1] == 'x' );
@@ -49,6 +54,10 @@ int main()
     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