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

diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c
index 3784df4..2c58d53 100644
--- a/functions/string/strncpy.c
+++ b/functions/string/strncpy.c
@@ -1,22 +1,54 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* strncpy( char *, const char *, size_t )
 
-#include <__size_t.h>
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
 
-char * strncpy( char * restrict dest, const char * restrict src, size_t n )
+#include <string.h>
+
+#ifndef REGTEST
+
+char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
 {
-    char * tmp = dest;
-    while ( ( n-- != 0 ) && ( ( *dest++ = *src++ ) != '\0' ) )
+    char * rc = s1;
+    while ( ( n > 0 ) && ( *s1++ = *s2++ ) )
     {
-        // EMPTY
+        /* Cannot do "n--" in the conditional as size_t is unsigned and we have
+           to check it again for >0 in the next loop below, so we must not risk
+           underflow.
+        */
+        --n;
     }
-    while ( n-- != 0 )
+    /* Checking against 1 as we missed the last --n in the loop above. */
+    while ( n-- > 1 )
     {
-        *dest++ = '\0';
+        *s1++ = '\0';
     }
-    return tmp;
+    return rc;
+}
+
+#endif
+
+#ifdef TEST
+#include "_PDCLIB_test.h"
+
+int main( void )
+{
+    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