BSD 4_3_Net_2 release

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

diff --git a/usr/src/lib/libc/string/bcopy.c b/usr/src/lib/libc/string/bcopy.c
index 7f7b6c2..9e9acbf 100644 (file)
--- a/usr/src/lib/libc/string/bcopy.c
+++ b/usr/src/lib/libc/string/bcopy.c
@@ -5,11 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bcopy.c    5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)bcopy.c    5.11 (Berkeley) 6/21/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>


@@ -50,7 +76,7 @@ bcopy(src0, dst0, length)
        register size_t t;
 
        if (length == 0 || dst == src)          /* nothing to do */
        register size_t t;
 
        if (length == 0 || dst == src)          /* nothing to do */

-               return;
+               goto done;

 
        /*
         * Macros: loop-t-times; and loop-t-times, t>0
 
        /*
         * Macros: loop-t-times; and loop-t-times, t>0


@@ -104,13 +130,10 @@ bcopy(src0, dst0, length)
                t = length & wmask;
                TLOOP(*--dst = *--src);
        }
                t = length & wmask;
                TLOOP(*--dst = *--src);
        }

-#ifdef MEMCOPY
-       return(dst0);
-#else
-#ifdef MEMMOVE
-       return(dst0);
+done:
+#if defined(MEMCOPY) || defined(MEMMOVE)
+       return (dst0);

 #else
        return;
 #endif
 #else
        return;
 #endif

-#endif

 }
 }