finished bonus part

Author: Hikari Shinagawa

.gitignore

@@ -6,58 +6,59 @@
 #    By: hshinaga <[email protected]>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/11/02 15:37:41 by hshinaga          #+#    #+#              #
-#    Updated: 2024/11/05 22:59:03 by hshinaga         ###   ########.fr        #
+#    Updated: 2024/11/06 00:05:25 by hshinaga         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 NAME = libft.a
 CC = cc
 CFLAGS = -Wall -Wextra -Werror
 
-SRCS = ft_isalpha.c \
-       ft_isdigit.c \
-       ft_isalnum.c \
-       ft_isascii.c \
-       ft_isprint.c \
-       ft_strlen.c \
-       ft_memset.c \
-       ft_bzero.c \
-       ft_memcpy.c \
-       ft_memmove.c \
-       ft_strlcpy.c \
-       ft_strlcat.c \
-       ft_toupper.c \
-       ft_tolower.c \
-       ft_strchr.c \
-       ft_strrchr.c \
-       ft_strncmp.c \
-       ft_memchr.c \
-       ft_memcmp.c \
-       ft_strnstr.c \
-       ft_atoi.c \
-       ft_calloc.c \
-       ft_strdup.c \
-       ft_substr.c \
-       ft_strjoin.c \
-       ft_strtrim.c \
-       ft_split.c \
-       ft_itoa.c \
-       ft_strmapi.c \
-       ft_striteri.c \
-       ft_putchar_fd.c \
-       ft_putstr_fd.c \
-       ft_putendl_fd.c \
-       ft_putnbr_fd.c
+SRCS =ft_isalpha.c \
+      ft_isdigit.c \
+      ft_isalnum.c \
+      ft_isascii.c \
+      ft_isprint.c \
+      ft_strlen.c \
+      ft_memset.c \
+      ft_bzero.c \
+      ft_memcpy.c \
+      ft_memmove.c \
+      ft_strlcpy.c \
+      ft_strlcat.c \
+      ft_toupper.c \
+      ft_tolower.c \
+      ft_strchr.c \
+      ft_strrchr.c \
+      ft_strncmp.c \
+      ft_memchr.c \
+      ft_memcmp.c \
+      ft_strnstr.c \
+      ft_atoi.c \
+      ft_calloc.c \
+      ft_strdup.c \
+      ft_substr.c \
+      ft_strjoin.c \
+      ft_strtrim.c \
+      ft_split.c \
+      ft_itoa.c \
+      ft_strmapi.c \
+      ft_striteri.c \
+      ft_putchar_fd.c \
+      ft_putstr_fd.c \
+      ft_putendl_fd.c \
+      ft_putnbr_fd.c 
 
 BONUS_SRCS = ft_lstnew.c \
-       ft_lstadd_front.c \
-       ft_lstsize.c \
-       ft_lstlast.c \
-       ft_lstadd_back.c \
-       ft_lstdelone.c \
-       ft_lstclear.c \
-       ft_lstiter.c \
-       ft_lstmap.c
+             ft_lstadd_front.c \
+             ft_lstsize.c \
+             ft_lstlast.c \
+             ft_lstadd_back.c \
+             ft_lstdelone.c \
+             ft_lstclear.c \
+             ft_lstiter.c \
+             ft_lstmap.c
+
 
 OBJS = $(SRCS:.c=.o)
 BONUS_OBJS = $(BONUS_SRCS:.c=.o)
@@ -67,20 +68,22 @@ all: $(NAME)
 $(NAME): $(OBJS)
 	ar rcs $(NAME) $(OBJS)
 
+bonus: $(OBJS) $(BONUS_OBJS)
+	ar rcs $(NAME) $(OBJS) $(BONUS_OBJS)
+
 %.o: %.c libft.h
 	$(CC) $(CFLAGS) -c $< -o $@
 
 clean:
-	rm -f $(OBJS)
+	rm -f $(OBJS) $(BONUS_OBJS)
 
 fclean: clean
 	rm -f $(NAME)
 
 re: fclean all
 
-
 so:
 	$(CC) -nostartfiles -fPIC $(CFLAGS) $(SRCS)
 	gcc -nostartfiles -shared -o libft.so $(OBJS)
 
-.PHONY: all clean fclean re bonus
+.PHONY: all clean fclean re bonus so

Makefile

@@ -6,7 +6,23 @@
 /*   By: hshinaga <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/05 18:09:11 by hshinaga          #+#    #+#             */
-/*   Updated: 2024/11/05 18:09:12 by hshinaga         ###   ########.fr       */
+/*   Updated: 2024/11/05 23:51:18 by hshinaga         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libft.h"
+
+void	ft_lstadd_back(t_list **lst, t_list *new)
+{
+	t_list	*last;
+
+	if (!lst || !new)
+		return ;
+	if (*lst == NULL)
+	{
+		*lst = new;
+		return ;
+	}
+	last = ft_lstlast(*lst);
+	last->next = new;
+}

ft_lstadd_back.c

@@ -6,7 +6,17 @@
 /*   By: hshinaga <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/05 18:09:08 by hshinaga          #+#    #+#             */
-/*   Updated: 2024/11/05 18:09:09 by hshinaga         ###   ########.fr       */
+/*   Updated: 2024/11/05 23:51:08 by hshinaga         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libft.h"
+
+void	ft_lstadd_front(t_list **lst, t_list *new)
+{
+	if (lst && new)
+	{
+		new->next = *lst;
+		*lst = new;
+	}
+}

ft_lstadd_front.c

@@ -6,7 +6,23 @@
 /*   By: hshinaga <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/05 18:09:06 by hshinaga          #+#    #+#             */
