Added Makefile and moved internal headers into seperate directory (allowing easier...

[pdclib] / functions / string / strncat.c

diff --git a/functions/string/strncat.c b/functions/string/strncat.c
index 4a819919e1b969e3aa3283abba399ab28f4404f4..44dcb402614b0e7ff397f7a20b9f3922e075d340 100644 (file)
--- a/functions/string/strncat.c
+++ b/functions/string/strncat.c
@@ -1,22 +1,32 @@
-/* ----------------------------------------------------------------------------
- * $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>
+
+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;
 }
+
+#warning Test driver missing.