From cade8c9ab269b0981725f002fea34fda035fb707 Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 25 Oct 2019 03:37:52 +0200 Subject: Added strndup and lstpop_front --- Makefile | 6 +++--- ft_lstpop_front_bonus.c | 26 ++++++++++++++++++++++++++ ft_strndup.c | 31 +++++++++++++++++++++++++++++++ libft.h | 4 +++- 4 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 ft_lstpop_front_bonus.c create mode 100644 ft_strndup.c diff --git a/Makefile b/Makefile index 6758101..9dca309 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: cacharle +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2019/10/17 13:39:09 by cacharle ### ########.fr # +# Updated: 2019/10/25 03:31:58 by cacharle ### ########.fr # # # # **************************************************************************** # @@ -25,13 +25,13 @@ SRC = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c ft_isdigit.c f ft_striteri.c ft_strjoin.c ft_strlcat.c ft_strlen.c ft_strmap.c ft_strmapi.c \ ft_strncat.c ft_strncmp.c ft_strncpy.c ft_strnequ.c ft_strnew.c ft_strnstr.c \ ft_strrchr.c ft_split.c ft_strstr.c ft_substr.c ft_strtrim.c ft_tolower.c \ - ft_toupper.c ft_strlcpy.c ft_calloc.c + ft_toupper.c ft_strlcpy.c ft_calloc.c ft_strndup.c OBJ = $(SRC:.c=.o) INCLUDE = libft.h BONUSSRC = ft_lstadd_back_bonus.c ft_lstadd_front_bonus.c ft_lstclear_bonus.c \ ft_lstdelone_bonus.c ft_lstiter_bonus.c ft_lstlast_bonus.c \ - ft_lstmap_bonus.c ft_lstnew_bonus.c ft_lstsize_bonus.c + ft_lstmap_bonus.c ft_lstnew_bonus.c ft_lstsize_bonus.c ft_lstpop_front_bonus.c BONUSOBJ = $(BONUSSRC:.c=.o) all: $(NAME) diff --git a/ft_lstpop_front_bonus.c b/ft_lstpop_front_bonus.c new file mode 100644 index 0000000..f81315a --- /dev/null +++ b/ft_lstpop_front_bonus.c @@ -0,0 +1,26 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_lstpop_front_bonus.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/25 03:32:51 by cacharle #+# #+# */ +/* Updated: 2019/10/25 03:35:58 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include "libft.h" + +void ft_lstpop_front(t_list **lst, void (*del)(void *)) +{ + t_list *tmp; + + if (lst == NULL || *lst == NULL) + return ; + tmp = (*lst)->next; + del((*lst)->content); + free(*lst); + *lst = tmp; +} diff --git a/ft_strndup.c b/ft_strndup.c new file mode 100644 index 0000000..d43c0ce --- /dev/null +++ b/ft_strndup.c @@ -0,0 +1,31 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strndup.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/25 03:28:52 by cacharle #+# #+# */ +/* Updated: 2019/10/25 03:36:24 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include + +char *ft_strndup(const char *s1, size_t n) +{ + char *clone; + size_t i; + + if ((clone = (char*)malloc(sizeof(char) * (n + 1))) == NULL) + return (NULL); + i = 0; + while (i < n && s1[i]) + { + clone[i] = s1[i]; + i++; + } + clone[i] = '\0'; + return (clone); +} diff --git a/libft.h b/libft.h index 87b57c2..1ba3dda 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */ -/* Updated: 2019/10/17 09:08:31 by cacharle ### ########.fr */ +/* Updated: 2019/10/25 03:32:43 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -81,6 +81,7 @@ void ft_putchar_fd(char c, int fd); void ft_putstr_fd(char *s, int fd); void ft_putendl_fd(char *s, int fd); void ft_putnbr_fd(int n, int fd); +char *ft_strndup(const char *s1, size_t n); /* ** bonus @@ -96,5 +97,6 @@ void ft_lstclear(t_list **lst, void (*del)(void *)); void ft_lstiter(t_list *lst, void (*f)(void *)); t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)); +void ft_lstpop_front(t_list **lst, void (*del)(void *)); #endif -- cgit