From 0a48257728d635d71b3f9ffb5118c58411096f02 Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Tue, 31 Dec 2019 17:29:09 +0100 Subject: [PATCH] remis les line dans les printf du main --- get_next_line.c | 74 +++++++++++++------------------------ get_next_line_bonus.c | 66 +++++++++++---------------------- get_next_line_bonus.h | 6 +-- get_next_line_utils_bonus.c | 2 +- 4 files changed, 50 insertions(+), 98 deletions(-) diff --git a/get_next_line.c b/get_next_line.c index 01729a9..70323ec 100644 --- a/get_next_line.c +++ b/get_next_line.c @@ -1,43 +1,21 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* get_next_line.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: hulamy +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/12/31 17:05:53 by hulamy #+# #+# */ +/* Updated: 2019/12/31 17:28:00 by hulamy ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include "get_next_line.h" /* -** //:set noendofline binary -** //https://github.com/lgrellie/gnl_tester -** //https://github.com/Mazoise/42TESTERS-GNL -** //https://github.com/charMstr/GNL_lover -** //https://github.com/mrjvs/42cursus_gnl_tests -** //https://github.com/Sherchryst/gnlkiller -** //https://github.com/Hellio404/Get_Next_Line_Tester -** //https://github.com/TinfoilPancakes/get-next-line-testing-tools -** ** #include //for printf ** #include //for open ** -** void ft_putchar(char c){ -** write(1, &c, 1); -** } -** -** void ft_putstr(char *s) -** { -** while (s && *s) -** ft_putchar(*s++); -** } -** -** void ft_putnbr(int n) -** { -** long l; -** -** l = n; -** if (l < 0) -** { -** ft_putchar('-'); -** l *= -1; -** } -** if (l >= 10) -** ft_putnbr(l / 10); -** ft_putchar((l % 10) + '0'); -** } -** ** int main(int ac, char **av) ** { ** int *fd; @@ -54,21 +32,21 @@ ** { ** if ((ret = get_next_line(fd[i], &line)) > 0) ** { -** printf(" [fd%i-%i] \n", fd[i], ret ); +** 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); +** printf("[fd%i-%i] *ERROR*\n", fd[i], ret); ** free(line); ** j++; ** } ** else if (*line != '\0') -** printf(" [fd%i-%i] \n", fd[i], ret); +** printf(" [fd%i-%i] %s\n", fd[i], ret, line); ** else ** { -** printf("[fd%i-%i]*FINI*\n", fd[i], ret); +** printf("[fd%i-%i] %s *FINI*\n", fd[i], ret, line); ** free(line); ** j++; ** } @@ -86,12 +64,10 @@ int free_lst(t_gnlist **lst, int ret) { t_gnlist *tmp; - tmp = *lst; // t_gnlist *tmp2;/*ft_putstr("\n");*/ft_putstr("("); + tmp = *lst; while (tmp->next != *lst) - { // ft_putnbr(tmp->lfd);ft_putstr("-"); tmp = tmp->next; - } // ft_putnbr(tmp->lfd);ft_putstr("-(");ft_putnbr(tmp->next->lfd);ft_putstr("))"); - tmp->next = (*lst)->next; // ft_putstr("->(");ft_putnbr(tmp->lfd);ft_putstr("-");ft_putnbr(tmp->next->lfd);ft_putstr(")"); + tmp->next = (*lst)->next; free((*lst)->str); if (*lst == (*lst)->next) { @@ -102,7 +78,7 @@ int free_lst(t_gnlist **lst, int ret) { free(*lst); *lst = tmp; - } // tmp2=tmp;ft_putstr("(");while(tmp2->next!=tmp){ft_putnbr(tmp2->lfd);ft_putstr("-");tmp2=tmp2->next;}ft_putnbr(tmp2->lfd);ft_putstr("-(");ft_putnbr(tmp2->next->lfd);ft_putstr("))"); + } return (ret); } @@ -110,13 +86,13 @@ int multi_fd(int fd, t_gnlist **lst) { t_gnlist *tmp; - tmp = *lst; // t_gnlist *tmp2;ft_putstr(" multi(fd:");ft_putnbr(fd);ft_putstr("-(check:");tmp2=tmp;while(tmp2 && tmp2->next!=tmp){ft_putnbr(tmp2->lfd);ft_putstr("-");tmp2=tmp2->next;}if(tmp2)ft_putnbr(tmp2->lfd);ft_putstr(")-(start:"); + tmp = *lst; while (*lst && (*lst)->lfd != fd && (*lst)->next != tmp) - { // ft_putnbr((*lst)->lfd);ft_putstr("-"); + { *lst = (*lst)->next; - } // if(*lst)ft_putnbr((*lst)->lfd);ft_putstr(")-("); + } if (!tmp || ((*lst)->next == tmp && (*lst)->lfd != fd)) - { // ft_putstr("create "); + { if (!(tmp = (t_gnlist*)malloc(sizeof(*tmp)))) return (0); tmp->lfd = fd; @@ -130,7 +106,7 @@ int multi_fd(int fd, t_gnlist **lst) else tmp->next = tmp; *lst = tmp; - } // ft_putstr("lfd:");ft_putnbr((*lst)->lfd);ft_putstr(")-(");tmp2=*lst;while(tmp2->next!=*lst){ft_putnbr(tmp2->lfd);ft_putstr("-");tmp2=tmp2->next;}ft_putnbr(tmp2->lfd);ft_putstr("-(");ft_putnbr(tmp2->next->lfd);ft_putstr("))"); + } return (1); } @@ -157,6 +133,6 @@ int get_next_line(const int fd, char **line) 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 (ft_memmove(lst->str, str + 1, ft_strlen(str + 1) + 1) != NULL); return (free_lst(&lst, 0)); } diff --git a/get_next_line_bonus.c b/get_next_line_bonus.c index 772f2e4..1f52cfb 100644 --- a/get_next_line_bonus.c +++ b/get_next_line_bonus.c @@ -1,43 +1,21 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* get_next_line.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: hulamy +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/12/31 17:05:53 by hulamy #+# #+# */ +/* Updated: 2019/12/31 17:25:31 by hulamy ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include "get_next_line_bonus.h" /* -** //:set noendofline binary -** //https://github.com/lgrellie/gnl_tester -** //https://github.com/Mazoise/42TESTERS-GNL -** //https://github.com/charMstr/GNL_lover -** //https://github.com/mrjvs/42cursus_gnl_tests -** //https://github.com/Sherchryst/gnlkiller -** //https://github.com/Hellio404/Get_Next_Line_Tester -** //https://github.com/TinfoilPancakes/get-next-line-testing-tools -** ** #include //for printf ** #include //for open ** -** void ft_putchar(char c){ -** write(1, &c, 1); -** } -** -** void ft_putstr(char *s) -** { -** while (s && *s) -** ft_putchar(*s++); -** } -** -** void ft_putnbr(int n) -** { -** long l; -** -** l = n; -** if (l < 0) -** { -** ft_putchar('-'); -** l *= -1; -** } -** if (l >= 10) -** ft_putnbr(l / 10); -** ft_putchar((l % 10) + '0'); -** } -** ** int main(int ac, char **av) ** { ** int *fd; @@ -86,12 +64,10 @@ int free_lst(t_gnlist **lst, int ret) { t_gnlist *tmp; - tmp = *lst; // t_gnlist *tmp2;/*ft_putstr("\n");*/ft_putstr("("); + tmp = *lst; while (tmp->next != *lst) - { // ft_putnbr(tmp->lfd);ft_putstr("-"); tmp = tmp->next; - } // ft_putnbr(tmp->lfd);ft_putstr("-(");ft_putnbr(tmp->next->lfd);ft_putstr("))"); - tmp->next = (*lst)->next; // ft_putstr("->(");ft_putnbr(tmp->lfd);ft_putstr("-");ft_putnbr(tmp->next->lfd);ft_putstr(")"); + tmp->next = (*lst)->next; free((*lst)->str); if (*lst == (*lst)->next) { @@ -102,7 +78,7 @@ int free_lst(t_gnlist **lst, int ret) { free(*lst); *lst = tmp; - } // tmp2=tmp;ft_putstr("(");while(tmp2->next!=tmp){ft_putnbr(tmp2->lfd);ft_putstr("-");tmp2=tmp2->next;}ft_putnbr(tmp2->lfd);ft_putstr("-(");ft_putnbr(tmp2->next->lfd);ft_putstr("))"); + } return (ret); } @@ -110,13 +86,13 @@ int multi_fd(int fd, t_gnlist **lst) { t_gnlist *tmp; - tmp = *lst; // t_gnlist *tmp2;ft_putstr(" multi(fd:");ft_putnbr(fd);ft_putstr("-(check:");tmp2=tmp;while(tmp2 && tmp2->next!=tmp){ft_putnbr(tmp2->lfd);ft_putstr("-");tmp2=tmp2->next;}if(tmp2)ft_putnbr(tmp2->lfd);ft_putstr(")-(start:"); + tmp = *lst; while (*lst && (*lst)->lfd != fd && (*lst)->next != tmp) - { // ft_putnbr((*lst)->lfd);ft_putstr("-"); + { *lst = (*lst)->next; - } // if(*lst)ft_putnbr((*lst)->lfd);ft_putstr(")-("); + } if (!tmp || ((*lst)->next == tmp && (*lst)->lfd != fd)) - { // ft_putstr("create "); + { if (!(tmp = (t_gnlist*)malloc(sizeof(*tmp)))) return (0); tmp->lfd = fd; @@ -130,7 +106,7 @@ int multi_fd(int fd, t_gnlist **lst) else tmp->next = tmp; *lst = tmp; - } // ft_putstr("lfd:");ft_putnbr((*lst)->lfd);ft_putstr(")-(");tmp2=*lst;while(tmp2->next!=*lst){ft_putnbr(tmp2->lfd);ft_putstr("-");tmp2=tmp2->next;}ft_putnbr(tmp2->lfd);ft_putstr("-(");ft_putnbr(tmp2->next->lfd);ft_putstr("))"); + } return (1); } @@ -157,6 +133,6 @@ int get_next_line(const int fd, char **line) 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 (ft_memmove(lst->str, str + 1, ft_strlen(str + 1) + 1) != NULL); return (free_lst(&lst, 0)); } diff --git a/get_next_line_bonus.h b/get_next_line_bonus.h index 3e8cb80..9991424 100644 --- a/get_next_line_bonus.h +++ b/get_next_line_bonus.h @@ -6,12 +6,12 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/01/29 10:19:37 by hulamy #+# #+# */ -/* Updated: 2019/12/19 19:38:39 by hulamy ### ########.fr */ +/* Updated: 2019/12/31 17:28:33 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ -#ifndef GET_NEXT_LINE_H -# define GET_NEXT_LINE_H +#ifndef GET_NEXT_LINE_BONUS_H +# define GET_NEXT_LINE_BONUS_H # include # include diff --git a/get_next_line_utils_bonus.c b/get_next_line_utils_bonus.c index 0e82dce..6883064 100644 --- a/get_next_line_utils_bonus.c +++ b/get_next_line_utils_bonus.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/12/11 00:26:54 by hulamy #+# #+# */ -/* Updated: 2019/12/29 18:07:58 by hulamy ### ########.fr */ +/* Updated: 2019/12/31 17:23:54 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */