X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcpy.c;h=fdca8de2c80d99ec4017477507a1ed5ac6f75ea2;hb=d33e27b00b65fc12a046ca1f1bdb17bc5c1d1585;hp=a1f8b8f2b5e9711d16ded023612302fd3fd5ae8f;hpb=512ba8f4f8cd29b154fc3ddf064276f0db9fd294;p=gnulib.git

diff --git a/lib/memcpy.c b/lib/memcpy.c
index a1f8b8f2b..fdca8de2c 100644
--- a/lib/memcpy.c
+++ b/lib/memcpy.c
@@ -1,25 +1,38 @@
-/* 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.  */
-
-/* FIXME: remove this before release.  */
-#include <assert.h>
-#ifndef ABS
-# define ABS(x) ((x) < 0 ? (-(x)) : (x))
+/* Copyright (C) 1995, 1997, 2000, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
-void
-memcpy (dest, source, length)
-     char *dest;
-     const char *source;
-     unsigned length;
+#include <stddef.h>
+
+/* Copy LEN bytes starting at SRCADDR to DESTADDR.  Result undefined
+   if the source overlaps with the destination.
+   Return DESTADDR. */
+
+void *
+memcpy (void *destaddr, void const *srcaddr, size_t len)
 {
-  assert (length >= 0);
-  /* Make sure they don't overlap.  */
-  assert (ABS (dest - source) >= length);
+  char *dest = destaddr;
+  char const *src = srcaddr;
 
-  for (; length; --length)
-    *dest++ = *source++;
+  while (len-- > 0)
+    *dest++ = *src++;
+  return destaddr;
 }