X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=libiberty%2Fxmemdup.c;h=4602afd7d9f6acb5e1bc57c2bd5ac3da4e25d5aa;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=fdb17a547f3a9b1ceeb803f5517c578f15fa71bd;hpb=d0352a18a504a4e7b761f6b3264cf11347d8d056;p=deliverable%2Fbinutils-gdb.git diff --git a/libiberty/xmemdup.c b/libiberty/xmemdup.c index fdb17a547f..4602afd7d9 100644 --- a/libiberty/xmemdup.c +++ b/libiberty/xmemdup.c @@ -1,7 +1,21 @@ -/* 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}) + +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 +it, and the new memory is returned. If fewer bytes are copied than were +allocated, the remaining memory is zeroed. + +@end deftypefn + +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -11,15 +25,17 @@ #include /* For size_t. */ #ifdef HAVE_STRING_H #include +#else +# ifdef HAVE_STRINGS_H +# include +# 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); }