From c5a13918c20fd05a4067502df463b5870e7bb4b3 Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Wed, 16 May 2018 12:42:37 +0200 Subject: [PATCH] added ft_strnchr & ft_strrnchr --- Makefile | 4 ++-- ft_strnchr.c | 30 ++++++++++++++++++++++++++++++ ft_strrnchr.c | 28 ++++++++++++++++++++++++++++ libft.h | 5 +++-- 4 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 ft_strnchr.c create mode 100644 ft_strrnchr.c diff --git a/Makefile b/Makefile index defafbe..4c3fd4d 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2018/05/05 16:46:31 by tmaze ### ########.fr # +# Updated: 2018/05/16 12:22:34 by tmaze ### ########.fr # # # #******************************************************************************# @@ -19,7 +19,7 @@ NAME = libft.a SRCS = ft_memset.c ft_bzero.c ft_memcpy.c ft_memccpy.c ft_memmove.c ft_memchr.c ft_memcmp.c ft_strlen.c ft_strdup.c ft_strcpy.c ft_strncpy.c ft_strcat.c ft_strncat.c ft_strlcat.c ft_strchr.c ft_strrchr.c ft_strstr.c ft_strnstr.c ft_strcmp.c ft_strncmp.c ft_atoi.c ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_toupper.c ft_tolower.c \ ft_memalloc.c ft_memdel.c ft_strnew.c ft_strdel.c ft_strclr.c ft_striter.c ft_striteri.c ft_strmap.c ft_strmapi.c ft_strequ.c ft_strnequ.c ft_strsub.c ft_strjoin.c ft_strtrim.c ft_strsplit.c ft_itoa.c ft_putchar.c ft_putstr.c ft_putendl.c ft_putnbr.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c\ ft_lstnew.c ft_lstdelone.c ft_lstdel.c ft_lstadd.c ft_lstiter.c ft_lstmap.c \ - ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c + ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c OBJS = $(SRCS:.c=.o) INCLS = -I. diff --git a/ft_strnchr.c b/ft_strnchr.c new file mode 100644 index 0000000..35da5a7 --- /dev/null +++ b/ft_strnchr.c @@ -0,0 +1,30 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strnchr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/05/16 11:41:02 by tmaze #+# #+# */ +/* Updated: 2018/05/16 11:56:15 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include "libft.h" + +char *ft_strnchr(const char *s, int c, int n) +{ + int i; + char *tmp; + + i = -1; + tmp = (char*)s; + while ((++i == 0 || tmp[i - 1]) && n > 0 && i < n) + { + printf("loop %d\nc: %c\ntmp[i]: %c\n", i, c, tmp[i]); + if (tmp[i] == c) + return (&tmp[i]); + } + return (NULL); +} diff --git a/ft_strrnchr.c b/ft_strrnchr.c new file mode 100644 index 0000000..78bb4b6 --- /dev/null +++ b/ft_strrnchr.c @@ -0,0 +1,28 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strrnchr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/05/16 12:05:03 by tmaze #+# #+# */ +/* Updated: 2018/05/16 12:32:26 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +char *ft_strrnchr(const char *s, int c, int n) +{ + int s_len; + char *tmp; + + s_len = ft_strlen(s); + tmp = (char*)s; + n = (s_len < n) ? s_len : n; + s_len = s_len - n; + while (n >= 0) + if (tmp[s_len + n--] == c) + return (&tmp[s_len + n + 1]); + return (NULL); +} diff --git a/libft.h b/libft.h index cd45e39..1889bf9 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */ -/* Updated: 2018/05/05 16:49:16 by tmaze ### ########.fr */ +/* Updated: 2018/05/16 12:19:51 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -129,5 +129,6 @@ void ft_print_words_tables(char **tab); t_list *ft_lstaddend(t_list **alst, t_list *new); char *ft_strndup(const char *s1, size_t n); unsigned int ft_abs(int nb); - +char *ft_strnchr(const char *s, int c, int n); +char *ft_strrnchr(const char *s, int c, int n); #endif