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

Rework of GNL. It just work (almost)

Browse Source
This commit is contained in:
David Gailleton
2025-11-23 19:16:33 +01:00
parent 2b7dad9c15
commit 6ee68f158a
3 changed files with 107 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
get_next_line.c
View File

@@ -6,52 +6,75 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/21 17:20:41 by dgaillet #+# #+# */
/* Updated: 2025/11/21 19:06:31 by dgaillet ### ########lyon.fr */
/* Updated: 2025/11/23 19:08:58 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
#include "get_next_line.h"
#include <unistd.h>
static char *ft_read_line(int fd, char *dest, char buf[BUFFER_SIZE])
static void ft_bzero(void *s, size_t n)
{
int readed;
int i;
while (n > 0)
{
*((unsigned char *) s) = '\0';
s++;
n--;
}
}
readed = 1;
while (readed)
static char *get_on_line(int fd, char buf[BUFFER_SIZE], char *nl, int res)
{
readed = read(fd, buf, BUFFER_SIZE);
if (readed < 0)
char *temp;
while (1)
{
if (res <= 0)
break ;
nl = ft_strjoin_new(nl, buf, res);
if (!nl)
return (NULL);
i = index_of_nl(buf, BUFFER_SIZE);
if (i < 0)
dest = ft_strjoin_new(dest, buf, readed);
else
dest = ft_strjoin_new(dest, buf, i);
if (!dest)
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);
if (i >= 0)
return (temp);
}
ft_bzero(buf, BUFFER_SIZE);
res = read(fd, buf, BUFFER_SIZE);
if (res <= 0)
break ;
}
return (dest);
return (nl);
}
static char *create_new_line(char buf[BUFFER_SIZE], char *base_str)
static char *return_full_nl(int fd, char buf[BUFFER_SIZE], char *nl)
{
char *new_str;
int buf_len;
int nl_i;
int res;
if (!buf)
return (NULL);
buf_len = ft_strlen(buf);
nl_i = index_of_nl(buf, buf_len);
if (nl_i >= 0)
ft_bzero(buf, BUFFER_SIZE);
res = read(fd, buf, BUFFER_SIZE);
if (res <= 0)
{
new_str = ft_substr(buf, nl_i, buf_len - nl_i);
free(base_str);
return (new_str);
free(nl);
return (NULL);
}
return (get_on_line(fd, buf, nl, res));
}
static char *ft_ptr_match(void *to_search, void *to_match, int limit)
{
int i;
i = 0;
while (i < limit)
{
if (to_search == to_match)
return (to_search);
i++;
to_search++;
}
return (NULL);
}
@@ -59,23 +82,32 @@ static char *create_new_line(char buf[BUFFER_SIZE], char *base_str)
char *get_next_line(int fd)
{
static char buf[BUFFER_SIZE];
char *nl;
static char *last_nl;
char *temp;
int nl_i;
nl = malloc(sizeof(char));
if (!nl)
return (NULL);
temp = create_new_line(buf, nl);
if (temp)
nl = ft_read_line(fd, temp, buf);
else
nl_i = -1;
if (last_nl)
{
nl[0] = '\0';
nl = ft_read_line(fd, nl, buf);
temp = ft_ptr_match(buf, last_nl, BUFFER_SIZE);
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);
}
return (nl);
temp = ft_substr(temp, 1, &buf[BUFFER_SIZE] - temp);
temp = return_full_nl(fd, buf, temp);
}
else
temp = return_full_nl(fd, buf, ft_calloc(sizeof(char), 1));
if (temp)
last_nl = &buf[index_of_nl(buf, BUFFER_SIZE)];
return (temp);
}
/*
#include <stdio.h>
#include <fcntl.h>
@@ -88,11 +120,13 @@ int main(int argc, char **argv)
{
fd = open(argv[1], O_RDONLY);
str = get_next_line(fd);
while (str)
{
printf("%s", str);
free(str);
str = get_next_line(fd);
printf("%s", str);
free(str);
}
close(fd);
}
}
*/

3
get_next_line.h
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/21 17:22:03 by dgaillet #+# #+# */
/* Updated: 2025/11/21 18:57:22 by dgaillet ### ########lyon.fr */
/* Updated: 2025/11/23 16:43:49 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
@@ -25,5 +25,6 @@ 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);
char *ft_substr(char const *s, unsigned int start, size_t len);
void *ft_calloc(size_t nmemb, size_t size);
#endif

25
get_next_line_utils.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/21 17:21:38 by dgaillet #+# #+# */
/* Updated: 2025/11/21 18:57:06 by dgaillet ### ########lyon.fr */
/* Updated: 2025/11/23 18:42:45 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
@@ -17,7 +17,7 @@ int index_of_nl(char *str, int limit)
int i;
i = 0;
while (i < limit)
while (i < limit && str[i])
{
if (str[i] == '\n')
return (i);
@@ -52,7 +52,7 @@ char *ft_strjoin_new(char const *s1, char const *s2, size_t limit)
str[i] = s1[i];
i++;
}
while (j <= limit)
while (j <= limit && s2[j])
{
str[i + j] = s2[j];
j++;
@@ -87,3 +87,22 @@ char *ft_substr(char const *s, unsigned int start, size_t len)
sub_str[i] = '\0';
return (sub_str);
}
void *ft_calloc(size_t nmemb, size_t size)
{
void *all_mem;
size_t i;
if (size && nmemb > 65535 / 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';
i++;
}
return (all_mem);
}