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

fd > 1024 fix

Browse Source
This commit is contained in:
Camille Chauvet 2022-11-23 15:28:59 +01:00
parent d612a3c927
commit 38ce8029e5
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
get_next_line_bonus.c
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */ /* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/10/26 00:52:47 by cchauvet #+# #+# */ /* Created: 2022/10/26 00:52:47 by cchauvet #+# #+# */
/* Updated: 2022/11/14 15:49:34 by cchauvet ### ########.fr */ /* Updated: 2022/11/23 15:19:15 by cchauvet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -76,29 +76,25 @@ char *ft_getextra(char *str)
char *get_next_line(int fd) char *get_next_line(int fd)
{ {
static char *stash[1024] = {}; static char *stash[1024] = {0};
char *buf1; char *buf1;
char *buf2; char *buf2;
if (fd > 1023)
return (NULL);
buf2 = stash[fd]; buf2 = stash[fd];
if (ft_strchr(stash[fd], '\n') == -1) if (ft_strchr(stash[fd], '\n') == -1)
{ {
buf1 = ft_getline(fd); buf1 = ft_getline(fd);
buf2 = ft_strfjoin(stash[fd], buf1); buf2 = ft_strfjoin(stash[fd], buf1);
if (buf2 == NULL)
{
free(buf1);
return (NULL);
}
} }
buf1 = ft_getreturn(buf2); buf1 = ft_getreturn(buf2);
stash[fd] = ft_getextra(buf2); stash[fd] = ft_getextra(buf2);
free(buf2); if (buf1 == NULL || buf2 == NULL)
if (buf1 == NULL)
{ {
free(stash[fd]); free(stash[fd]);
free(buf1); free(buf1);
return (NULL);
} }
free(buf2);
return (buf1); return (buf1);
} }