check

Makefile

@@ -33,7 +33,7 @@ LDLIBS = -fPIC -shared -ldl
 all: $(NAME)
 
 $(NAME): $(OBJECTS)
-	$(CC) $(CFLAGS) $(OBJECTS) $(LDLIBS) -o $(NAME)
+	$(CC) $(CFLAGS) $(OBJECTS)  -o $(NAME) $(LDLIBS)
 
 -include ${DEPENDS}
 
@@ -41,7 +41,7 @@ $(OBJ_PATH):
 	mkdir -p $@
 
 $(OBJ_PATH)/%.o: %.c | $(OBJ_PATH)
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ -fPIC
 
 clean:
 	$(RM) $(OBJECTS) $(OBJ_PATH)

inc/funfail.h

@@ -0,0 +1,10 @@
+#ifndef FUNFAIL_H
+#define FUNFAIL_H
+
+# define _GNU_SOURCE
+#include <dlfcn.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#endif

src/calloc.c

@@ -1,6 +1,4 @@
-#include <dlfcn.h>
+#include "funfail.h"
-#include <errno.h>
-#include <stdlib.h>
 
 typedef void *(*f)(size_t __nmemb, size_t __size);
 

src/malloc.c

@@ -1,21 +1,21 @@
-#include <dlfcn.h>
+#include "funfail.h"
-#include <errno.h>
-#include <stdlib.h>
 
+typedef void *(*f)(size_t size);
 
-typedef void* (*f)(size_t size);
+void *malloc(size_t size)
-
+{
-void* malloc(size_t size) {
 	static f og_malloc = NULL;
 	static int calls = 0;
 	const int MAX_CALLS = getenv("MAX_MALLOC_CALLS") ? atoi(getenv("MAX_MALLOC_CALLS")) : -1;
 
-  if (!og_malloc) {
+	if (!og_malloc)
+	{
 		og_malloc = (f)dlsym(RTLD_NEXT, "malloc");
 	}
 
 	calls++;
-  if (MAX_CALLS < 0 || calls <= MAX_CALLS) {
+	if (MAX_CALLS < 0 || calls <= MAX_CALLS)
+	{
 		return og_malloc(size);
 	}
 	errno = ENOMEM;

src/read.c

@@ -1,7 +1,4 @@
-#include <dlfcn.h>
+#include "funfail.h"
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 
 typedef ssize_t (*f)(int fd, void *buf, size_t count);
 

src/write.c

@@ -1,7 +1,4 @@
-#include <dlfcn.h>
+#include "funfail.h"
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 
 typedef ssize_t (*f)(int fd, const void *buf, size_t count);