X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrcat.c;h=d9609157ffc77f048a63eb07054630589210c3a0;hb=40d0246771c8e593d4b5fdc97dd87b4afd260be2;hp=a0cef0e04267c24607c14e48394f7cadbcb036e7;hpb=0a5395faab237ba9008352b0f4bee9659bbd3d5f;p=pdclib

diff --git a/functions/string/strcat.c b/functions/string/strcat.c
index a0cef0e..d960915 100644
--- a/functions/string/strcat.c
+++ b/functions/string/strcat.c
@@ -1,36 +1,50 @@
-// ----------------------------------------------------------------------------
-// $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 s1, const char * restrict s2 ) { /* TODO */ };
+/* Release $Name$ */
 
-/* Therx code
+/* 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>
+#include <string.h>
+
+#ifndef REGTEST
+
+char * strcat( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 )
 {
-    while (*s1)
-    {
-        s1++;
-    }
-    while (*s1++ = *s2++)
+    char * rc = s1;
+    if ( *s1 )
     {
-        // EMPTY
+        while ( *++s1 );
     }
-    return s1;
+    while ( (*s1++ = *s2++) );
+    return rc;
 }
-*/
 
-/* PDPC code - unreviewed
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main()
 {
-    char *p = s1;
-    
-    while (*p != '\0') p++;
-    while ((*p = *s2) != '\0')
-    {
-        p++;
-        s2++;
-    }
-    return (s1);
+    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