diff --git a/ex04/ft_strstr.c b/ex04/ft_strstr.c index 889cf52..e8ce8e1 100644 --- a/ex04/ft_strstr.c +++ b/ex04/ft_strstr.c @@ -6,7 +6,7 @@ /* By: tischmid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/24 02:23:28 by tischmid #+# #+# */ -/* Updated: 2023/03/28 17:42:14 by tischmid ### ########.fr */ +/* Updated: 2023/03/28 20:03:53 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,30 +19,49 @@ char *ft_strstr(char *str, char *to_find) while (*str) { offset = 0; - while (*(to_find + offset)) + while (to_find[offset]) { - if (*(to_find + offset) != *(str + offset)) + if (!str[offset] && to_find[offset] != str[offset]) break ; ++offset; } - if (!*(to_find + offset)) + if (!to_find[offset]) return (str); to_find = orig_to_find; ++str; } - return ((void *) 0); + return (0); } /* //// #include -#define STR1 "hello" -#define STR2 "aa" int main(void) { - printf("String to search in: %s\n", STR1); - printf("String to find: %s\n", STR2); - printf("Result: %s\n", ft_strstr(STR1, STR2)); + printf("<> vs <> == <%s>\n", ft_strstr("", "")); + printf(" vs <> == <%s>\n", ft_strstr("a", "")); + printf(" vs <> == <%s>\n", ft_strstr("ab", "")); + printf(" vs <> == <%s>\n", ft_strstr("abc", "")); + printf("<> vs == <%s>\n", ft_strstr("", "a")); + printf(" vs == <%s>\n", ft_strstr("a", "a")); + printf(" vs == <%s>\n", ft_strstr("ab", "a")); + printf(" vs == <%s>\n", ft_strstr("abc", "a")); + printf("<> vs == <%s>\n", ft_strstr("", "b")); + printf(" vs == <%s>\n", ft_strstr("a", "b")); + printf(" vs == <%s>\n", ft_strstr("ab", "b")); + printf(" vs == <%s>\n", ft_strstr("abc", "b")); + printf("<> vs == <%s>\n", ft_strstr("", "c")); + printf(" vs == <%s>\n", ft_strstr("a", "c")); + printf(" vs == <%s>\n", ft_strstr("ab", "c")); + printf(" vs == <%s>\n", ft_strstr("abc", "c")); + printf("<> vs == <%s>\n", ft_strstr("", "ab")); + printf(" vs == <%s>\n", ft_strstr("a", "ab")); + printf(" vs == <%s>\n", ft_strstr("ab", "ab")); + printf(" vs == <%s>\n", ft_strstr("abc", "ab")); + printf("<> vs == <%s>\n", ft_strstr("", "abc")); + printf(" vs == <%s>\n", ft_strstr("a", "abc")); + printf(" vs == <%s>\n", ft_strstr("ab", "abc")); + printf(" vs == <%s>\n", ft_strstr("abc", "abc")); return (0); } */ ////