In preparation for a new malloc implementation:

  * Add posix_memalign().

  * Move calloc() from calloc.c to malloc.c.  Add a calloc() implementation in
    rtld-elf in order to make the loader happy (even though calloc() isn't
    used in rtld-elf).

  * Add _malloc_prefork() and _malloc_postfork(), and use them instead of
    directly manipulating __malloc_lock.

Approved by:	phk, markm (mentor)

1 files changed, 16 insertions, 0 deletions

diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/malloc.c
index 2fe69a78b22e..3da5bee3b7fa 100644
--- a/libexec/rtld-elf/malloc.c
+++ b/libexec/rtld-elf/malloc.c
@@ -236,6 +236,22 @@ malloc(nbytes)
   	return ((char *)(op + 1));
 }
 
+void *
+calloc(size_t num, size_t size)
+{
+	void *ret;
+
+	if (size != 0 && (num * size) / size != num) {
+		/* size_t overflow. */
+		return (NULL);
+	}
+
+	if ((ret = malloc(num * size)) != NULL)
+		memset(ret, 0, num * size);
+
+	return (ret);
+}
+
 /*
  * Allocate more memory to the indicated bucket.
  */