minor stuff

This commit is contained in:
Jack Halford 2017-09-30 13:24:43 +02:00
parent ed31e25ad1
commit a24acfd0a1
7 changed files with 24 additions and 10 deletions

View file

@ -18,7 +18,7 @@ NAME_BIS = libft_malloc.so
NAME = libft_malloc_$(HOSTTYPE).so NAME = libft_malloc_$(HOSTTYPE).so
CC = gcc CC = gcc
FLAGS = -Wall -Wextra -Werror #-fsanitize=address FLAGS = -Wall -Wextra -Werror -fPIC #-fsanitize=address
MAIN_FLAGS = -shared MAIN_FLAGS = -shared
OBJ_FLAGS = OBJ_FLAGS =
@ -49,6 +49,8 @@ OBJS = $(addprefix $(OBJ_DIR), $(SRC_BASE:.c=.o))
NB = $(words $(SRC_BASE)) NB = $(words $(SRC_BASE))
INDEX = 0 INDEX = 0
SHELL := /bin/bash
all : all :
@make -C $(LIBFT_DIR) @make -C $(LIBFT_DIR)
@make -j $(NAME) @make -j $(NAME)

@ -1 +1 @@
Subproject commit 3cfcbb41103be5a16a8666b317ee397e9886fa4f Subproject commit 8c0961c50468d42c3527c208d7f4ae3c98646882

View file

@ -1,2 +1,7 @@
#!/bin/sh #!/bin/bash
DYLD_LIBRARY_PATH=. DYLD_INSERT_LIBRARIES="libft_malloc.so" DYLD_FORCE_FLAT_NAMESPACE=1 $@ if [[ `uname` == 'Darwin' ]]; then
DYLD_LIBRARY_PATH=. DYLD_INSERT_LIBRARIES="libft_malloc.so" DYLD_FORCE_FLAT_NAMESPACE=1 $@
else
echo $PWD
LD_LIBRARY_PATH=$PWD/. $@
fi

View file

@ -16,7 +16,7 @@ void error_free_notalloc(void *ptr)
{ {
int fd; int fd;
fd = 1; fd = 2;
ft_putstr_fd(FG_RED"(", fd); ft_putstr_fd(FG_RED"(", fd);
ft_putnbr_fd(getpid(), fd); ft_putnbr_fd(getpid(), fd);
ft_putstr_fd(", ??? ", fd); ft_putstr_fd(", ??? ", fd);
@ -31,7 +31,7 @@ void error_mmap(void)
{ {
int fd; int fd;
fd = 1; fd = 2;
ft_putstr_fd(FG_RED"(", fd); ft_putstr_fd(FG_RED"(", fd);
ft_putnbr_fd(getpid(), fd); ft_putnbr_fd(getpid(), fd);
ft_putstr_fd(", ??? ", fd); ft_putstr_fd(", ??? ", fd);

View file

@ -1,4 +1,6 @@
#include "../includes/malloc.h" #include "../includes/malloc.h"
#include <unistd.h>
#include <string.h>
#define M (1024 * 1024) #define M (1024 * 1024)
@ -17,8 +19,8 @@ int main(void)
strcpy(addr1, "Bonjours\n"); strcpy(addr1, "Bonjours\n");
print(addr1); print(addr1);
addr2 = (char*)malloc(16*M); addr2 = (char*)malloc(16*M);
addr3 = (char*)realloc(addr, 128*M); addr3 = (char*)realloc(addr1, 128*M);
addr3[127*M] = 42; addr3[127*M] = 42;
printf(addr3); print(addr3);
return (0); return (0);
} }

View file

@ -1,4 +1,7 @@
#include "../includes/malloc.h" #include "../includes/malloc.h"
#include <unistd.h>
#include <string.h>
#include <stdio.h>
#define M (1024 * 1024) #define M (1024 * 1024)
@ -15,8 +18,8 @@ int main(void)
addr1 = (char*)malloc(16*M); addr1 = (char*)malloc(16*M);
strcpy(addr1, "Bonjours\n"); strcpy(addr1, "Bonjours\n");
print(addr1); print(addr1);
addr3 = (char*)realloc(addr, 128*M); addr3 = (char*)realloc(addr1, 128*M);
addr3[127*M] = 42; addr3[127*M] = 42;
printf(addr3); print(addr3);
return (0); return (0);
} }

View file

@ -1,4 +1,6 @@
#include "../includes/malloc.h" #include "../includes/malloc.h"
#include <unistd.h>
#include <string.h>
void print(char *s) void print(char *s)
{ {