X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=libiberty%2Fxmemdup.c;h=4602afd7d9f6acb5e1bc57c2bd5ac3da4e25d5aa;hb=0ad6b8ee70dd18ab1f956800ea3494ea790c8a55;hp=9e9d66b715dbccafcef28f11a368af2ef64a3f1c;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git

diff --git a/libiberty/xmemdup.c b/libiberty/xmemdup.c
index 9e9d66b715..4602afd7d9 100644
--- a/libiberty/xmemdup.c
+++ b/libiberty/xmemdup.c
@@ -1,10 +1,11 @@
-/* xmemdup.c -- Duplicate a memory buffer, using xcalloc.
+/* xmemdup.c -- Duplicate a memory buffer, using xmalloc.
    This trivial function is in the public domain.
    Jeff Garzik, September 1999.  */
 
 /*
 
-@deftypefn Replacement void* xmemdup (void *@var{input}, size_t @var{copy_size}, size_t @var{alloc_size})
+@deftypefn Replacement void* xmemdup (void *@var{input}, @
+  size_t @var{copy_size}, size_t @var{alloc_size})
 
 Duplicates a region of memory without fail.  First, @var{alloc_size} bytes
 are allocated, then @var{copy_size} bytes from @var{input} are copied into
@@ -24,15 +25,17 @@ allocated, the remaining memory is zeroed.
 #include <sys/types.h> /* For size_t. */
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+# ifdef HAVE_STRINGS_H
+#  include <strings.h>
+# endif
 #endif
 
 PTR
-xmemdup (input, copy_size, alloc_size)
-  const PTR input;
-  size_t copy_size;
-  size_t alloc_size;
+xmemdup (const PTR input, size_t copy_size, size_t alloc_size)
 {
-  PTR output = xcalloc (1, alloc_size);
-  memcpy (output, input, copy_size);
-  return output;
+  PTR output = xmalloc (alloc_size);
+  if (alloc_size > copy_size)
+    memset ((char *) output + copy_size, 0, alloc_size - copy_size);
+  return (PTR) memcpy (output, input, copy_size);
 }