From: PHO <pho@cielonegro.org>
Date: Sat, 27 Dec 2008 14:32:49 +0000 (+0900)
Subject: I had to copy malloc.c from the gnulib. Why...?
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=daemon.git;a=commitdiff_plain;h=43f635047ae14880f964052ef449627fe0984913

I had to copy malloc.c from the gnulib. Why...?
---

diff --git a/Makefile.am b/Makefile.am
index 2555054..48838fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,8 @@ daemon_SOURCES = \
 	flopen.c  flopen.h  \
 	$(NULL)
 
-man8_MANS  = daemon.8
-EXTRA_DIST = $(man8_MANS) getprogname.c
+daemon_CFLAG = -Wall
+daemon_LDADD = $(LIBOBJS)
 
-AM_CFLAGS = -Wall
-AM_LDLDD  = $(LIBOBJS)
\ No newline at end of file
+man8_MANS  = daemon.8
+EXTRA_DIST = $(man8_MANS)
diff --git a/malloc.c b/malloc.c
new file mode 100644
index 0000000..eba131d
--- /dev/null
+++ b/malloc.c
@@ -0,0 +1,57 @@
+/* malloc() function that is glibc compatible.
+
+   Copyright (C) 1997, 1998, 2006, 2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* written by Jim Meyering and Bruno Haible */
+
+#include <config.h>
+/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
+#ifdef malloc
+# define NEED_MALLOC_GNU
+# undef malloc
+#endif
+
+/* Specification.  */
+#include <stdlib.h>
+
+#include <errno.h>
+
+/* Call the system's malloc below.  */
+#undef malloc
+
+/* Allocate an N-byte block of memory from the heap.
+   If N is zero, allocate a 1-byte block.  */
+
+void *
+rpl_malloc (size_t n)
+{
+  void *result;
+
+#ifdef NEED_MALLOC_GNU
+  if (n == 0)
+    n = 1;
+#endif
+
+  result = malloc (n);
+
+#if !HAVE_MALLOC_POSIX
+  if (result == NULL)
+    errno = ENOMEM;
+#endif
+
+  return result;
+}