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

diff --git a/functions/string/strncat.c b/functions/string/strncat.c
index d168e6e..5720048 100644
--- a/functions/string/strncat.c
+++ b/functions/string/strncat.c
@@ -1,22 +1,64 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-#include <__size_t.h>
+/* Release $Name$ */
 
-char * strncat( char * restrict dest, const char * restrict src, size_t n )
+/* strncat( 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>
+
+#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 )
+    {
+        ++s1;
+    }
+    while ( n && ( *s1++ = *s2++ ) )
     {
-        ++dest;
+        --n;
     }
-    while ( ( n-- > 0 ) && ( *src != '\0' ) )
+    if ( n == 0 )
     {
-        *dest++ = *src++;
+        *s1 = '\0';
     }
-    return tmp;
+    return rc;
+}
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main()
+{
+    char s[] = "xx\0xxxxxx";
+    BEGIN_TESTS;
+    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