From 55b63ed47f5a44b0f2eb1b8d6b9db7082f6376fd Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Thu, 12 Dec 2019 20:51:01 +0100 Subject: [PATCH] version test pour part2 --- srcs/part2/ft_split.c | 8 +++++++- srcs/part2/main.c | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/srcs/part2/ft_split.c b/srcs/part2/ft_split.c index 40d1c25..1302603 100644 --- a/srcs/part2/ft_split.c +++ b/srcs/part2/ft_split.c @@ -95,7 +95,13 @@ char **ft_split(char const *s, char c) int len; w = 0; - if (!s || !(array = (char **)malloc(sizeof(char *) * 1000 * (count(s, c) + 1)))) +// if (!s) +// { +// array = malloc(sizeof(char*)); +// array[0] = 0; +// return (array); +// } + if (!s || !(array = (char **)malloc(sizeof(char *) * (count(s, c) + 1)))) return (NULL); while (*s != '\0') { diff --git a/srcs/part2/main.c b/srcs/part2/main.c index a9e78bd..202e348 100644 --- a/srcs/part2/main.c +++ b/srcs/part2/main.c @@ -4,7 +4,7 @@ char touppercase(unsigned int i, char c) { - if (i < 3 && 'a' <= c <= 'z') + if (i < 3 && c >= 'a' && c <= 'z') c -= 32; return (c); } @@ -20,7 +20,9 @@ void print_ft_split(char *str, char c) printf("split : [%s] [%c] -> ", str, c); tab = ft_split(str, c); - while (*tab != NULL) +// while (*tab != NULL) sans verifier que tab est malloc +// printf("[%s]", *(tab++)); + while (tab && *tab != NULL) printf("[%s]", *(tab++)); printf("\n"); } @@ -51,6 +53,17 @@ void print_ft_strtrim(char const *s, char const *set) printf("strtrim: [%s] [%s] -> '%s'\n", s, set, ft_strtrim(s, set)); } +void print_ft_putnbr_fd(int n, int fd) +{ + write(1, "putnbr : [", 10); + ft_putnbr_fd(n, 1); + write(1, "] [", 3); + ft_putnbr_fd(fd, 1); + write(1, "] -> '", 6); + ft_putnbr_fd(n, fd); + write(1, "'\n", 2); +} + int main() { char touppercase(unsigned int, char); @@ -61,11 +74,15 @@ int main() print_ft_itoa(1); print_ft_itoa(-1218927987); print_ft_itoa(128979827); + print_ft_itoa(2147483647); + print_ft_itoa(-2147483648); + print_ft_itoa('t'); printf("\n"); print_ft_split(" dfs zfe f ez f fez ", ' '); -// print_ft_split(NULL, 0); + print_ft_split(NULL, 0); + print_ft_split(NULL, ' '); print_ft_split("", 0); print_ft_split(" ", 0); print_ft_split("", ' '); @@ -84,6 +101,7 @@ int main() print_ft_strjoin(NULL, "fsdf"); print_ft_strjoin("", NULL); print_ft_strjoin("sdffez", NULL); + print_ft_strjoin(" ", " "); printf("\n"); @@ -113,7 +131,8 @@ int main() printf("\n"); - print_ft_strtrim(" strtrim ", "m "); + print_ft_strtrim(" stmr trim ", "m "); + print_ft_strtrim(" ", " "); print_ft_strtrim("", ""); print_ft_strtrim(NULL, ""); print_ft_strtrim("", NULL); @@ -121,5 +140,18 @@ int main() print_ft_strtrim("efzfe fzef", ""); print_ft_strtrim("efzfzelelijz", " "); print_ft_strtrim(" e f zfzelelijz ", " "); + + printf("\n"); + + print_ft_putnbr_fd(52, 1); + print_ft_putnbr_fd(2147483647, 1); + print_ft_putnbr_fd(-2147483648, 1); + print_ft_putnbr_fd(0, 1); + print_ft_putnbr_fd(-1, 1); + print_ft_putnbr_fd(239847, 1); + print_ft_putnbr_fd(34625725, 1); + print_ft_putnbr_fd(-4564562, 1); + print_ft_putnbr_fd(456, 1); + print_ft_putnbr_fd(-624724536, 1); return 0; }