diff --git a/get_next_line.c b/get_next_line.c index 6f4a5f5..b4c2928 100644 --- a/get_next_line.c +++ b/get_next_line.c @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/18 17:12:02 by rparodi #+# #+# */ -/* Updated: 2025/12/20 23:59:09 by rparodi ### ########.fr */ +/* Updated: 2023/11/22 13:31:13 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,7 +21,7 @@ char *ft_check(char *memory, int fd) buffer = (char *)malloc(sizeof(char) * (BUFFER_SIZE + 1)); if (!buffer) return (NULL); - while (ft_strchr_index(memory, '\n') <= 0 && bytescopy) + while (ft_strchr(memory, '\n') <= 0 && bytescopy) { bytescopy = read(fd, buffer, BUFFER_SIZE); if (bytescopy == -1) @@ -33,6 +33,29 @@ char *ft_check(char *memory, int fd) return (memory); } +char *file_converted(int fd) +{ + size_t i; + int read_bits; + char *str; + char c; + + i = 0; + c = 1; + read_bits = 1; + str = (char *)malloc(sizeof(char) * BUFFER_SIZE); + if (!str) + return (NULL); + while (read_bits != 0 && i < BUFFER_SIZE) + { + read_bits = read(fd, &c, 1); + str[i] = c; + i++; + } + str[i] = '\0'; + return (str); +} + char *ft_free(char *str) { free(str); diff --git a/get_next_line.h b/get_next_line.h index 7d4467d..3f76342 100644 --- a/get_next_line.h +++ b/get_next_line.h @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/18 17:12:04 by rparodi #+# #+# */ -/* Updated: 2025/12/20 23:59:36 by rparodi ### ########.fr */ +/* Updated: 2023/11/23 18:15:34 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,11 +21,12 @@ char *ft_get_line(char *str); char *get_next_line(int fd); -int ft_strchr_index(char *str, char c); +int ft_strchr(char *str, char c); char *ft_get_next(char *str); char *ft_get_line(char *str); char *ft_strjoin(char *s1, char *s2, int i, int j); size_t ft_strlen(char const *str); +char *file_converted(int fd); char *ft_free(char *str); char *ft_check(char *memory, int fd); diff --git a/get_next_line_bonus.c b/get_next_line_bonus.c deleted file mode 100644 index 3b0a7f9..0000000 --- a/get_next_line_bonus.c +++ /dev/null @@ -1,55 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* get_next_line_bonus.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/11/18 17:12:02 by rparodi #+# #+# */ -/* Updated: 2026/01/29 14:25:47 by rparodi ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "get_next_line_bonus.h" - -char *ft_check(char *memory, int fd) -{ - char *buffer; - int bytescopy; - - bytescopy = 1; - buffer = (char *)malloc(sizeof(char) * (BUFFER_SIZE + 1)); - if (!buffer) - return (NULL); - while (ft_strchr_index(memory, '\n') <= 0 && bytescopy) - { - bytescopy = read(fd, buffer, BUFFER_SIZE); - if (bytescopy == -1) - return (ft_free(buffer)); - buffer[bytescopy] = '\0'; - memory = ft_strjoin(memory, buffer, 0, -1); - } - free(buffer); - return (memory); -} - -char *ft_free(char *str) -{ - free(str); - return (NULL); -} - -char *get_next_line(int fd) -{ - static char *memory[OPEN_MAX] = { 0 }; - char *line; - - if (fd < 0 || fd >= OPEN_MAX || BUFFER_SIZE <= 0) - return (NULL); - memory[fd] = ft_check(memory[fd], fd); - if (!memory[fd]) - return (ft_free(memory[fd])); - line = ft_get_line(memory[fd]); - memory[fd] = ft_get_next(memory[fd]); - return (line); -} diff --git a/get_next_line_bonus.h b/get_next_line_bonus.h deleted file mode 100644 index a149471..0000000 --- a/get_next_line_bonus.h +++ /dev/null @@ -1,37 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* get_next_line_bonus.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/11/18 17:12:04 by rparodi #+# #+# */ -/* Updated: 2026/01/29 14:24:48 by rparodi ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef GET_NEXT_LINE_BONUS_H -# define GET_NEXT_LINE_BONUS_H - -# ifndef BUFFER_SIZE -# define BUFFER_SIZE 420 -# endif - -# ifndef OPEN_MAX -# define OPEN_MAX 1024 -# endif - -# include -# include - -char *ft_get_line(char *str); -char *get_next_line(int fd); -int ft_strchr_index(char *str, char c); -char *ft_get_next(char *str); -char *ft_get_line(char *str); -char *ft_strjoin(char *s1, char *s2, int i, int j); -size_t ft_strlen(char const *str); -char *ft_free(char *str); -char *ft_check(char *memory, int fd); - -#endif diff --git a/get_next_line_utils.c b/get_next_line_utils.c index 4e8615c..b4ad6c4 100644 --- a/get_next_line_utils.c +++ b/get_next_line_utils.c @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/18 17:14:47 by rparodi #+# #+# */ -/* Updated: 2025/12/20 23:59:24 by rparodi ### ########.fr */ +/* Updated: 2023/11/22 13:35:03 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -101,7 +101,7 @@ char *ft_get_next(char *str) return (temp); } -int ft_strchr_index(char *str, char c) +int ft_strchr(char *str, char c) { int i; diff --git a/get_next_line_utils_bonus.c b/get_next_line_utils_bonus.c deleted file mode 100644 index 33d34a8..0000000 --- a/get_next_line_utils_bonus.c +++ /dev/null @@ -1,119 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* get_next_line_utils_bonus.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/11/18 17:14:47 by rparodi #+# #+# */ -/* Updated: 2026/01/29 14:26:18 by rparodi ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "get_next_line_bonus.h" - -size_t ft_strlen(char const *str) -{ - size_t i; - - i = 0; - if (str) - { - while (str[i]) - i++; - } - return (i); -} - -char *ft_strjoin(char *s1, char *s2, int i, int j) -{ - char *temp; - - if (!s1) - { - s1 = (char *)malloc(1); - s1[i] = '\0'; - } - if (!s2 || !s1) - return (NULL); - temp = (char *)malloc((ft_strlen(s1) + ft_strlen(s2) + 1)); - if (!temp) - return (NULL); - while (s1[i]) - { - temp[i] = s1[i]; - i++; - } - while (s2[++j]) - temp[i + j] = s2[j]; - temp[i + j] = '\0'; - free(s1); - return (temp); -} - -char *ft_get_line(char *str) -{ - char *temp; - int i; - - i = 0; - if (!str[i]) - return (NULL); - while (str[i] && str[i] != '\n') - i++; - temp = (char *)malloc((i + 2)); - if (!temp) - return (NULL); - i = 0; - while (str[i] && str[i] != '\n') - { - temp[i] = str[i]; - i++; - } - if (str[i] == '\n') - { - temp[i] = str[i]; - i++; - } - temp[i] = '\0'; - return (temp); -} - -char *ft_get_next(char *str) -{ - char *temp; - int i; - int j; - - i = 0; - while (str[i] && str[i] != '\n') - i++; - if (!str[i]) - return (ft_free(str)); - temp = (char *)malloc((ft_strlen(str) - i)); - if (!temp) - return (NULL); - j = i + 1; - while (str[++i]) - temp[i - j] = str[i]; - temp[i - j] = '\0'; - free(str); - return (temp); -} - -int ft_strchr_index(char *str, char c) -{ - int i; - - i = 0; - if (str) - { - while (str[i]) - { - if (str[i] == c) - return (i); - i++; - } - } - return (-1); -}