add gnl
This commit is contained in:
parent
4011a449c0
commit
bb23123c86
24
Makefile
24
Makefile
@ -24,41 +24,43 @@ SRCS = ft_memset.c \
|
|||||||
ft_calloc.c \
|
ft_calloc.c \
|
||||||
ft_strdup.c \
|
ft_strdup.c \
|
||||||
ft_substr.c \
|
ft_substr.c \
|
||||||
ft_strjoin.c \
|
|
||||||
ft_strtrim.c \
|
ft_strtrim.c \
|
||||||
ft_split.c \
|
ft_split.c \
|
||||||
|
ft_strjoin.c \
|
||||||
ft_itoa.c \
|
ft_itoa.c \
|
||||||
ft_strmapi.c \
|
ft_strmapi.c \
|
||||||
ft_putchar_fd.c \
|
ft_putchar_fd.c \
|
||||||
ft_putstr_fd.c \
|
ft_putstr_fd.c \
|
||||||
ft_putendl_fd.c \
|
ft_putendl_fd.c \
|
||||||
ft_putnbr_fd.c
|
ft_putnbr_fd.c \
|
||||||
|
get_next_line.c \
|
||||||
|
get_next_line_utils.c
|
||||||
OBJS = ${SRCS:.c=.o}
|
OBJS = ${SRCS:.c=.o}
|
||||||
BONUS_C = ft_lstnew.c ft_lstadd_front.c ft_lstsize.c ft_lstlast.c ft_lstadd_back.c \
|
BONUS_C = 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_lstdelone.c ft_lstclear.c ft_lstiter.c ft_lstmap.c ft_lstbeforelast.c
|
||||||
BONUS_O = ${BONUS_C:.c=.o}
|
BONUS_O = ${BONUS_C:.c=.o}
|
||||||
CC = gcc
|
CC = gcc
|
||||||
CFLAGS = -Wall -Wextra -Werror
|
CFLAGS = -Wall -Wextra
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
${CC} ${CFLAGS} -c $< -o ${<:.c=.o}
|
@${CC} ${CFLAGS} -c $< -o ${<:.c=.o}
|
||||||
|
|
||||||
${NAME}:${OBJS}
|
${NAME}:${OBJS}
|
||||||
ar -rcs ${NAME} ${OBJS}
|
@ar -rcs ${NAME} ${OBJS}
|
||||||
|
|
||||||
all: ${NAME}
|
all: ${NAME}
|
||||||
|
|
||||||
bonus: all
|
bonus: all
|
||||||
${CC} ${CFLAGS} -c ${BONUS_C}
|
@${CC} ${CFLAGS} -c ${BONUS_C}
|
||||||
ar -rcs ${NAME} ${BONUS_O}
|
@ar -rcs ${NAME} ${BONUS_O}
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
${RM} ${OBJS}
|
@${RM} ${OBJS}
|
||||||
${RM} ${BONUS_O}
|
@${RM} ${BONUS_O}
|
||||||
|
|
||||||
fclean: clean
|
fclean: clean
|
||||||
${RM} ${NAME}
|
@${RM} ${NAME}
|
||||||
|
|
||||||
re: fclean all
|
re: fclean all
|
||||||
|
|
||||||
|
|||||||
@ -6,17 +6,17 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:09:17 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:09:17 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/12 12:05:13 by apommier ### ########.fr */
|
/* Updated: 2022/01/18 06:50:22 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
#include "libft.h"
|
#include "libft.h"
|
||||||
|
|
||||||
int ft_atoi(const char *nptr)
|
long ft_atoi(const char *nptr)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int nbr;
|
long nbr;
|
||||||
int minus;
|
long minus;
|
||||||
|
|
||||||
minus = 1;
|
minus = 1;
|
||||||
nbr = 0;
|
nbr = 0;
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:09:48 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:09:48 by apommier #+# #+# */
|
||||||
/* Updated: 2020/11/29 17:02:33 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:26:30 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:09:57 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:09:57 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/16 16:13:27 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 21:18:04 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -3,10 +3,10 @@
|
|||||||
/* ::: :::::::: */
|
/* ::: :::::::: */
|
||||||
/* ft_itoa.c :+: :+: :+: */
|
/* ft_itoa.c :+: :+: :+: */
|
||||||
/* +:+ +:+ +:+ */
|
/* +:+ +:+ +:+ */
|
||||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/12/08 18:20:19 by apommier #+# #+# */
|
/* Created: 2020/12/08 18:20:19 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/20 11:52:40 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:28:01 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
28
ft_lstbeforelast.c
Normal file
28
ft_lstbeforelast.c
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
/* ************************************************************************** */
|
||||||
|
/* */
|
||||||
|
/* ::: :::::::: */
|
||||||
|
/* ft_lstbeforelast.c :+: :+: :+: */
|
||||||
|
/* +:+ +:+ +:+ */
|
||||||
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
|
/* +#+#+#+#+#+ +#+ */
|
||||||
|
/* Created: 2021/12/09 19:16:55 by apommier #+# #+# */
|
||||||
|
/* Updated: 2022/01/17 11:28:22 by apommier ### ########.fr */
|
||||||
|
/* */
|
||||||
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
#include "libft.h"
|
||||||
|
|
||||||
|
t_list *ft_lstbeforelast(t_list *lst)
|
||||||
|
{
|
||||||
|
t_list *save;
|
||||||
|
|
||||||
|
save = 0;
|
||||||
|
if (!lst)
|
||||||
|
return (0);
|
||||||
|
while (lst->next)
|
||||||
|
{
|
||||||
|
save = lst;
|
||||||
|
lst = lst->next;
|
||||||
|
}
|
||||||
|
return (save);
|
||||||
|
}
|
||||||
@ -3,10 +3,10 @@
|
|||||||
/* ::: :::::::: */
|
/* ::: :::::::: */
|
||||||
/* ft_lstclear.c :+: :+: :+: */
|
/* ft_lstclear.c :+: :+: :+: */
|
||||||
/* +:+ +:+ +:+ */
|
/* +:+ +:+ +:+ */
|
||||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/12/09 19:58:04 by apommier #+# #+# */
|
/* Created: 2020/12/09 19:58:04 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/12 09:15:23 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:28:39 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -20,7 +20,7 @@ void ft_lstclear(t_list **lst, void (*del)(void*))
|
|||||||
while (*lst)
|
while (*lst)
|
||||||
{
|
{
|
||||||
chr = (*lst)->next;
|
chr = (*lst)->next;
|
||||||
del((*lst)->content);
|
del((*lst)->nbr);
|
||||||
free(*lst);
|
free(*lst);
|
||||||
*lst = chr;
|
*lst = chr;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,6 +16,6 @@ void ft_lstdelone(t_list *lst, void (*del)(void*))
|
|||||||
{
|
{
|
||||||
if (!lst)
|
if (!lst)
|
||||||
return ;
|
return ;
|
||||||
del(lst->content);
|
del(lst->nbr);
|
||||||
free(lst);
|
free(lst);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ void ft_lstiter(t_list *lst, void (*f)(void *))
|
|||||||
{
|
{
|
||||||
while (lst)
|
while (lst)
|
||||||
{
|
{
|
||||||
f(lst->content);
|
f(lst->nbr);
|
||||||
lst = lst->next;
|
lst = lst->next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,10 +3,10 @@
|
|||||||
/* ::: :::::::: */
|
/* ::: :::::::: */
|
||||||
/* ft_lstlast.c :+: :+: :+: */
|
/* ft_lstlast.c :+: :+: :+: */
|
||||||
/* +:+ +:+ +:+ */
|
/* +:+ +:+ +:+ */
|
||||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/12/09 19:16:55 by apommier #+# #+# */
|
/* Created: 2020/12/09 19:16:55 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/09 19:21:54 by apommier ### ########.fr */
|
/* Updated: 2021/11/26 01:21:39 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@ t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *))
|
|||||||
begin = 0;
|
begin = 0;
|
||||||
while (lst)
|
while (lst)
|
||||||
{
|
{
|
||||||
new = ft_lstnew(f(lst->content));
|
new = ft_lstnew(f(lst->nbr));
|
||||||
if (!new)
|
if (!new)
|
||||||
{
|
{
|
||||||
ft_lstclear(&begin, *del);
|
ft_lstclear(&begin, *del);
|
||||||
|
|||||||
@ -3,10 +3,10 @@
|
|||||||
/* ::: :::::::: */
|
/* ::: :::::::: */
|
||||||
/* ft_lstnew.c :+: :+: :+: */
|
/* ft_lstnew.c :+: :+: :+: */
|
||||||
/* +:+ +:+ +:+ */
|
/* +:+ +:+ +:+ */
|
||||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/12/09 01:06:20 by apommier #+# #+# */
|
/* Created: 2020/12/09 01:06:20 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/11 17:46:20 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:29:09 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -19,7 +19,8 @@ t_list *ft_lstnew(void *content)
|
|||||||
new = (t_list *)malloc(sizeof(t_list));
|
new = (t_list *)malloc(sizeof(t_list));
|
||||||
if (!new)
|
if (!new)
|
||||||
return (0);
|
return (0);
|
||||||
new->content = content;
|
new->swap = 0;
|
||||||
|
new->nbr = content;
|
||||||
new->next = 0;
|
new->next = 0;
|
||||||
return (new);
|
return (new);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:11:04 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:11:04 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/12 14:07:04 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:29:38 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:11:39 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:11:39 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/12 13:53:45 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:29:51 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:11:51 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:11:51 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/12 14:14:51 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:30:32 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:12:03 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:12:03 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/16 16:14:24 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:30:43 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:12:14 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:12:14 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/13 21:15:13 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:31:05 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:12:24 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:12:24 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/11 15:48:06 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:31:28 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -3,10 +3,10 @@
|
|||||||
/* ::: :::::::: */
|
/* ::: :::::::: */
|
||||||
/* ft_putnbr_fd.c :+: :+: :+: */
|
/* ft_putnbr_fd.c :+: :+: :+: */
|
||||||
/* +:+ +:+ +:+ */
|
/* +:+ +:+ +:+ */
|
||||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/12/08 23:25:57 by apommier #+# #+# */
|
/* Created: 2020/12/08 23:25:57 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/12 09:42:09 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:31:56 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -3,10 +3,10 @@
|
|||||||
/* ::: :::::::: */
|
/* ::: :::::::: */
|
||||||
/* ft_split.c :+: :+: :+: */
|
/* ft_split.c :+: :+: :+: */
|
||||||
/* +:+ +:+ +:+ */
|
/* +:+ +:+ +:+ */
|
||||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/12/07 00:54:12 by apommier #+# #+# */
|
/* Created: 2020/12/07 00:54:12 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/13 23:07:09 by apommier ### ########.fr */
|
/* Updated: 2022/01/21 08:09:38 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -71,7 +71,8 @@ char **ft_split(char const *s, char c)
|
|||||||
while (s[i] == c && s[i])
|
while (s[i] == c && s[i])
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
if (!(dest = (char**)malloc(sizeof(char*) * (i + j))))
|
dest = (char **)ft_calloc(sizeof(char *), (i + j));
|
||||||
|
if (!dest)
|
||||||
return (0);
|
return (0);
|
||||||
dest[j] = 0;
|
dest[j] = 0;
|
||||||
call((char *)s, c, dest, j);
|
call((char *)s, c, dest, j);
|
||||||
|
|||||||
10
ft_strchr.c
10
ft_strchr.c
@ -3,10 +3,10 @@
|
|||||||
/* ::: :::::::: */
|
/* ::: :::::::: */
|
||||||
/* ft_strchr.c :+: :+: :+: */
|
/* ft_strchr.c :+: :+: :+: */
|
||||||
/* +:+ +:+ +:+ */
|
/* +:+ +:+ +:+ */
|
||||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/12/12 13:57:59 by apommier #+# #+# */
|
/* Created: 2020/12/12 13:57:59 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/12 13:58:05 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 21:18:59 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -14,9 +14,11 @@
|
|||||||
|
|
||||||
char *ft_strchr(const char *s, int c)
|
char *ft_strchr(const char *s, int c)
|
||||||
{
|
{
|
||||||
unsigned char *str;
|
char *str;
|
||||||
|
|
||||||
str = (unsigned char*)s;
|
if (!s)
|
||||||
|
return ("no s");
|
||||||
|
str = (char *)s;
|
||||||
while ((*str != c) && (*str != 0))
|
while ((*str != c) && (*str != 0))
|
||||||
str++;
|
str++;
|
||||||
if (*str == c)
|
if (*str == c)
|
||||||
|
|||||||
19
ft_strjoin.c
19
ft_strjoin.c
@ -3,16 +3,16 @@
|
|||||||
/* ::: :::::::: */
|
/* ::: :::::::: */
|
||||||
/* ft_strjoin.c :+: :+: :+: */
|
/* ft_strjoin.c :+: :+: :+: */
|
||||||
/* +:+ +:+ +:+ */
|
/* +:+ +:+ +:+ */
|
||||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/12/11 15:38:13 by apommier #+# #+# */
|
/* Created: 2022/01/20 21:44:01 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/16 17:00:44 by apommier ### ########.fr */
|
/* Updated: 2022/01/21 08:07:04 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
#include "libft.h"
|
#include "libft.h"
|
||||||
|
|
||||||
char *ft_strjoin(char const *s1, char const *s2)
|
char *ft_strjoin(char *save, char *s2)
|
||||||
{
|
{
|
||||||
char *dest;
|
char *dest;
|
||||||
int i;
|
int i;
|
||||||
@ -20,18 +20,17 @@ char *ft_strjoin(char const *s1, char const *s2)
|
|||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
j = 0;
|
j = 0;
|
||||||
if (!s1 || !s2)
|
if (!save && !s2)
|
||||||
return (0);
|
return (0);
|
||||||
if (!(dest = (char*)malloc(ft_strlen(s1) + ft_strlen(s2) + 1)))
|
dest = malloc(ft_strlen(save) + ft_strlen(s2) + 1);
|
||||||
return (0);
|
while (save && save[i])
|
||||||
while (s1[i] && s1)
|
|
||||||
{
|
{
|
||||||
dest[j] = s1[i];
|
dest[j] = save[i];
|
||||||
j++;
|
j++;
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
i = 0;
|
i = 0;
|
||||||
while (s2[i] && s2)
|
while (s2 && s2[i])
|
||||||
{
|
{
|
||||||
dest[j] = s2[i];
|
dest[j] = s2[i];
|
||||||
j++;
|
j++;
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:13:07 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:13:07 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/12 16:07:05 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:38:48 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:13:19 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:13:19 by apommier #+# #+# */
|
||||||
/* Updated: 2020/11/29 17:12:23 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 21:12:05 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -17,6 +17,8 @@ size_t ft_strlen(const char *s)
|
|||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
|
if (!s)
|
||||||
|
return (0);
|
||||||
while (s[i] != 0)
|
while (s[i] != 0)
|
||||||
i++;
|
i++;
|
||||||
return (i);
|
return (i);
|
||||||
|
|||||||
@ -3,10 +3,10 @@
|
|||||||
/* ::: :::::::: */
|
/* ::: :::::::: */
|
||||||
/* ft_strmapi.c :+: :+: :+: */
|
/* ft_strmapi.c :+: :+: :+: */
|
||||||
/* +:+ +:+ +:+ */
|
/* +:+ +:+ +:+ */
|
||||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/12/08 19:03:09 by apommier #+# #+# */
|
/* Created: 2020/12/08 19:03:09 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/16 16:52:49 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:39:05 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
18
ft_strncmp.c
18
ft_strncmp.c
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:13:31 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:13:31 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/13 20:44:39 by apommier ### ########.fr */
|
/* Updated: 2022/02/14 00:27:01 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -26,3 +26,19 @@ int ft_strncmp(const char *s1, const char *s2, size_t n)
|
|||||||
}
|
}
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ft_strcmp(const char *s1, const char *s2)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
i = 0;
|
||||||
|
if (!s1 || !s2)
|
||||||
|
return (1);
|
||||||
|
while (s1[i] || s2[i])
|
||||||
|
{
|
||||||
|
if (s1[i] != s2[i])
|
||||||
|
return ((unsigned char)s1[i] - (unsigned char)s2[i]);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:13:42 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:13:42 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/13 22:55:27 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:39:28 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 00:13:52 by apommier #+# #+# */
|
/* Created: 2020/11/29 00:13:52 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/16 16:14:41 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:39:37 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/11/29 23:52:05 by apommier #+# #+# */
|
/* Created: 2020/11/29 23:52:05 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/16 18:06:01 by apommier ### ########.fr */
|
/* Updated: 2022/01/17 11:40:17 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -57,7 +57,8 @@ char *ft_strtrim(char const *s1, char const *set)
|
|||||||
if (!s1)
|
if (!s1)
|
||||||
return (0);
|
return (0);
|
||||||
len = len_dest(s1, set);
|
len = len_dest(s1, set);
|
||||||
if (!(dest = ft_calloc(len + 1, 1)))
|
dest = ft_calloc(len + 1, 1);
|
||||||
|
if (!dest)
|
||||||
return (0);
|
return (0);
|
||||||
while (is_set(set, s1[i]))
|
while (is_set(set, s1[i]))
|
||||||
i++;
|
i++;
|
||||||
|
|||||||
100
get_next_line.c
Normal file
100
get_next_line.c
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
/* ************************************************************************** */
|
||||||
|
/* */
|
||||||
|
/* ::: :::::::: */
|
||||||
|
/* get_next_line.c :+: :+: :+: */
|
||||||
|
/* +:+ +:+ +:+ */
|
||||||
|
/* By: kinou <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
||||||
|
/* +#+#+#+#+#+ +#+ */
|
||||||
|
/* Created: 2021/10/23 07:55:17 by kinou #+# #+# */
|
||||||
|
/* Updated: 2021/11/01 10:21:35 by kinou ### ########.fr */
|
||||||
|
/* */
|
||||||
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
#include "libft.h"
|
||||||
|
|
||||||
|
char *ft_free(char *save, int *end)
|
||||||
|
{
|
||||||
|
if (!*end)
|
||||||
|
{
|
||||||
|
free(save);
|
||||||
|
free(end);
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
free(end);
|
||||||
|
return (save);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *set_line(char *line, char *save)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
i = 0;
|
||||||
|
line = ft_strjoin(save, 0);
|
||||||
|
while (line[i] && line[i] != '\n')
|
||||||
|
i++;
|
||||||
|
if (line[i] == '\n')
|
||||||
|
{
|
||||||
|
while (line[i++])
|
||||||
|
line[i] = '\0';
|
||||||
|
}
|
||||||
|
return (line);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *set_save(char *save)
|
||||||
|
{
|
||||||
|
char *delete;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
i = 0;
|
||||||
|
delete = save;
|
||||||
|
while (save[i] && save[i] != '\n')
|
||||||
|
i++;
|
||||||
|
if (save[i] != '\n')
|
||||||
|
i = 0;
|
||||||
|
save = ft_strjoin((save + i + 1), 0);
|
||||||
|
free(delete);
|
||||||
|
return (save);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *next_line(char *save, int *end, int fd)
|
||||||
|
{
|
||||||
|
char *delete;
|
||||||
|
char *dest;
|
||||||
|
|
||||||
|
while (!ft_strchr(save, '\n') && *end > 0)
|
||||||
|
{
|
||||||
|
dest = ft_calloc(1, 1 + 1);
|
||||||
|
*end = read(fd, dest, 1);
|
||||||
|
delete = save;
|
||||||
|
save = ft_strjoin(save, dest);
|
||||||
|
free(delete);
|
||||||
|
free(dest);
|
||||||
|
}
|
||||||
|
return (save);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *get_next_line(int fd)
|
||||||
|
{
|
||||||
|
static char *save = NULL;
|
||||||
|
int *end;
|
||||||
|
char *line;
|
||||||
|
|
||||||
|
line = 0;
|
||||||
|
if (fd < 0)
|
||||||
|
return (0);
|
||||||
|
end = malloc(sizeof(int *));
|
||||||
|
*end = 1;
|
||||||
|
if (save == NULL)
|
||||||
|
save = ft_calloc(1, 1);
|
||||||
|
save = next_line(save, end, fd);
|
||||||
|
line = set_line(line, save);
|
||||||
|
if (ft_strlen(line) > 0)
|
||||||
|
{
|
||||||
|
save = set_save(save);
|
||||||
|
save = ft_free(save, end);
|
||||||
|
return (line);
|
||||||
|
}
|
||||||
|
free(line);
|
||||||
|
save = ft_free(save, end);
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
19
get_next_line.h
Normal file
19
get_next_line.h
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
/* ************************************************************************** */
|
||||||
|
/* */
|
||||||
|
/* ::: :::::::: */
|
||||||
|
/* get_next_line.h :+: :+: :+: */
|
||||||
|
/* +:+ +:+ +:+ */
|
||||||
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
|
/* +#+#+#+#+#+ +#+ */
|
||||||
|
/* Created: 2020/12/14 05:58:49 by apommier #+# #+# */
|
||||||
|
/* Updated: 2022/01/17 21:45:15 by apommier ### ########.fr */
|
||||||
|
/* */
|
||||||
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
#ifndef GET_NEXT_LINE_H
|
||||||
|
# define GET_NEXT_LINE_H
|
||||||
|
|
||||||
|
char *get_next_line(int fd);
|
||||||
|
char *ft_strjoin(char *save, char *s2);
|
||||||
|
|
||||||
|
#endif
|
||||||
41
get_next_line_utils.c
Normal file
41
get_next_line_utils.c
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
/* ************************************************************************** */
|
||||||
|
/* */
|
||||||
|
/* ::: :::::::: */
|
||||||
|
/* get_next_line_utils.c :+: :+: :+: */
|
||||||
|
/* +:+ +:+ +:+ */
|
||||||
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
|
/* +#+#+#+#+#+ +#+ */
|
||||||
|
/* Created: 2020/12/14 06:05:54 by apommier #+# #+# */
|
||||||
|
/* Updated: 2022/01/20 21:58:39 by apommier ### ########.fr */
|
||||||
|
/* */
|
||||||
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
#include "libft.h"
|
||||||
|
|
||||||
|
char *ft_strjoin(char *save, char *s2)
|
||||||
|
{
|
||||||
|
char *dest;
|
||||||
|
int i;
|
||||||
|
int j;
|
||||||
|
|
||||||
|
i = 0;
|
||||||
|
j = 0;
|
||||||
|
if (!save && !s2)
|
||||||
|
return (0);
|
||||||
|
dest = malloc(ft_strlen(save) + ft_strlen(s2) + 1);
|
||||||
|
while (save && save[i])
|
||||||
|
{
|
||||||
|
dest[j] = save[i];
|
||||||
|
j++;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
i = 0;
|
||||||
|
while (s2 && s2[i])
|
||||||
|
{
|
||||||
|
dest[j] = s2[i];
|
||||||
|
j++;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
dest[j] = 0;
|
||||||
|
return (dest);
|
||||||
|
}
|
||||||
21
libft.h
21
libft.h
@ -3,23 +3,26 @@
|
|||||||
/* ::: :::::::: */
|
/* ::: :::::::: */
|
||||||
/* libft.h :+: :+: :+: */
|
/* libft.h :+: :+: :+: */
|
||||||
/* +:+ +:+ +:+ */
|
/* +:+ +:+ +:+ */
|
||||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2020/12/11 03:21:27 by apommier #+# #+# */
|
/* Created: 2020/12/11 03:21:27 by apommier #+# #+# */
|
||||||
/* Updated: 2020/12/11 15:43:19 by apommier ### ########.fr */
|
/* Updated: 2022/02/14 00:27:42 by apommier ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
#ifndef LIBFT_H
|
#ifndef LIBFT_H
|
||||||
# define LIBFT_H
|
# define LIBFT_H
|
||||||
|
|
||||||
# include <unistd.h>
|
|
||||||
# include <stdlib.h>
|
# include <stdlib.h>
|
||||||
|
# include <unistd.h>
|
||||||
|
# include "get_next_line.h"
|
||||||
|
|
||||||
typedef struct s_list
|
typedef struct t_slist
|
||||||
{
|
{
|
||||||
void *content;
|
void *nbr;
|
||||||
struct s_list *next;
|
int index;
|
||||||
|
int swap;
|
||||||
|
struct t_slist *next;
|
||||||
} t_list;
|
} t_list;
|
||||||
|
|
||||||
void *ft_memset(void *s, int c, size_t n);
|
void *ft_memset(void *s, int c, size_t n);
|
||||||
@ -39,16 +42,17 @@ int ft_toupper(int c);
|
|||||||
int ft_tolower(int c);
|
int ft_tolower(int c);
|
||||||
char *ft_strchr(const char *s, int c);
|
char *ft_strchr(const char *s, int c);
|
||||||
char *ft_strrchr(const char *s, int c);
|
char *ft_strrchr(const char *s, int c);
|
||||||
|
int ft_strcmp(const char *s1, const char *s2);
|
||||||
int ft_strncmp(const char *s1, const char *s2, size_t n);
|
int ft_strncmp(const char *s1, const char *s2, size_t n);
|
||||||
size_t ft_strlcpy(char *dst, const char *src, size_t size);
|
size_t ft_strlcpy(char *dst, const char *src, size_t size);
|
||||||
size_t ft_strlcat(char *dst, const char *src, size_t size);
|
size_t ft_strlcat(char *dst, const char *src, size_t size);
|
||||||
|
char *ft_strjoin(char *save, char *s2);
|
||||||
char *ft_strnstr(const char *big, const char *little, size_t len);
|
char *ft_strnstr(const char *big, const char *little, size_t len);
|
||||||
int ft_atoi(const char *nptr);
|
long ft_atoi(const char *nptr);
|
||||||
void *ft_calloc(size_t nmenb, size_t size);
|
void *ft_calloc(size_t nmenb, size_t size);
|
||||||
char *ft_strdup(const char *s);
|
char *ft_strdup(const char *s);
|
||||||
|
|
||||||
char *ft_substr(char const *s, unsigned int start, size_t len);
|
char *ft_substr(char const *s, unsigned int start, size_t len);
|
||||||
char *ft_strjoin(char const *s1, char const *s2);
|
|
||||||
char *ft_strtrim(char const *s1, char const *set);
|
char *ft_strtrim(char const *s1, char const *set);
|
||||||
char **ft_split(char const *s, char c);
|
char **ft_split(char const *s, char c);
|
||||||
char *ft_itoa(int n);
|
char *ft_itoa(int n);
|
||||||
@ -68,5 +72,6 @@ void ft_lstclear(t_list **lst, void (*del)(void *));
|
|||||||
void ft_lstiter(t_list *lst, void (*f)(void *));
|
void ft_lstiter(t_list *lst, void (*f)(void *));
|
||||||
t_list *ft_lstmap(t_list *lst, void *(*f)(void *),
|
t_list *ft_lstmap(t_list *lst, void *(*f)(void *),
|
||||||
void (*del)(void *));
|
void (*del)(void *));
|
||||||
|
t_list *ft_lstbeforelast(t_list *lst);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user