X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrcat.c;h=d1135756069099dad2a478e9a55a19f65951750b;hb=2f57d79a5a24856fdea69b2119d67e5fb5029b3e;hp=dfbc135aa15df56e66784e7074cee8df676a82cb;hpb=fedb223525324e7ce171f5fe6903430fbd9557bb;p=pdclib

diff --git a/functions/string/strcat.c b/functions/string/strcat.c
index dfbc135..d113575 100644
--- a/functions/string/strcat.c
+++ b/functions/string/strcat.c
@@ -1,23 +1,45 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-char * strcat( char * restrict dest, const char * restrict src )
+/* Release $Name$ */
+
+/* strcat( char *, const char * )
+
+   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>
+
+char * strcat( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 )
 {
-    char * dest_p = dest;
-    if ( *dest_p != '\0' )
-    {
-        while ( *++dest_p != '\0' )
-        {
-            // EMPTY
-        }
-    }
-    while ( (*dest_p++ = *src++) != '\0' )
+    char * rc = s1;
+    if ( *s1 )
     {
-        // EMPTY
+        while ( *++s1 );
     }
-    return dest;
+    while ( (*s1++ = *s2++) );
+    return rc;
+}
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main()
+{
+    char s[] = "xx\0xxxxxx";
+    BEGIN_TESTS;
+    TESTCASE( strcat( s, abcde ) == s );
+    TESTCASE( s[2] == 'a' );
+    TESTCASE( s[6] == 'e' );
+    TESTCASE( s[7] == '\0' );
+    TESTCASE( s[8] == 'x' );
+    s[0] = '\0';
+    TESTCASE( strcat( s, abcdx ) == s );
+    TESTCASE( s[4] == 'x' );
+    TESTCASE( s[5] == '\0' );
+    TESTCASE( strcat( s, "\0" ) == s );
+    TESTCASE( s[5] == '\0' );
+    TESTCASE( s[6] == 'e' );
+    return TEST_RESULTS;
 }
+#endif