Failed to terminate correctly at n < strlen(s2). Fixed. Thanks to the bug reporter.

[pdclib] / functions / string / strncpy.c

diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c
index b47be758b056c5ff5bcf0e0f8c67f0cc4bdbbbbc..2fb3f000e947a179ee77e5f279cfd23acb1974dd 100644 (file)
--- a/functions/string/strncpy.c
+++ b/functions/string/strncpy.c
@@ -1,16 +1,18 @@
 /* $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 )
 {
     char * rc = s1;
@@ -21,18 +23,41 @@ char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si
         */
         --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;
 }
 
-#warning Test driver missing.
+#endif
 
 #ifdef TEST
-int main()
+#include <_PDCLIB_test.h>
+
+int main( void )
 {
-    return 0;
+    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