BSD 4_3_Reno release

[unix-history] / usr / src / lib / libc / string / strcat.c

diff --git a/usr/src/lib/libc/string/strcat.c b/usr/src/lib/libc/string/strcat.c
index b9d4eef..0fc312f 100644 (file)
--- a/usr/src/lib/libc/string/strcat.c
+++ b/usr/src/lib/libc/string/strcat.c
@@ -1,20 +1,35 @@
-/* @(#)strcat.c        4.1 (Berkeley) %G% */

 /*
 /*

- * Concatenate s2 on the end of s1.  S1's space must be large enough.
- * Return s1.
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. Neither the name of the University nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
  */
 

+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)strcat.c   5.5 (Berkeley) 6/1/90";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+

 char *
 char *

-strcat(s1, s2)
-register char *s1, *s2;
+strcat(s, append)
+       register char *s, *append;

 {
 {

-       register char *os1;
+       char *save = s;

 
 

-       os1 = s1;
-       while (*s1++)
-               ;
-       --s1;
-       while (*s1++ = *s2++)
-               ;
-       return(os1);
+       for (; *s; ++s);
+       while (*s++ = *append++);
+       return(save);

 }
 }