From f0c8f60576ff44bd270e80cacf0a00da8f9ed70b Mon Sep 17 00:00:00 2001 From: Lukas Jiriste Date: Wed, 6 Sep 2023 13:01:47 +0200 Subject: [PATCH] ft_strtrim now passes alelievr/libft-unit-test as do all other functions. --- ft_strtrim.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ft_strtrim.c b/ft_strtrim.c index 853a6a4..6fbdb92 100644 --- a/ft_strtrim.c +++ b/ft_strtrim.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/08/15 15:11:52 by ljiriste #+# #+# */ -/* Updated: 2023/09/05 19:12:36 by ljiriste ### ########.fr */ +/* Updated: 2023/09/06 12:58:04 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,11 +23,13 @@ static size_t size_needed(const char *s1, const char *set) whole = ft_strlen(s1); at_start = 0; at_end = 0; - while (ft_strchr(set, *s1)) + while (ft_strchr(set, *s1) && *s1) { ++s1; ++at_start; } + if (*s1 == '\0') + return (1); while (*s1) ++s1; --s1; @@ -50,7 +52,7 @@ char *ft_strtrim(const char *s1, const char *set) res = malloc(size * sizeof(char)); if (res == NULL) return (res); - while (ft_strchr(set, *s1)) + while (ft_strchr(set, *s1) && *s1) ++s1; ft_strlcpy(res, s1, size); return (res); -- 2.30.2