da7e/42-GNL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mandatory OK

Browse Source
This commit is contained in:
David Gailleton
2025-11-24 15:54:09 +01:00
parent 6ee68f158a
commit 7d8738e565
2 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
get_next_line.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/21 17:20:41 by dgaillet #+# #+# */ /* Created: 2025/11/21 17:20:41 by dgaillet #+# #+# */
/* Updated: 2025/11/23 19:08:58 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/24 15:53:55 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -50,18 +50,30 @@ static char *get_on_line(int fd, char buf[BUFFER_SIZE], char *nl, int res)
return (nl); return (nl);
} }
static char *return_full_nl(int fd, char buf[BUFFER_SIZE], char *nl) static char *return_full_nl(int fd, char buf[BUFFER_SIZE],
char *nl, char **last_nl)
{ {
int res; int res;
char *temp;
if (!nl)
return (NULL);
ft_bzero(buf, BUFFER_SIZE); ft_bzero(buf, BUFFER_SIZE);
res = read(fd, buf, BUFFER_SIZE); res = read(fd, buf, BUFFER_SIZE);
if (res == 0 && ft_strlen(nl) > 0)
{
*last_nl = NULL;
return (nl);
}
if (res <= 0) if (res <= 0)
{ {
free(nl); free(nl);
*last_nl = NULL;
return (NULL); return (NULL);
} }
return (get_on_line(fd, buf, nl, res)); temp = get_on_line(fd, buf, nl, res);
*last_nl = &buf[index_of_nl(buf, BUFFER_SIZE)];
return (temp);
} }
static char *ft_ptr_match(void *to_search, void *to_match, int limit) static char *ft_ptr_match(void *to_search, void *to_match, int limit)
@@ -98,35 +110,10 @@ char *get_next_line(int fd)
temp = ft_substr(temp, 1, nl_i + 1); temp = ft_substr(temp, 1, nl_i + 1);
return (temp); return (temp);
} }
temp = ft_substr(temp, 1, &buf[BUFFER_SIZE] - temp); temp = ft_substr(temp, 1, BUFFER_SIZE);
temp = return_full_nl(fd, buf, temp); temp = return_full_nl(fd, buf, temp, &last_nl);
} }
else else
temp = return_full_nl(fd, buf, ft_calloc(sizeof(char), 1)); temp = return_full_nl(fd, buf, ft_calloc(sizeof(char), 1), &last_nl);
if (temp)
last_nl = &buf[index_of_nl(buf, BUFFER_SIZE)];
return (temp); return (temp);
} }
/*
#include <stdio.h>
#include <fcntl.h>
int main(int argc, char **argv)
{
char *str;
int fd;
if (argc > 1)
{
fd = open(argv[1], O_RDONLY);
str = get_next_line(fd);
while (str)
{
printf("%s", str);
free(str);
str = get_next_line(fd);
}
close(fd);
}
}
*/

5
get_next_line_utils.c
View File

@@ -6,11 +6,12 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/21 17:21:38 by dgaillet #+# #+# */ /* Created: 2025/11/21 17:21:38 by dgaillet #+# #+# */
/* Updated: 2025/11/23 18:42:45 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/24 14:01:01 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "get_next_line.h" #include "get_next_line.h"
#include <stdint.h>
int index_of_nl(char *str, int limit) int index_of_nl(char *str, int limit)
{ {
@@ -93,7 +94,7 @@ void *ft_calloc(size_t nmemb, size_t size)
void *all_mem; void *all_mem;
size_t i; size_t i;
if (size && nmemb > 65535 / size) if (size && nmemb > SIZE_MAX / size)
return (malloc(0)); return (malloc(0));
all_mem = malloc(size * nmemb); all_mem = malloc(size * nmemb);
if (!all_mem) if (!all_mem)