diff options
| -rw-r--r-- | get_next_line.c | 41 | ||||
| -rw-r--r-- | get_next_line.h | 1 |
2 files changed, 37 insertions, 5 deletions
diff --git a/get_next_line.c b/get_next_line.c index 0beef4d..a5c2288 100644 --- a/get_next_line.c +++ b/get_next_line.c @@ -1,14 +1,47 @@ #include <unistd.h> #include <stdlib.h> +#include "libft.h" #include "get_next_line.h" +static unsigned int cursor; + +static void *ft_memcat(void *ptr, void *tail, + unsigned int size, unsigned int tail_size); + int get_next_line(const int fd, char **line) { - char buf[BUFF_SIZE]; + unsigned int newline_i; + char buf[BUFF_SIZE]; - while ((read(fd, buf, BUFF_SIZE)) > 0) + if (read(fd, buf, BUFF_SIZE) < 0) + return (-1); + if ((*line = ft_strnew(0)) == NULL) + return (-1); + newline_i = 0; + while (buf[newline_i]) { - + while (buf[newline_i] != '\n') + newline_i++; + ft_memcat(*line, buf, 0, newline_i); + if (read(fd, buf, BUFF_SIZE) < 0) + return (-1); } - return 0; + return (0); +} + +static void *ft_memcat(void *ptr, void *tail, + unsigned int size, unsigned int tail_size) +{ + void *copy; + + if ((copy = malloc(size)) == NULL) + return (NULL); + ft_memcpy(copy, ptr, size); + free(ptr); + if ((ptr = malloc(size + tail_size)) == NULL) + return (NULL); + ft_memcpy(ptr, copy, size); + free(copy); + ft_memcpy(ptr + size, tail, tail_size); + return (ptr); } diff --git a/get_next_line.h b/get_next_line.h index efe927b..a70ea24 100644 --- a/get_next_line.h +++ b/get_next_line.h @@ -1,7 +1,6 @@ #ifndef GET_NEXT_LINE_H # define GET_NEXT_LINE_H -# define NEWLINE 0x0A # define BUFF_SIZE (1 << 8) int get_next_line(const int fd, char **line); |