diff --git a/get_next_line.c b/get_next_line.c index a200496..3fb8b71 100644 --- a/get_next_line.c +++ b/get_next_line.c @@ -6,114 +6,114 @@ /* 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 -static void ft_bzero(void *s, size_t n) -{ - while (n > 0) - { - *((unsigned char *) s) = '\0'; - s++; - n--; - } -} - -static char *get_on_line(int fd, char buf[BUFFER_SIZE], char *nl, int res) +static int del_before_nl(char buf[BUFFER_SIZE]) { + int nl_i; + int i; char *temp; - while (1) + nl_i = index_of_nl(buf, BUFFER_SIZE); + if (nl_i >= 0) { - if (res <= 0) - break ; - nl = ft_strjoin_new(nl, buf, res); - 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); - } + temp = ft_substr(buf, nl_i + 1, BUFFER_SIZE - nl_i); + if (!temp) + return (-1); ft_bzero(buf, BUFFER_SIZE); - res = read(fd, buf, BUFFER_SIZE); - if (res <= 0) - break ; + i = 0; + while (temp[i]) + { + buf[i] = temp[i]; + i++; + } + free(temp); } - return (nl); + return (1); } -static char *return_full_nl(int fd, char buf[BUFFER_SIZE], - char *nl, char **last_nl) +static char *ft_read_one(char buf[BUFFER_SIZE], int fd, char *str) { - int res; - char *temp; + int temp; - if (!nl) + str = ft_strjoin_new(str, buf, BUFFER_SIZE); + if (!str) return (NULL); ft_bzero(buf, BUFFER_SIZE); - res = read(fd, buf, BUFFER_SIZE); - if (res == 0 && ft_strlen(nl) > 0) + temp = read(fd, buf, BUFFER_SIZE); + if (temp < 0) { - *last_nl = NULL; - return (nl); - } - if (res <= 0) - { - free(nl); - *last_nl = NULL; + free(str); return (NULL); } - temp = get_on_line(fd, buf, nl, res); - *last_nl = &buf[index_of_nl(buf, BUFFER_SIZE)]; - return (temp); + if ((!str || ft_strlen(str) == 0) && temp == 0) + { + 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; - while (i < limit) + if (!str) + return (NULL); + while (nl_i < 0) { - if (to_search == to_match) - return (to_search); - i++; - to_search++; + str = ft_read_one(buf, fd, str); + if (!str) + return (NULL); + 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) { static char buf[BUFFER_SIZE]; - static char *last_nl; - char *temp; - int nl_i; + char *to_return; - nl_i = -1; - if (last_nl) - { - 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); - } - 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); + if (fd < 0) + return (NULL); + to_return = ft_gnl_extra(buf, fd); + return (to_return); } diff --git a/get_next_line.h b/get_next_line.h index 54f36fe..7f43fa9 100644 --- a/get_next_line.h +++ b/get_next_line.h @@ -6,7 +6,7 @@ /* 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); -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_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); -void *ft_calloc(size_t nmemb, size_t size); #endif diff --git a/get_next_line_bonus.c b/get_next_line_bonus.c index 466ea3b..1c7ba16 100644 --- a/get_next_line_bonus.c +++ b/get_next_line_bonus.c @@ -6,7 +6,7 @@ /* 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); return (to_return); } -/* -#include -#include - -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); -} -*/ diff --git a/get_next_line_utils.c b/get_next_line_utils.c index 2e92280..a84c3d5 100644 --- a/get_next_line_utils.c +++ b/get_next_line_utils.c @@ -6,7 +6,7 @@ /* 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); } -void *ft_calloc(size_t nmemb, size_t size) +void ft_bzero(void *s, size_t n) { - void *all_mem; - 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) + while (n > 0) { - ((char *)all_mem)[i] = '\0'; - i++; + *((unsigned char *) s) = '\0'; + s++; + n--; } - return (all_mem); }