From 9fcfd1ba9178b22f4ec0a4c2f57d613b841c1b86 Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Mon, 9 Dec 2019 22:03:22 +0100 Subject: [PATCH] preotection trim et split --- srcs/part2/ft_itoa.c | 12 +++++++----- srcs/part2/ft_split.c | 2 +- srcs/part2/ft_strjoin.c | 17 +++++++++++++---- srcs/part2/ft_strmapi.c | 8 ++++---- srcs/part2/ft_strtrim.c | 6 +++--- srcs/part2/ft_substr.c | 21 +++++++++++++++------ 6 files changed, 43 insertions(+), 23 deletions(-) diff --git a/srcs/part2/ft_itoa.c b/srcs/part2/ft_itoa.c index 0341df3..2301491 100644 --- a/srcs/part2/ft_itoa.c +++ b/srcs/part2/ft_itoa.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 13:59:01 by hulamy #+# #+# */ -/* Updated: 2019/12/04 15:00:16 by hulamy ### ########.fr */ +/* Updated: 2019/12/09 21:25:06 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,14 +17,16 @@ /* ** #include ** -** char *ft_itoa(int n) +** char *ft_itoa(int n); ** ** int main(int ac, char **av) ** { -** if (ac == 2) -** { +** if (ac == 0) +** return (0); +** else if (ac == 2) ** printf("%s\n",ft_itoa(atoi(av[1]))); -** } +** else +** printf("%s\n",ft_itoa(0)); ** return 0; ** } */ diff --git a/srcs/part2/ft_split.c b/srcs/part2/ft_split.c index fdbb1e9..0e030db 100644 --- a/srcs/part2/ft_split.c +++ b/srcs/part2/ft_split.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/12/04 15:51:26 by hulamy #+# #+# */ -/* Updated: 2019/12/04 16:26:37 by hulamy ### ########.fr */ +/* Updated: 2019/12/09 21:27:55 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/part2/ft_strjoin.c b/srcs/part2/ft_strjoin.c index f0d610f..c9e309c 100644 --- a/srcs/part2/ft_strjoin.c +++ b/srcs/part2/ft_strjoin.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:01:26 by hulamy #+# #+# */ -/* Updated: 2019/12/04 16:55:43 by hulamy ### ########.fr */ +/* Updated: 2019/12/09 21:38:35 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -35,10 +35,19 @@ ** char *s2; ** char *str; ** -** if (ac != 3) +** if (ac == 0) ** return (0); -** s1 = strdup(av[1]); -** s2 = strdup(av[2]); +** else if (ac == 3) +** { +** s1 = strdup(av[1]); +** s2 = strdup(av[2]); +** } +** else +** { +** s1 = malloc(sizeof(char*) * 100); +** s1 = "sdf"; +** s2 = "tref"; +** } ** str = ft_strjoin(s1, s2); ** printf("%s\n", str); ** return (0); diff --git a/srcs/part2/ft_strmapi.c b/srcs/part2/ft_strmapi.c index 30dcb3e..eac69ee 100644 --- a/srcs/part2/ft_strmapi.c +++ b/srcs/part2/ft_strmapi.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:01:40 by hulamy #+# #+# */ -/* Updated: 2019/12/04 17:01:25 by hulamy ### ########.fr */ +/* Updated: 2019/12/09 21:44:07 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -47,8 +47,8 @@ ** str = strdup(av[1]); ** if (ac == 1) ** str = NULL; -** printf("%s\n",str); -** str = ft_strmapi(str, touppercase); +** //str = ft_strmapi(str, touppercase); +** str = ft_strmapi(str, NULL); ** printf("%s\n",str); ** return (0); ** } @@ -62,7 +62,7 @@ char *ft_strmapi(char const *s, char (*f)(unsigned int, char)) int i; int size; - if (!s) + if (!s || !f) return (NULL); size = ft_strlen(s); if (!(str = (char *)malloc(sizeof(char) * (size + 1)))) diff --git a/srcs/part2/ft_strtrim.c b/srcs/part2/ft_strtrim.c index e2fce3d..7276835 100644 --- a/srcs/part2/ft_strtrim.c +++ b/srcs/part2/ft_strtrim.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:01:49 by hulamy #+# #+# */ -/* Updated: 2019/12/04 17:06:50 by hulamy ### ########.fr */ +/* Updated: 2019/12/09 21:46:54 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -72,7 +72,7 @@ ** } ** if (ac == 1) ** { -** s1 = NULL; +** s1 = "fuehf"; ** s2 = NULL; ** } ** printf("%s\n",ft_strtrim(s1, s2)); @@ -87,7 +87,7 @@ char *ft_strtrim(char const *s1, char const *set) int len; char *str; - if (!s1) + if (!s1 || !set) return (NULL); while (s1[0] && ft_strchr(set, s1[0])) s1++; diff --git a/srcs/part2/ft_substr.c b/srcs/part2/ft_substr.c index c99c75f..dbd5cc1 100644 --- a/srcs/part2/ft_substr.c +++ b/srcs/part2/ft_substr.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/12/01 16:00:10 by hulamy #+# #+# */ -/* Updated: 2019/12/01 16:00:12 by hulamy ### ########.fr */ +/* Updated: 2019/12/09 22:00:47 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -61,12 +61,21 @@ ** int main(int ac, char **av) ** { ** char *str; +** size_t size; +** int start; ** -** str = ""; -** size_t size = 0; -** char *ret = ft_substr(str, 5, size); -** if (!ft_strncmp(ret, str + 5, size)) -** printf("gloups\n"); +** str = "frgehr"; +** start = 2; +** size = 5; +** if (ac == 4) +** { +** str = strdup(av[1]); +** start = atoi(av[2]); +** size = atoi(av[3]); +** } +** char *ret = ft_substr(str, start, size); +** printf("%s, %i, %zu\n", str, start, size); +** printf("%s\n", ret); ** free(ret); ** return (0); ** }