From fbf40968490a58440ca75409caeae552a7a70ce2 Mon Sep 17 00:00:00 2001 From: Matthos Denys Date: Mon, 11 Jan 2021 20:36:29 +0300 Subject: [PATCH] all work lib complete but need fix make but not ideal make --- a.out | Bin 0 -> 28220 bytes ft_printf_include_libft/libft/Makefile | 3 +- .../libft/includes}/get_next_line.h | 6 +- .../libft/src}/get_next_line.c | 6 +- .../libft/src}/get_next_line_utils.c | 16 +-- get_next_line/get_next_line_bonus.c | 122 ------------------ get_next_line/get_next_line_bonus.h | 35 ----- get_next_line/get_next_line_utils_bonus.c | 83 ------------ main.c | 9 ++ 9 files changed, 25 insertions(+), 255 deletions(-) create mode 100755 a.out rename {get_next_line => ft_printf_include_libft/libft/includes}/get_next_line.h (86%) rename {get_next_line => ft_printf_include_libft/libft/src}/get_next_line.c (91%) rename {get_next_line => ft_printf_include_libft/libft/src}/get_next_line_utils.c (79%) delete mode 100644 get_next_line/get_next_line_bonus.c delete mode 100644 get_next_line/get_next_line_bonus.h delete mode 100644 get_next_line/get_next_line_utils_bonus.c create mode 100644 main.c diff --git a/a.out b/a.out new file mode 100755 index 0000000000000000000000000000000000000000..14774e7fa1baac21ec7dcbe42095b583ce5759bf GIT binary patch literal 28220 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 Wzul9~+Y}o>y^|~30%DC~{r+FV4Sp2> literal 0 HcmV?d00001 diff --git a/ft_printf_include_libft/libft/Makefile b/ft_printf_include_libft/libft/Makefile index ae4009b..cde56b0 100644 --- a/ft_printf_include_libft/libft/Makefile +++ b/ft_printf_include_libft/libft/Makefile @@ -9,7 +9,8 @@ SRCS = ft_isalnum.c ft_isprint.c ft_memcmp.c ft_putchar_fd.c ft_split.c \ ft_putstr_fd.c ft_strjoin.c ft_strmapi.c ft_strtrim.c ft_putchar.c\ ft_lstadd_back.c ft_lstadd_front.c ft_lstclear.c \ ft_lstdelone.c ft_lstiter.c ft_lstlast.c \ - ft_lstmap.c ft_lstnew.c ft_lstsize.c + ft_lstmap.c ft_lstnew.c ft_lstsize.c\ + get_next_line.c get_next_line_utils.c SRC_DIR = ./src/ OBJ_DIR = ./obj/ diff --git a/get_next_line/get_next_line.h b/ft_printf_include_libft/libft/includes/get_next_line.h similarity index 86% rename from get_next_line/get_next_line.h rename to ft_printf_include_libft/libft/includes/get_next_line.h index 2b5f359..2043542 100644 --- a/get_next_line/get_next_line.h +++ b/ft_printf_include_libft/libft/includes/get_next_line.h @@ -6,7 +6,7 @@ /* By: mdenys +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/13 21:55:13 by mdenys #+# #+# */ -/* Updated: 2020/11/17 23:22:55 by mdenys ### ########.fr */ +/* Updated: 2021/01/11 20:30:02 by mdenys ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,7 +22,7 @@ int get_next_line(int fd, char **line); int ft_rn(char *str); -size_t ft_strlen(const char *s); -char *ft_strjoin(const char *s1, const char *s2); +size_t ft_strlen_custom(const char *s); +char *ft_strjoin_custom(const char *s1, const char *s2); #endif diff --git a/get_next_line/get_next_line.c b/ft_printf_include_libft/libft/src/get_next_line.c similarity index 91% rename from get_next_line/get_next_line.c rename to ft_printf_include_libft/libft/src/get_next_line.c index e08dd42..bcd6581 100644 --- a/get_next_line/get_next_line.c +++ b/ft_printf_include_libft/libft/src/get_next_line.c @@ -6,7 +6,7 @@ /* By: mdenys +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/12 13:47:35 by mdenys #+# #+# */ -/* Updated: 2020/11/17 23:54:27 by mdenys ### ########.fr */ +/* Updated: 2021/01/11 20:32:35 by mdenys ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,7 +30,7 @@ char *check_reminder(char *reminder) free(reminder); return (0); } - if (!(rtn = malloc(sizeof(char) * ((ft_strlen(reminder) - i) + 1)))) + if (!(rtn = malloc(sizeof(char) * ((ft_strlen_custom(reminder) - i) + 1)))) return (0); i++; while (reminder[i]) @@ -81,7 +81,7 @@ int get_next_line(int fd, char **line) return (-1); } buff[r_d] = '\0'; - reminder = ft_strjoin(reminder, buff); + reminder = ft_strjoin_custom(reminder, buff); } free(buff); *line = gnl(reminder); diff --git a/get_next_line/get_next_line_utils.c b/ft_printf_include_libft/libft/src/get_next_line_utils.c similarity index 79% rename from get_next_line/get_next_line_utils.c rename to ft_printf_include_libft/libft/src/get_next_line_utils.c index 8965d91..0b0070a 100644 --- a/get_next_line/get_next_line_utils.c +++ b/ft_printf_include_libft/libft/src/get_next_line_utils.c @@ -6,13 +6,13 @@ /* By: mdenys +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/14 10:50:53 by mdenys #+# #+# */ -/* Updated: 2020/11/17 23:56:51 by mdenys ### ########.fr */ +/* Updated: 2021/01/11 20:34:13 by mdenys ### ########.fr */ /* */ /* ************************************************************************** */ #include "get_next_line.h" -size_t ft_strlen(const char *s) +size_t ft_strlen_custom_custom(const char *s) { int i; @@ -24,7 +24,7 @@ size_t ft_strlen(const char *s) return (i); } -void *ft_memmove(void *dst, const void *src, size_t len) +void *ft_memmove_custom(void *dst, const void *src, size_t len) { char *d; char *s; @@ -44,7 +44,7 @@ void *ft_memmove(void *dst, const void *src, size_t len) return (dst); } -char *ft_strjoin(char const *s1, char const *s2) +char *ft_strjoin_custom(char const *s1, char const *s2) { size_t s1_len; size_t s2_len; @@ -53,14 +53,14 @@ char *ft_strjoin(char const *s1, char const *s2) if (!s1 && !s2) return (0); - s1_len = ft_strlen((char *)s1); - s2_len = ft_strlen((char *)s2); + s1_len = ft_strlen_custom((char *)s1); + s2_len = ft_strlen_custom((char *)s2); stot_len = s1_len + s2_len + 1; rtn = malloc(sizeof(char) * stot_len); if (!rtn) return (0); - ft_memmove(rtn, s1, s1_len); - ft_memmove(rtn + s1_len, s2, s2_len); + ft_memmove_custom(rtn, s1, s1_len); + ft_memmove_custom(rtn + s1_len, s2, s2_len); rtn[stot_len - 1] = '\0'; free((char *)s1); return (rtn); diff --git a/get_next_line/get_next_line_bonus.c b/get_next_line/get_next_line_bonus.c deleted file mode 100644 index 813f361..0000000 --- a/get_next_line/get_next_line_bonus.c +++ /dev/null @@ -1,122 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* get_next_line_bonus.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mdenys +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/11/12 13:47:35 by mdenys #+# #+# */ -/* Updated: 2020/11/17 23:55:45 by mdenys ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "get_next_line_bonus.h" - -char *check_reminder(char *reminder) -{ - char *rtn; - int i; - int j; - - i = 0; - j = 0; - if (!reminder) - return (0); - while (reminder[i] && reminder[i] != '\n') - i++; - if (!reminder[i]) - { - free(reminder); - return (0); - } - if (!(rtn = malloc(sizeof(char) * ((ft_strlen(reminder) - i) + 1)))) - return (0); - i++; - while (reminder[i]) - rtn[j++] = reminder[i++]; - rtn[j] = '\0'; - free(reminder); - return (rtn); -} - -char *gnl(char *str) -{ - int i; - char *rtn; - - i = 0; - if (!str) - return (0); - while (str[i] && str[i] != '\n') - i++; - if (!(rtn = malloc(sizeof(char) * (i + 1)))) - return (0); - i = 0; - while (str[i] && str[i] != '\n') - { - rtn[i] = str[i]; - i++; - } - rtn[i] = '\0'; - return (rtn); -} - -int get_line(int fd, char **line, char **reminder) -{ - char *buff; - int r_d; - - r_d = 1; - if (fd < 0 || !line || BUFFER_SIZE <= 0) - return (-1); - if (!(buff = malloc(sizeof(char) * (BUFFER_SIZE + 1)))) - return (-1); - while (!ft_rn(*reminder) && r_d != 0) - { - if ((r_d = read(fd, buff, BUFFER_SIZE)) == -1) - { - free(buff); - return (-1); - } - buff[r_d] = '\0'; - *reminder = ft_strjoin(*reminder, buff); - } - free(buff); - *line = gnl(*reminder); - *reminder = check_reminder(*reminder); - if (r_d == 0) - return (0); - return (1); -} - -t_netnext_line *new_linked_list_el(const int fd) -{ - t_netnext_line *new; - - new = (t_netnext_line *)malloc(sizeof(t_netnext_line)); - new->fd = fd; - new->reminder = NULL; - new->next = NULL; - return (new); -} - -int get_next_line(int fd, char **line) -{ - static t_netnext_line *head; - t_netnext_line *temp; - - if (fd < 0) - return (-1); - if (fd == 0) - return (0); - if (head == NULL) - head = new_linked_list_el(fd); - temp = head; - while (temp->fd != fd) - { - if (temp->next == NULL) - temp->next = new_linked_list_el(fd); - temp = temp->next; - } - return (get_line(fd, line, &temp->reminder)); -} diff --git a/get_next_line/get_next_line_bonus.h b/get_next_line/get_next_line_bonus.h deleted file mode 100644 index a4b796a..0000000 --- a/get_next_line/get_next_line_bonus.h +++ /dev/null @@ -1,35 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* get_next_line_bonus.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mdenys +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/11/13 21:55:13 by mdenys #+# #+# */ -/* Updated: 2020/11/17 23:58:39 by mdenys ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef GET_NEXT_LINE_BONUS_H -# define GET_NEXT_LINE_BONUS_H - -# include -# include - -# ifndef BUFFER_SIZE -# define BUFFER_SIZE 5000 -# endif - -typedef struct s_netnext_line -{ - int fd; - char *reminder; - struct s_netnext_line *next; -} t_netnext_line; - -int get_next_line(int fd, char **line); -int ft_rn(char *str); -size_t ft_strlen(const char *s); -char *ft_strjoin(const char *s1, const char *s2); - -#endif diff --git a/get_next_line/get_next_line_utils_bonus.c b/get_next_line/get_next_line_utils_bonus.c deleted file mode 100644 index 8d282bc..0000000 --- a/get_next_line/get_next_line_utils_bonus.c +++ /dev/null @@ -1,83 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* get_next_line_utils_bonus.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mdenys +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/11/14 10:50:53 by mdenys #+# #+# */ -/* Updated: 2020/11/17 23:56:22 by mdenys ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "get_next_line_bonus.h" - -size_t ft_strlen(const char *s) -{ - int i; - - i = 0; - if (!s) - return (0); - while (s[i] != '\0') - i++; - return (i); -} - -void *ft_memmove(void *dst, const void *src, size_t len) -{ - char *d; - char *s; - - d = (char *)dst; - s = (char *)src; - if (dst == src) - return (dst); - if (s < d) - { - while (len--) - *(d + len) = *(s + len); - return (dst); - } - while (len--) - *d++ = *s++; - return (dst); -} - -char *ft_strjoin(char const *s1, char const *s2) -{ - size_t s1_len; - size_t s2_len; - size_t stot_len; - char *rtn; - - if (!s1 && !s2) - return (0); - s1_len = ft_strlen((char *)s1); - s2_len = ft_strlen((char *)s2); - stot_len = s1_len + s2_len + 1; - rtn = malloc(sizeof(char) * stot_len); - if (!rtn) - return (0); - ft_memmove(rtn, s1, s1_len); - ft_memmove(rtn + s1_len, s2, s2_len); - rtn[stot_len - 1] = '\0'; - free((char *)s1); - return (rtn); -} - -int ft_rn(char *str) -{ - int i; - - i = 0; - if (!str) - return (0); - while (str[i]) - { - if (str[i] == '\n') - return (1); - i++; - } - return (0); -} diff --git a/main.c b/main.c new file mode 100644 index 0000000..e0918dd --- /dev/null +++ b/main.c @@ -0,0 +1,9 @@ +#include "ft_printf_include_libft/ft_printf.h" +#include "ft_printf_include_libft/libft/includes/libft.h" +#include "ft_printf_include_libft/libft/includes/get_next_line.h" + +int main() +{ + ft_printf("test\n"); + ft_printf("%d,\n", ft_strlen("test")); +}