Get new copy from FSF.

1 files changed, 12 insertions, 21 deletions

diff --git a/lib/memcpy.c b/lib/memcpy.c
index a1f8b8f2b..dba7d56f1 100644
--- a/lib/memcpy.c
+++ b/lib/memcpy.c
@@ -1,25 +1,16 @@
-/* memcpy.c -- copy memory.
-   Copy LENGTH bytes from SOURCE to DEST.  Does not null-terminate.
-   The source and destination regions may not overlap.
-   In the public domain.
-   By Jim Meyering.  */
+/* Copy LEN bytes starting at SRCADDR to DESTADDR.  Result undefined
+   if the source overlaps with the destination.
+   Return DESTADDR. */
 
-/* FIXME: remove this before release.  */
-#include <assert.h>
-#ifndef ABS
-# define ABS(x) ((x) < 0 ? (-(x)) : (x))
-#endif
-
-void
-memcpy (dest, source, length)
-     char *dest;
-     const char *source;
-     unsigned length;
+char *
+memcpy (destaddr, srcaddr, len)
+     char *destaddr;
+     const char *srcaddr;
+     int len;
 {
-  assert (length >= 0);
-  /* Make sure they don't overlap.  */
-  assert (ABS (dest - source) >= length);
+  char *dest = destaddr;
 
-  for (; length; --length)
-    *dest++ = *source++;
+  while (len-- > 0)
+    *destaddr++ = *srcaddr++;
+  return dest;
 }