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

diff --git a/functions/string/strncat.c b/functions/string/strncat.c
index d168e6e..18d8ed5 100644
--- a/functions/string/strncat.c
+++ b/functions/string/strncat.c
@@ -1,22 +1,58 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* strncat( 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 * strncat( char * restrict dest, const char * restrict src, size_t n )
+#include <string.h>
+
+#ifndef REGTEST
+
+char * strncat( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
 {
-    char * tmp = dest;
-    while ( *dest != '\0' )
+    char * rc = s1;
+    while ( *s1 )
     {
-        ++dest;
+        ++s1;
     }
-    while ( ( n-- > 0 ) && ( *src != '\0' ) )
+    while ( n && ( *s1++ = *s2++ ) )
     {
-        *dest++ = *src++;
+        --n;
     }
-    return tmp;
+    if ( n == 0 )
+    {
+        *s1 = '\0';
+    }
+    return rc;
+}
+
+#endif
+
+#ifdef TEST
+#include "_PDCLIB_test.h"
+
+int main( void )
+{
+    char s[] = "xx\0xxxxxx";
+    TESTCASE( strncat( s, abcde, 10 ) == s );
+    TESTCASE( s[2] == 'a' );
+    TESTCASE( s[6] == 'e' );
+    TESTCASE( s[7] == '\0' );
+    TESTCASE( s[8] == 'x' );
+    s[0] = '\0';
+    TESTCASE( strncat( s, abcdx, 10 ) == s );
+    TESTCASE( s[4] == 'x' );
+    TESTCASE( s[5] == '\0' );
+    TESTCASE( strncat( s, "\0", 10 ) == s );
+    TESTCASE( s[5] == '\0' );
+    TESTCASE( s[6] == 'e' );
+    TESTCASE( strncat( s, abcde, 0 ) == s );
+    TESTCASE( s[5] == '\0' );
+    TESTCASE( s[6] == 'e' );
+    TESTCASE( strncat( s, abcde, 3 ) == s );
+    TESTCASE( s[5] == 'a' );
+    TESTCASE( s[7] == 'c' );
+    TESTCASE( s[8] == '\0' );
+    return TEST_RESULTS;
 }
+#endif