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

GNL Finish

Browse Source
This commit is contained in:
David Gailleton
2025-11-27 18:23:21 +01:00
parent b4d6f19200
commit a54d38533e
4 changed files with 88 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
get_next_line.c
View File

@@ -6,114 +6,114 @@
/* 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/24 15:53:55 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/27 18:19:30 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "get_next_line.h" #include "get_next_line.h"
#include <unistd.h> #include <unistd.h>
static void ft_bzero(void *s, size_t n) static int del_before_nl(char buf[BUFFER_SIZE])
{
while (n > 0)
{
*((unsigned char *) s) = '\0';
s++;
n--;
}
}
static char *get_on_line(int fd, char buf[BUFFER_SIZE], char *nl, int res)
{ {
int nl_i;
int i;
char *temp; char *temp;
while (1) nl_i = index_of_nl(buf, BUFFER_SIZE);
if (nl_i >= 0)
{ {
if (res <= 0) temp = ft_substr(buf, nl_i + 1, BUFFER_SIZE - nl_i);
break ; if (!temp)
nl = ft_strjoin_new(nl, buf, res); return (-1);
if (!nl)
return (NULL);
if (index_of_nl(nl, ft_strlen(nl)) >= 0)
{
temp = ft_substr(nl, 0, index_of_nl(nl, ft_strlen(nl)) + 1);
free(nl);
if (!temp)
return (NULL);
return (temp);
}
ft_bzero(buf, BUFFER_SIZE); ft_bzero(buf, BUFFER_SIZE);
res = read(fd, buf, BUFFER_SIZE); i = 0;
if (res <= 0) while (temp[i])
break ; {
buf[i] = temp[i];
i++;
}
free(temp);
} }
return (nl); return (1);
} }
static char *return_full_nl(int fd, char buf[BUFFER_SIZE], static char *ft_read_one(char buf[BUFFER_SIZE], int fd, char *str)
char *nl, char **last_nl)
{ {
int res; int temp;
char *temp;
if (!nl) str = ft_strjoin_new(str, buf, BUFFER_SIZE);
if (!str)
return (NULL); return (NULL);
ft_bzero(buf, BUFFER_SIZE); ft_bzero(buf, BUFFER_SIZE);
res = read(fd, buf, BUFFER_SIZE); temp = read(fd, buf, BUFFER_SIZE);
if (res == 0 && ft_strlen(nl) > 0) if (temp < 0)
{ {
*last_nl = NULL; free(str);
return (nl);
}
if (res <= 0)
{
free(nl);
*last_nl = NULL;
return (NULL); return (NULL);
} }
temp = get_on_line(fd, buf, nl, res); if ((!str || ft_strlen(str) == 0) && temp == 0)
*last_nl = &buf[index_of_nl(buf, BUFFER_SIZE)]; {
return (temp); free(str);
return (NULL);
}
if (temp == 0)
return (str);
return (str);
} }
static char *ft_ptr_match(void *to_search, void *to_match, int limit) static char *extract_all_nl(char buf[BUFFER_SIZE], int fd, char *str, int nl_i)
{ {
int i; int temp;
i = 0; if (!str)
while (i < limit) return (NULL);
while (nl_i < 0)
{ {
if (to_search == to_match) str = ft_read_one(buf, fd, str);
return (to_search); if (!str)
i++; return (NULL);
to_search++; nl_i = index_of_nl(buf, BUFFER_SIZE);
if (nl_i < 0 && !ft_strlen(buf))
return (str);
} }
return (NULL); str = ft_strjoin_new(str, buf, nl_i);
if (!str)
return (NULL);
temp = del_before_nl(buf);
if (temp < 0)
{
free(str);
return (NULL);
}
return (str);
}
static char *ft_gnl_extra(char buf[BUFFER_SIZE], int fd)
{
int nl_i;
int temp;
char *str;
nl_i = index_of_nl(buf, BUFFER_SIZE);
if (nl_i >= 0)
{
str = ft_substr(buf, 0, nl_i + 1);
temp = del_before_nl(buf);
if (temp < 0)
return (free(str), NULL);
}
else
str = extract_all_nl(buf, fd, ft_substr("", 0, 1), nl_i);
return (str);
} }
char *get_next_line(int fd) char *get_next_line(int fd)
{ {
static char buf[BUFFER_SIZE]; static char buf[BUFFER_SIZE];
static char *last_nl; char *to_return;
char *temp;
int nl_i;
nl_i = -1; if (fd < 0)
if (last_nl) return (NULL);
{ to_return = ft_gnl_extra(buf, fd);
temp = ft_ptr_match(buf, last_nl, BUFFER_SIZE); return (to_return);
if (temp)
nl_i = index_of_nl(temp + 1, &buf[BUFFER_SIZE] - temp);
if (nl_i >= 0)
{
last_nl = &temp[nl_i + 1];
temp = ft_substr(temp, 1, nl_i + 1);
return (temp);
}
temp = ft_substr(temp, 1, BUFFER_SIZE);
temp = return_full_nl(fd, buf, temp, &last_nl);
}
else
temp = return_full_nl(fd, buf, ft_calloc(sizeof(char), 1), &last_nl);
return (temp);
} }

8
get_next_line.h
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/21 17:22:03 by dgaillet #+# #+# */ /* Created: 2025/11/21 17:22:03 by dgaillet #+# #+# */
/* Updated: 2025/11/23 16:43:49 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/27 18:05:13 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -21,10 +21,10 @@
char *get_next_line(int fd); char *get_next_line(int fd);
int index_of_nl(char *str, int limit);
char *ft_strjoin_new(char const *s1, char const *s2, size_t limit);
size_t ft_strlen(const char *s); size_t ft_strlen(const char *s);
char *ft_strjoin_new(char const *s1, char const *s2, size_t limit);
void ft_bzero(void *s, size_t n);
int index_of_nl(char *str, int limit);
char *ft_substr(char const *s, unsigned int start, size_t len); char *ft_substr(char const *s, unsigned int start, size_t len);
void *ft_calloc(size_t nmemb, size_t size);
#endif #endif

23
get_next_line_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/24 15:55:25 by dgaillet #+# #+# */ /* Created: 2025/11/24 15:55:25 by dgaillet #+# #+# */
/* Updated: 2025/11/27 17:40:04 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/27 18:20:47 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -117,24 +117,3 @@ char *get_next_line(int fd)
to_return = ft_gnl_extra(strs[fd], fd); to_return = ft_gnl_extra(strs[fd], fd);
return (to_return); return (to_return);
} }
/*
#include <stdio.h>
#include <fcntl.h>
int main(void)
{
char *str;
int fd1;
fd1 = open("read_error.txt", O_RDONLY);
str = get_next_line(fd1);
while (str)
{
printf("%s", str);
free(str);
str = get_next_line(fd1);
}
printf("%s\n", str);
close(fd1);
}
*/

21
get_next_line_utils.c
View File

@@ -6,7 +6,7 @@
/* 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/25 12:55:35 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/27 18:06:51 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -91,21 +91,12 @@ char *ft_substr(char const *s, unsigned int start, size_t len)
return (sub_str); return (sub_str);
} }
void *ft_calloc(size_t nmemb, size_t size) void ft_bzero(void *s, size_t n)
{ {
void *all_mem; while (n > 0)
size_t i;
if (size && nmemb > SIZE_MAX / size)
return (malloc(0));
all_mem = malloc(size * nmemb);
if (!all_mem)
return (NULL);
i = 0;
while (i < nmemb * size)
{ {
((char *)all_mem)[i] = '\0'; *((unsigned char *) s) = '\0';
i++; s++;
n--;
} }
return (all_mem);
} }