From c29637ab4d2f1fc9ccb7a9e5dbe4c7983cd4fa33 Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Wed, 8 Nov 2023 17:30:41 +0100 Subject: [PATCH] finish part1 - to correct memchr & memcmp & strnstr --- Makefile | 12 +++++++----- ft_memchr.c | 4 +++- ft_strchr.c | 15 ++++++++------- libft.h | 4 +++- libft.so | Bin 16072 -> 0 bytes 5 files changed, 21 insertions(+), 14 deletions(-) delete mode 100755 libft.so diff --git a/Makefile b/Makefile index 97a46ba..c98e858 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: adjoly +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/01 11:03:22 by adjoly #+# #+# # -# Updated: 2023/11/08 12:14:33 by adjoly ### ########.fr # +# Updated: 2023/11/08 17:07:14 by adjoly ### ########.fr # # # # **************************************************************************** # @@ -36,11 +36,13 @@ SRCS = ft_atoi.c \ ft_strlcat.c \ ft_strjoin.c \ ft_strncmp.c \ - ft_strchr.c \ ft_itoa.c \ ft_calloc.c \ ft_memchr.c \ ft_memcmp.c \ + ft_strchr.c \ + ft_strrchr.c \ + ft_strnstr.c \ OBJS = $(SRCS:.c=.o) @@ -51,9 +53,9 @@ HEADER = libft.h $(NAME): $(OBJS) ar -rcs $(NAME) $(OBJS) -so: - $(CC) -nostartfiles -fPIC $(CFLAGS) $(SRCS) - gcc -nostartfiles -shared -o libft.so $(OBJS) +# so: + # $(CC) -nostartfiles -fPIC $(CFLAGS) $(SRCS) + # gcc -nostartfiles -shared -o libft.so $(OBJS) %.o: %.c $(CC) $(FLAGS) -I $(HEADER) $< -c -o $@ diff --git a/ft_memchr.c b/ft_memchr.c index 3483542..c6c91ff 100644 --- a/ft_memchr.c +++ b/ft_memchr.c @@ -6,12 +6,14 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/05 14:52:53 by adjoly #+# #+# */ -/* Updated: 2023/11/08 11:59:58 by adjoly ### ########.fr */ +/* Updated: 2023/11/08 14:52:06 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" +#define BUFFER_SIZE 10 + void *ft_memchr(const void *s, int c, size_t n) { size_t i; diff --git a/ft_strchr.c b/ft_strchr.c index 4d96690..2a967e2 100644 --- a/ft_strchr.c +++ b/ft_strchr.c @@ -6,17 +6,18 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/01 15:45:18 by adjoly #+# #+# */ -/* Updated: 2023/11/08 12:17:21 by adjoly ### ########.fr */ +/* Updated: 2023/11/08 14:31:21 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ +#include "libft.h" + char *ft_strchr(const char *s, int c) { - int i; + size_t len_s; + char *result; - i = 0; - while (s[i]) - { - - } + len_s = ft_strlen(s); + result = ft_memchr(s, c, len_s); + return (result); } diff --git a/libft.h b/libft.h index ad81796..1ccdd3a 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/01 10:06:03 by adjoly #+# #+# */ -/* Updated: 2023/11/08 12:14:58 by adjoly ### ########.fr */ +/* Updated: 2023/11/08 17:08:26 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -46,5 +46,7 @@ char *ft_itoa(int n); void *ft_memmove(void *dest, const void *src, size_t n); void *ft_memchr(const void *s, int c, size_t n); int ft_memcmp(const void *s1, const void *s2, size_t n); +char *ft_strrchr(const char *s, int c); +char *ft_strnstr(const char *big, const char *little, size_t len); #endif \ No newline at end of file diff --git a/libft.so b/libft.so deleted file mode 100755 index c4036e67ef92992f0c13fa8d73fe571b5f49fabb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16072 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 CBCOZ|