-/*   Updated: 2024/11/05 18:09:07 by hshinaga         ###   ########.fr       */
+/*   Updated: 2024/11/05 23:51:06 by hshinaga         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libft.h"
+
+void	ft_lstclear(t_list **lst, void (*del)(void *))
+{
+	t_list	*tmp;
+
+	if (!lst || !del)
+		return ;
+	while (*lst)
+	{
+		tmp = (*lst)->next;
+		ft_lstdelone(*lst, del);
+		*lst = tmp;
+	}
+	*lst = NULL;
+}

ft_lstclear.c

@@ -6,7 +6,16 @@
 /*   By: hshinaga <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/05 18:09:04 by hshinaga          #+#    #+#             */
-/*   Updated: 2024/11/05 18:09:05 by hshinaga         ###   ########.fr       */
+/*   Updated: 2024/11/05 23:51:04 by hshinaga         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libft.h"
+
+void	ft_lstdelone(t_list *lst, void (*del)(void *))
+{
+	if (!lst || !del)
+		return ;
+	del(lst->content);
+	free(lst);
+}

ft_lstdelone.c

@@ -6,7 +6,19 @@
 /*   By: hshinaga <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/05 18:09:02 by hshinaga          #+#    #+#             */
-/*   Updated: 2024/11/05 18:09:03 by hshinaga         ###   ########.fr       */
+/*   Updated: 2024/11/05 23:51:02 by hshinaga         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libft.h"
+
+void	ft_lstiter(t_list *lst, void (*f)(void *))
+{
+	if (!lst || !f)
+		return ;
+	while (lst)
+	{
+		f(lst->content);
+		lst = lst->next;
+	}
+}

ft_lstiter.c

@@ -6,7 +6,17 @@
 /*   By: hshinaga <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/05 18:08:59 by hshinaga          #+#    #+#             */
-/*   Updated: 2024/11/05 18:09:00 by hshinaga         ###   ########.fr       */
+/*   Updated: 2024/11/05 23:51:00 by hshinaga         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libft.h"
+
+t_list	*ft_lstlast(t_list *lst)
+{
+	if (!lst)
+		return (NULL);
+	while (lst->next)
+		lst = lst->next;
+	return (lst);
+}

ft_lstlast.c

@@ -6,7 +6,34 @@
 /*   By: hshinaga <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/05 18:08:57 by hshinaga          #+#    #+#             */
-/*   Updated: 2024/11/05 18:08:58 by hshinaga         ###   ########.fr       */
+/*   Updated: 2024/11/05 23:50:57 by hshinaga         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libft.h"
+
+t_list	*ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *))
+{
+	t_list	*new_lst;
+	t_list	*new_node;
+	void	*content;
+
+	if (!lst || !f || !del)
+		return (NULL);
+	new_lst = NULL;
+	while (lst)
+	{
+		content = f(lst->content);
+		new_node = ft_lstnew(content);
+		if (!new_node)
+		{
+			if (content)
+				del(content);
+			ft_lstclear(&new_lst, del);
+			return (NULL);
+		}
+		ft_lstadd_back(&new_lst, new_node);
+		lst = lst->next;
+	}
+	return (new_lst);
+}

ft_lstmap.c

@@ -6,7 +6,20 @@
 /*   By: hshinaga <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/05 18:08:52 by hshinaga          #+#    #+#             */
-/*   Updated: 2024/11/05 18:08:53 by hshinaga         ###   ########.fr       */
+/*   Updated: 2024/11/05 22:26:53 by hshinaga         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libft.h"
+
+t_list	*ft_lstnew(void *content)
+{
+	t_list	*new_node;
+
+	new_node = (t_list *)malloc(sizeof(t_list));
+	if (!new_node)
+		return (NULL);
+	new_node->content = content;
+	new_node->next = NULL;
+	return (new_node);
+}

ft_lstnew.c

@@ -6,7 +6,23 @@
 /*   By: hshinaga <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/05 18:08:55 by hshinaga          #+#    #+#             */
-/*   Updated: 2024/11/05 18:08:56 by hshinaga         ###   ########.fr       */
+/*   Updated: 2024/11/05 23:35:20 by hshinaga         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libft.h"
+
+int	ft_lstsize(t_list *lst)
+{
+	int		count;
+	t_list	*curr;
+
+	count = 0;
+	curr = lst;
+	while (curr != NULL)
+	{
+		count++;
+		curr = curr->next;
+	}
+	return (count);
+}

ft_lstsize.c

@@ -6,21 +6,21 @@
 /*   By: hshinaga <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/02 15:32:09 by hshinaga          #+#    #+#             */
-/*   Updated: 2024/11/05 17:44:45 by hshinaga         ###   ########.fr       */
+/*   Updated: 2024/11/06 00:04:02 by hshinaga         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft.h"
 
-char	*ft_strdup(const char *s1)
+char	*ft_strdup(const char *src_str)
 {
-	char	*dup;
-	size_t	len;
+	char	*new_str;
+	size_t	str_len;
 
-	len = ft_strlen(s1);
-	dup = (char *)malloc(len + 1);
-	if (!dup)
+	str_len = ft_strlen(src_str);
+	new_str = (char *)malloc(sizeof(char) * (str_len + 1));
+	if (!new_str)
 		return (NULL);
-	ft_strlcpy(dup, s1, len + 1);
-	return (dup);
+	ft_strlcpy(new_str, src_str, str_len + 1);
+	return (new_str);
 }