42/42_INT_01_libft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add gnl to libft

Browse Source
This commit is contained in:
Hugo LAMY
2020-02-25 18:49:15 +01:00
parent 87af05c0cc
commit a140f4640f
4 changed files with 178 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -6,7 +6,7 @@ NAME = libft.a
CC = gcc
VPATH = srcs/
IDIR = .
IDIR = ./includes
_DEP = libft.h
DEPS = $(_DEP:%.h=$(IDIR)/%.h)
@@ -91,7 +91,9 @@ SRCS = ft_memset.c \
ft_foreach.c \
ft_issort.c \
ft_arraymap.c \
ft_strmultisplit.c
ft_strmultisplit.c \
\
get_next_line.c
ODIR = ./builds
OBJS = $(SRCS:%.c=$(ODIR)/%.o)

35
includes/get_next_line.h Normal file
View File

@@ -0,0 +1,35 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* get_next_line.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/01/29 10:19:37 by hulamy #+# #+# */
/* Updated: 2020/02/25 18:48:49 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef GET_NEXT_LINE_H
# define GET_NEXT_LINE_H
# include <string.h>
# include <unistd.h>
# include <stdlib.h>
# ifndef BUFFER_SIZE
# define BUFFER_SIZE 1
# endif
typedef struct s_gnlist
{
int lfd;
char *str;
struct s_gnlist *next;
} t_gnlist;
int get_next_line(const int fd, char **line);
int multi_fd(int fd, t_gnlist **lst);
int free_lst(t_gnlist **lst, int ret);
#endif

4
libft.h → includes/libft.h
View File

@@ -6,7 +6,7 @@
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/11/25 14:45:53 by hulamy #+# #+# */
/* Updated: 2020/02/16 15:10:37 by hulamy ### ########.fr */
/* Updated: 2020/02/25 18:43:18 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
@@ -15,6 +15,7 @@
# include <string.h>
# include <unistd.h>
# include <stdlib.h>
# include "get_next_line.h"
void *ft_memset(void *b, int c, size_t len);
void ft_bzero(void *s, size_t n);
@@ -101,5 +102,6 @@ int ft_issort(int *tab, int length, int (*f)(int, int));
int *ft_arraymap(int *tab, int length, int(*f)(int));
void ft_putnbrendl(int n);
void ft_putnbrendl_fd(int n, int fd);
int get_next_line(const int fd, char **line);
#endif

136
srcs/get_next_line.c Normal file
View File

@@ -0,0 +1,136 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* get_next_line.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/12/31 17:05:53 by hulamy #+# #+# */
/* Updated: 2020/02/25 18:48:55 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
/*
** #include <stdio.h> //for printf
** #include <fcntl.h> //for open
**
** int main(int ac, char **av)
** {
** int *fd;
** int i = 0;
** int j = 0;
** int ret;
** char *line = NULL;
**
** fd = (int *)malloc(sizeof(int) * ac);
** while (++i <= ac - 1)
** fd[i - 1] = open(av[i], O_RDONLY);
** i = 0;
** while (j < ac - 1)
** {
** if ((ret = get_next_line(fd[i], &line)) > 0)
** {
** printf(" [fd%i-%i] %s\n", fd[i], ret, line);
** free(line);
** j = 0;
** }
** else if (ret == -1)
** {
** printf("[fd%i-%i] *ERROR*\n", fd[i], ret);
** free(line);
** j++;
** }
** else if (*line != '\0')
** printf(" [fd%i-%i] %s\n", fd[i], ret, line);
** else
** {
** printf("[fd%i-%i] %s *FINI*\n", fd[i], ret, line);
** free(line);
** j++;
** }
** i++;
** if (i >= ac - 1)
** i = 0;
** }
** free(fd);
** //while (1);
** return (0);
** }
*/
int free_lst(t_gnlist **lst, int ret)
{
t_gnlist *tmp;
tmp = *lst;
while (tmp->next != *lst)
tmp = tmp->next;
tmp->next = (*lst)->next;
free((*lst)->str);
if (*lst == (*lst)->next)
{
free(*lst);
*lst = NULL;
}
else
{
free(*lst);
*lst = tmp;
}
return (ret);
}
int multi_fd(int fd, t_gnlist **lst)
{
t_gnlist *tmp;
tmp = *lst;
while (*lst && (*lst)->lfd != fd && (*lst)->next != tmp)
*lst = (*lst)->next;
if (!tmp || ((*lst)->next == tmp && (*lst)->lfd != fd))
{
if (!(tmp = (t_gnlist*)malloc(sizeof(*tmp))))
return (0);
tmp->lfd = fd;
if (!(tmp->str = ft_strdup("")))
return (0);
if (*lst)
{
tmp->next = (*lst)->next;
(*lst)->next = tmp;
}
else
tmp->next = tmp;
*lst = tmp;
}
return (1);
}
int get_next_line(const int fd, char **line)
{
char buf[BUFFER_SIZE + 1];
int ret;
static t_gnlist *lst = NULL;
char *str;
ret = 1;
if (!(multi_fd(fd, &lst)) || !line || BUFFER_SIZE < 1)
return (free_lst(&lst, -1));
while (!(str = ft_strchr(lst->str, '\n')) && ret != 0)
{
if ((ret = read(fd, buf, BUFFER_SIZE)) < 0)
return (free_lst(&lst, -1));
buf[ret] = '\0';
if (!(lst->str = ft_strjoinfree(lst->str, buf)))
return (free_lst(&lst, -1));
}
if (str != NULL)
str[0] = '\0';
if (!(*line = ft_strdup(lst->str)))
return (free_lst(&lst, -1));
if (str != NULL)
return (ft_memmove(lst->str, str + 1, ft_strlen(str + 1) + 1) != NULL);
return (free_lst(&lst, 0));
}