Per suggestion from Miles Bader, move calloc.c to libc/stdlib.

Also, Manuel notices that I forgot to check for when nmemb=0,
which would result in a segfault, so fix that case as well.
 -Erik

1 files changed, 41 insertions, 0 deletions

diff --git a/libc/stdlib/calloc.c b/libc/stdlib/calloc.c
new file mode 100644
index 000000000..15281a97f
--- /dev/null
+++ b/libc/stdlib/calloc.c
@@ -0,0 +1,41 @@
+/* vi: set sw=4 ts=4: */
+/* calloc for uClibc
+ *
+ * Copyright (C) 2002 by Erik Andersen <andersen@uclibc.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, 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 Library General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Library 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
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+void * calloc(size_t nmemb, size_t lsize)
+{
+	void *result;
+	size_t size=lsize * nmemb;
+
+	/* guard vs integer overflow, but allow nmemb
+	 * to fall through and call malloc(0) */
+	if (nmemb && lsize != (size / nmemb)) {
+		__set_errno(ENOMEM);
+		return NULL;
+	}
+	if ((result=malloc(size)) != NULL) {
+		memset(result, 0, size);
+	}
+	return result;
+}
+