aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile26
-rw-r--r--ft_lstpop_front_bonus.c26
-rw-r--r--ft_split.c19
-rw-r--r--ft_strjoin_free.c35
-rw-r--r--ft_strjoin_free_snd.c29
-rw-r--r--ft_strndup.c20
-rw-r--r--libft.h8
7 files changed, 133 insertions, 30 deletions
diff --git a/Makefile b/Makefile
index 6758101..f713b34 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
# By: cacharle <marvin@42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2019/10/08 15:45:53 by cacharle #+# #+# #
-# Updated: 2019/10/17 13:39:09 by cacharle ### ########.fr #
+# Updated: 2019/11/05 22:16:32 by cacharle ### ########.fr #
# #
# **************************************************************************** #
@@ -17,21 +17,25 @@ CC = gcc
CCFLAGS = -Wall -Wextra -Werror
NAME = libft.a
-SRC = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c ft_isdigit.c ft_isprint.c \
- ft_itoa.c ft_memalloc.c ft_memccpy.c ft_memchr.c ft_memcmp.c ft_memcpy.c ft_memdel.c \
- ft_memmove.c ft_memset.c ft_putchar.c ft_putchar_fd.c ft_putendl.c ft_putendl_fd.c \
- ft_putnbr.c ft_putnbr_fd.c ft_putstr.c ft_putstr_fd.c ft_strcat.c ft_strchr.c \
- ft_strclr.c ft_strcmp.c ft_strcpy.c ft_strdel.c ft_strdup.c ft_strequ.c ft_striter.c \
- 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
+SRC = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c ft_isdigit.c \
+ ft_isprint.c ft_itoa.c ft_memalloc.c ft_memccpy.c ft_memchr.c \
+ ft_memcmp.c ft_memcpy.c ft_memdel.c ft_memmove.c ft_memset.c \
+ ft_putchar.c ft_putchar_fd.c ft_putendl.c ft_putendl_fd.c \
+ ft_putnbr.c ft_putnbr_fd.c ft_putstr.c ft_putstr_fd.c ft_strcat.c \
+ ft_strchr.c ft_strclr.c ft_strcmp.c ft_strcpy.c ft_strdel.c \
+ ft_strdup.c ft_strequ.c ft_striter.c 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_strndup.c \
+ ft_strjoin_free.c ft_strjoin_free_snd.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 <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2019/10/25 03:32:51 by cacharle #+# #+# */
+/* Updated: 2019/10/25 03:35:58 by cacharle ### ########.fr */
+/* */
+/* ************************************************************************** */
+
+#include <stdlib.h>
+#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_split.c b/ft_split.c
index 999c664..6fb5964 100644
--- a/ft_split.c
+++ b/ft_split.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/17 08:29:02 by cacharle #+# #+# */
-/* Updated: 2019/11/20 03:54:26 by cacharle ### ########.fr */
+/* Updated: 2019/11/20 04:08:27 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -33,23 +33,6 @@ static size_t count_segment(char const *s, char c)
return (counter);
}
-static 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)
- {
- clone[i] = s1[i];
- i++;
- }
- clone[i] = '\0';
- return (clone);
-}
-
static void *destroy_strs(char **strs)
{
if (strs == NULL)
diff --git a/ft_strjoin_free.c b/ft_strjoin_free.c
new file mode 100644
index 0000000..18ce83d
--- /dev/null
+++ b/ft_strjoin_free.c
@@ -0,0 +1,35 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* ft_strjoin_free.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2019/11/05 21:32:48 by cacharle #+# #+# */
+/* Updated: 2019/11/05 22:17:03 by cacharle ### ########.fr */
+/* */
+/* ************************************************************************** */
+
+#include <stdlib.h>
+#include "libft.h"
+
+char *ft_strjoin_free(char const *s1, char const *s2, int free_nb)
+{
+ char *joined;
+
+ if (s1 == NULL || s2 == NULL)
+ return (NULL);
+ if ((joined = (char*)malloc(sizeof(char)
+ * (ft_strlen(s1) + ft_strlen(s2) + 1))) == NULL)
+ return (NULL);
+ joined = ft_strcpy(joined, s1);
+ joined = ft_strcat(joined, s2);
+ if (free_nb == 1)
+ free((void*)s1);
+ if (free_nb == 2)
+ {
+ free((void*)s1);
+ free((void*)s2);
+ }
+ return (joined);
+}
diff --git a/ft_strjoin_free_snd.c b/ft_strjoin_free_snd.c
new file mode 100644
index 0000000..46e36ae
--- /dev/null
+++ b/ft_strjoin_free_snd.c
@@ -0,0 +1,29 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* ft_strjoin_free_snd.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2019/11/05 22:12:56 by cacharle #+# #+# */
+/* Updated: 2019/11/05 22:17:15 by cacharle ### ########.fr */
+/* */
+/* ************************************************************************** */
+
+#include <stdlib.h>
+#include "libft.h"
+
+char *ft_strjoin_free_snd(char const *s1, char const *s2)
+{
+ char *joined;
+
+ if (s1 == NULL || s2 == NULL)
+ return (NULL);
+ if ((joined = (char*)malloc(sizeof(char)
+ * (ft_strlen(s1) + ft_strlen(s2) + 1))) == NULL)
+ return (NULL);
+ joined = ft_strcpy(joined, s1);
+ joined = ft_strcat(joined, s2);
+ free((void*)s2);
+ return (joined);
+}
diff --git a/ft_strndup.c b/ft_strndup.c
new file mode 100644
index 0000000..0d4119a
--- /dev/null
+++ b/ft_strndup.c
@@ -0,0 +1,20 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* ft_strndup.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2019/10/25 03:28:52 by cacharle #+# #+# */
+/* Updated: 2019/11/20 04:09:59 by cacharle ### ########.fr */
+/* */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+char *ft_strndup(const char *s1, size_t n)
+{
+ if ((clone = ft_strnew(n)) == NULL)
+ return (NULL);
+ return (ft_strncpy(clone, s, n));
+}
diff --git a/libft.h b/libft.h
index 1bf7fe7..e6d5cf9 100644
--- a/libft.h
+++ b/libft.h
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */
-/* Updated: 2019/11/20 03:46:20 by cacharle ### ########.fr */
+/* Updated: 2019/11/20 04:07:41 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -73,6 +73,10 @@ char *ft_strjoin(char const *s1, char const *s2);
char *ft_strtrim(char const *s1, char const *set);
char **ft_split(char const *s, char c);
+char *ft_strjoin_free(char const *s1, char const *s2,
+ int free_nb);
+char *ft_strjoin_free_snd(char const *s1, char const *s2);
+
/*
** character
*/
@@ -104,6 +108,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);
/*
** list
@@ -125,5 +130,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
generated by cgit (git 2.34.1) at 2026-05-16 11:18:17 +0000