From 99ce0ff95663d888be3bdb3c29563fffe8158caf Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Fri, 23 Nov 2018 16:38:36 +0100 Subject: [PATCH 1/5] WIP adding functions to control word tables added functions to create, clear, delete & copy word tables --- Makefile | 6 +++--- ft_strtabclr.c | 25 +++++++++++++++++++++++++ ft_strtabcpy.c | 29 +++++++++++++++++++++++++++++ ft_strtabdel.c | 18 ++++++++++++++++++ ft_strtabnew.c | 24 ++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 ft_strtabclr.c create mode 100644 ft_strtabcpy.c create mode 100644 ft_strtabdel.c create mode 100644 ft_strtabnew.c diff --git a/Makefile b/Makefile index e6655ef..25e7f36 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,12 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2018/10/08 14:33:36 by tmaze ### ########.fr # +# Updated: 2018/11/23 16:38:25 by tmaze ### ########.fr # # # #******************************************************************************# CC = gcc -CCFLAGS = -Wall -Werror -Wextra +CCFLAGS = -Wall -Werror -Wextra -g CCSTD = NAME = libft.a @@ -19,7 +19,7 @@ NAME = libft.a SRCS = ft_memset.c ft_bzero.c ft_memcpy.c ft_memccpy.c ft_memmove.c ft_memchr.c ft_memcmp.c ft_strlen.c ft_strdup.c ft_strcpy.c ft_strncpy.c ft_strcat.c ft_strncat.c ft_strlcat.c ft_strchr.c ft_strrchr.c ft_strstr.c ft_strnstr.c ft_strcmp.c ft_strncmp.c ft_atoi.c ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_toupper.c ft_tolower.c \ ft_memalloc.c ft_memdel.c ft_strnew.c ft_strdel.c ft_strclr.c ft_striter.c ft_striteri.c ft_strmap.c ft_strmapi.c ft_strequ.c ft_strnequ.c ft_strsub.c ft_strjoin.c ft_strtrim.c ft_strsplit.c ft_itoa.c ft_putchar.c ft_putstr.c ft_putendl.c ft_putnbr.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c\ ft_lstnew.c ft_lstdelone.c ft_lstdel.c ft_lstadd.c ft_lstiter.c ft_lstmap.c \ - ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lstsort.c ft_lstaddsort.c ft_round.c + ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lstsort.c ft_lstaddsort.c ft_round.c ft_strtabnew.c ft_strtabclr.c ft_strtabcpy.c ft_strtabdel.c OBJS = $(SRCS:.c=.o) INCLS = -I. diff --git a/ft_strtabclr.c b/ft_strtabclr.c new file mode 100644 index 0000000..13a45fd --- /dev/null +++ b/ft_strtabclr.c @@ -0,0 +1,25 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strtabclr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/11/23 14:49:25 by tmaze #+# #+# */ +/* Updated: 2018/11/23 14:52:43 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +void ft_strtabclr(char **tab) +{ + size_t i; + + i = 0; + while (tab[i]) + { + ft_strdel(tab[i]); + i++; + } +} diff --git a/ft_strtabcpy.c b/ft_strtabcpy.c new file mode 100644 index 0000000..e89bfc2 --- /dev/null +++ b/ft_strtabcpy.c @@ -0,0 +1,29 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strtabcpy.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/11/23 14:44:53 by tmaze #+# #+# */ +/* Updated: 2018/11/23 14:52:27 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +char **ft_strtabcpy(char **dest, const char **src) +{ + size_t i; + + i = 0; + while (src[i]) + { + if ((dest[i] = ft_strdup(src[i])) == NULL) + { + ft_strtabclr(dest); + return (NULL); + } + i++; + } +} diff --git a/ft_strtabdel.c b/ft_strtabdel.c new file mode 100644 index 0000000..453e94d --- /dev/null +++ b/ft_strtabdel.c @@ -0,0 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strtabdel.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/11/23 16:32:30 by tmaze #+# #+# */ +/* Updated: 2018/11/23 16:35:27 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +void ft_strtabdel(char ***tab) +{ + ft_memdel((**void)tab); +} diff --git a/ft_strtabnew.c b/ft_strtabnew.c new file mode 100644 index 0000000..f1e98b1 --- /dev/null +++ b/ft_strtabnew.c @@ -0,0 +1,24 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strtabnew.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/11/23 14:13:08 by tmaze #+# #+# */ +/* Updated: 2018/11/23 14:38:11 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +char **ft_strtabnew(size_t size) +{ + char **ret; + + if (size <= 0 || (ret = (char**)ft_memalloc(sizeof(char*) * (size + 1))) == NULL) + return (NULL); + while (size >= 0) + ret[size - 1] = NULL; + return (ret); +} From 1c9e7e6685f163bf86a8bd701b24b2d743141436 Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Wed, 28 Nov 2018 14:28:38 +0100 Subject: [PATCH 2/5] added gitignore + droped tables func --- .gitignore | 64 ++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 +-- ft_lstaddend.c | 10 +++---- ft_strsplitstr2.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ ft_strtabclr.c | 25 ----------------- ft_strtabcpy.c | 29 -------------------- ft_strtabdel.c | 18 ------------- ft_strtabnew.c | 24 ----------------- libft.h | 4 ++- 9 files changed, 141 insertions(+), 105 deletions(-) create mode 100644 .gitignore create mode 100644 ft_strsplitstr2.c delete mode 100644 ft_strtabclr.c delete mode 100644 ft_strtabcpy.c delete mode 100644 ft_strtabdel.c delete mode 100644 ft_strtabnew.c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4656c37 --- /dev/null +++ b/.gitignore @@ -0,0 +1,64 @@ +# ******************************************************************************** # +# # +# ::: :::::::: # +# .gitignore :+: :+: :+: # +# +:+ +:+ +:+ # +# By: tmaze +#+ +:+ +#+ # +# +#+#+#+#+#+ +#+ # +# Created: 2018/11/28 14:03:11 by tmaze #+# #+# # + Updated: 2018/11/28 14:27:23 by tmaze ### ########.fr +# # +# ******************************************************************************** # + +# Prerequisites +*.d + +# Object files +*.o +*.ko +*.obj +*.elf + +# Linker output +*.ilk +*.map +*.exp + +# Precompiled Headers +*.gch +*.pch + +# Libraries +*.lib +*.a +*.la +*.lo + +# Shared objects (inc. Windows DLLs) +*.dll +*.so +*.so.* +*.dylib + +# Executables +*.exe +*.out +*.app +*.i*86 +*.x86_64 +*.hex + +# Debug files +*.dSYM/ +*.su +*.idb +*.pdb + +# Kernel Module Compile Results +*.mod* +*.cmd +.tmp_versions/ +modules.order +Module.symvers +Mkfile.old +dkms.conf \ No newline at end of file diff --git a/Makefile b/Makefile index 25e7f36..13fbaea 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2018/11/23 16:38:25 by tmaze ### ########.fr # +# Updated: 2018/11/26 12:40:27 by tmaze ### ########.fr # # # #******************************************************************************# @@ -19,7 +19,7 @@ NAME = libft.a SRCS = ft_memset.c ft_bzero.c ft_memcpy.c ft_memccpy.c ft_memmove.c ft_memchr.c ft_memcmp.c ft_strlen.c ft_strdup.c ft_strcpy.c ft_strncpy.c ft_strcat.c ft_strncat.c ft_strlcat.c ft_strchr.c ft_strrchr.c ft_strstr.c ft_strnstr.c ft_strcmp.c ft_strncmp.c ft_atoi.c ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_toupper.c ft_tolower.c \ ft_memalloc.c ft_memdel.c ft_strnew.c ft_strdel.c ft_strclr.c ft_striter.c ft_striteri.c ft_strmap.c ft_strmapi.c ft_strequ.c ft_strnequ.c ft_strsub.c ft_strjoin.c ft_strtrim.c ft_strsplit.c ft_itoa.c ft_putchar.c ft_putstr.c ft_putendl.c ft_putnbr.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c\ ft_lstnew.c ft_lstdelone.c ft_lstdel.c ft_lstadd.c ft_lstiter.c ft_lstmap.c \ - ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lstsort.c ft_lstaddsort.c ft_round.c ft_strtabnew.c ft_strtabclr.c ft_strtabcpy.c ft_strtabdel.c + ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lstsort.c ft_lstaddsort.c ft_round.c ft_strsplitstr2.c OBJS = $(SRCS:.c=.o) INCLS = -I. diff --git a/ft_lstaddend.c b/ft_lstaddend.c index f840c58..abb02e5 100644 --- a/ft_lstaddend.c +++ b/ft_lstaddend.c @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/17 20:55:26 by tmaze #+# #+# */ -/* Updated: 2018/04/19 14:32:44 by tmaze ### ########.fr */ +/* Updated: 2018/11/26 12:30:30 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ t_list *ft_lstaddend(t_list **alst, t_list *new) { - t_list **tmp; + t_list *tmp; if (new == NULL) return (NULL); @@ -22,10 +22,8 @@ t_list *ft_lstaddend(t_list **alst, t_list *new) ft_lstadd(alst, new); else if (ft_lstsize(*alst) > 0) { - if ((tmp = (t_list**)malloc(sizeof(t_list*))) == NULL) - return (NULL); - *tmp = ft_lstgetlast(*alst); - ft_lstadd(&(*tmp)->next, new); + tmp = ft_lstgetlast(*alst); + ft_lstadd(&(tmp->next), new); } return (*alst); } diff --git a/ft_strsplitstr2.c b/ft_strsplitstr2.c new file mode 100644 index 0000000..a4c1b02 --- /dev/null +++ b/ft_strsplitstr2.c @@ -0,0 +1,68 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strsplitstr2.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/11/26 11:33:06 by tmaze #+# #+# */ +/* Updated: 2018/11/26 12:42:46 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +static int isin(char c, char *str) +{ + size_t i; + + i = 0; + while (str[i]) + if (c == str[i++]) + return (1); + return (0); +} + +static void ft_cntdelstr(void* content, size_t content_size) +{ + ft_strdel((char**)content); + content_size = 0; +} + +t_list *ft_strsplitstr2(char *str, char *split) +{ + size_t i; + size_t j; + char *token; + t_list *lst; + t_list *new; + + lst = NULL; + i = 0; + j = 0; + while (str[i]) + { + if (isin(str[i], split)) + { + if ((token = ft_strnew(i - j + 1)) == NULL) + { + ft_lstdel(&lst, &ft_cntdelstr); + return (NULL); + } + token[i + j + 1] = '\0'; + ft_strsub(str, j, i); + if ((new = ft_lstnew((void*)token, ft_strlen(token))) == NULL) + { + ft_strdel(&token); + ft_lstdel(&lst, &ft_cntdelstr); + return (NULL); + } + ft_lstaddend(&lst, new); + while ((isin(str[i], split))) + i++; + j = i; + } + i++; + } + return (lst); +} diff --git a/ft_strtabclr.c b/ft_strtabclr.c deleted file mode 100644 index 13a45fd..0000000 --- a/ft_strtabclr.c +++ /dev/null @@ -1,25 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strtabclr.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: tmaze +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/23 14:49:25 by tmaze #+# #+# */ -/* Updated: 2018/11/23 14:52:43 by tmaze ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_strtabclr(char **tab) -{ - size_t i; - - i = 0; - while (tab[i]) - { - ft_strdel(tab[i]); - i++; - } -} diff --git a/ft_strtabcpy.c b/ft_strtabcpy.c deleted file mode 100644 index e89bfc2..0000000 --- a/ft_strtabcpy.c +++ /dev/null @@ -1,29 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strtabcpy.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: tmaze +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/23 14:44:53 by tmaze #+# #+# */ -/* Updated: 2018/11/23 14:52:27 by tmaze ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -char **ft_strtabcpy(char **dest, const char **src) -{ - size_t i; - - i = 0; - while (src[i]) - { - if ((dest[i] = ft_strdup(src[i])) == NULL) - { - ft_strtabclr(dest); - return (NULL); - } - i++; - } -} diff --git a/ft_strtabdel.c b/ft_strtabdel.c deleted file mode 100644 index 453e94d..0000000 --- a/ft_strtabdel.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strtabdel.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: tmaze +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/23 16:32:30 by tmaze #+# #+# */ -/* Updated: 2018/11/23 16:35:27 by tmaze ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_strtabdel(char ***tab) -{ - ft_memdel((**void)tab); -} diff --git a/ft_strtabnew.c b/ft_strtabnew.c deleted file mode 100644 index f1e98b1..0000000 --- a/ft_strtabnew.c +++ /dev/null @@ -1,24 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strtabnew.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: tmaze +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/23 14:13:08 by tmaze #+# #+# */ -/* Updated: 2018/11/23 14:38:11 by tmaze ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -char **ft_strtabnew(size_t size) -{ - char **ret; - - if (size <= 0 || (ret = (char**)ft_memalloc(sizeof(char*) * (size + 1))) == NULL) - return (NULL); - while (size >= 0) - ret[size - 1] = NULL; - return (ret); -} diff --git a/libft.h b/libft.h index fb41da1..4034562 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */ -/* Updated: 2018/10/24 13:38:20 by tmaze ### ########.fr */ +/* Updated: 2018/11/26 12:36:58 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -174,4 +174,6 @@ void ft_lstaddsort(t_list **lst, t_list *new, int ft_round(float x, float ind); +t_list *ft_strsplitstr2(char *str, char *split); + #endif From 2e3500751ebc7b13fe478fd1d16ba3bde1000a08 Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Wed, 28 Nov 2018 14:36:05 +0100 Subject: [PATCH 3/5] corrected gitignore --- .gitignore | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.gitignore b/.gitignore index 4656c37..6d5206b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,3 @@ -# ******************************************************************************** # -# # -# ::: :::::::: # -# .gitignore :+: :+: :+: # -# +:+ +:+ +:+ # -# By: tmaze +#+ +:+ +#+ # -# +#+#+#+#+#+ +#+ # -# Created: 2018/11/28 14:03:11 by tmaze #+# #+# # - Updated: 2018/11/28 14:27:23 by tmaze ### ########.fr -# # -# ******************************************************************************** # - # Prerequisites *.d From 19d3e23b743dc95d0301579d1c5a0b97b36695aa Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Sun, 13 Jan 2019 17:45:57 +0100 Subject: [PATCH 4/5] modified ft_putendl behavior when dealing with NULL --- ft_lstsize.c | 2 +- ft_putendl.c | 6 ++---- ft_strncpy.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ft_lstsize.c b/ft_lstsize.c index b3bd301..937736b 100644 --- a/ft_lstsize.c +++ b/ft_lstsize.c @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/09 13:55:29 by tmaze #+# #+# */ -/* Updated: 2018/04/09 16:46:33 by tmaze ### ########.fr */ +/* Updated: 2018/11/28 14:46:12 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ft_putendl.c b/ft_putendl.c index c2858e6..c7d1cd6 100644 --- a/ft_putendl.c +++ b/ft_putendl.c @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/07 22:37:44 by tmaze #+# #+# */ -/* Updated: 2018/04/10 14:24:26 by tmaze ### ########.fr */ +/* Updated: 2019/01/13 17:44:21 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,8 +15,6 @@ void ft_putendl(char const *s) { if (s != NULL) - { ft_putstr(s); - ft_putchar('\n'); - } + ft_putchar('\n'); } diff --git a/ft_strncpy.c b/ft_strncpy.c index b3d021c..41d050d 100644 --- a/ft_strncpy.c +++ b/ft_strncpy.c @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/04 16:55:29 by tmaze #+# #+# */ -/* Updated: 2018/04/08 14:13:22 by tmaze ### ########.fr */ +/* Updated: 2019/01/10 17:37:08 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ From 4b44c49fc6caa15379cd821f967e53462d4dc837 Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Tue, 29 Jan 2019 18:20:52 +0100 Subject: [PATCH 5/5] long time no see =) added fully test realpath function removed zombie strsplitstr2 function --- Makefile | 6 ++-- ft_realpath.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ ft_strsplitstr2.c | 68 ----------------------------------------- libft.h | 4 +-- 4 files changed, 82 insertions(+), 73 deletions(-) create mode 100644 ft_realpath.c delete mode 100644 ft_strsplitstr2.c diff --git a/Makefile b/Makefile index 13fbaea..5fcc2ea 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,12 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2018/11/26 12:40:27 by tmaze ### ########.fr # +# Updated: 2019/01/29 18:19:09 by tmaze ### ########.fr # # # #******************************************************************************# CC = gcc -CCFLAGS = -Wall -Werror -Wextra -g +CCFLAGS = -Wall -Werror -Wextra CCSTD = NAME = libft.a @@ -19,7 +19,7 @@ NAME = libft.a SRCS = ft_memset.c ft_bzero.c ft_memcpy.c ft_memccpy.c ft_memmove.c ft_memchr.c ft_memcmp.c ft_strlen.c ft_strdup.c ft_strcpy.c ft_strncpy.c ft_strcat.c ft_strncat.c ft_strlcat.c ft_strchr.c ft_strrchr.c ft_strstr.c ft_strnstr.c ft_strcmp.c ft_strncmp.c ft_atoi.c ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_toupper.c ft_tolower.c \ ft_memalloc.c ft_memdel.c ft_strnew.c ft_strdel.c ft_strclr.c ft_striter.c ft_striteri.c ft_strmap.c ft_strmapi.c ft_strequ.c ft_strnequ.c ft_strsub.c ft_strjoin.c ft_strtrim.c ft_strsplit.c ft_itoa.c ft_putchar.c ft_putstr.c ft_putendl.c ft_putnbr.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c\ ft_lstnew.c ft_lstdelone.c ft_lstdel.c ft_lstadd.c ft_lstiter.c ft_lstmap.c \ - ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lstsort.c ft_lstaddsort.c ft_round.c ft_strsplitstr2.c + ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lstsort.c ft_lstaddsort.c ft_round.c ft_realpath.c OBJS = $(SRCS:.c=.o) INCLS = -I. diff --git a/ft_realpath.c b/ft_realpath.c new file mode 100644 index 0000000..8411ca3 --- /dev/null +++ b/ft_realpath.c @@ -0,0 +1,77 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_realpath.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/01/27 14:42:35 by tmaze #+# #+# */ +/* Updated: 2019/01/29 18:16:22 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +char *ft_tabtopath(char **tab_path) +{ + size_t total_size; + size_t i; + char *ret; + + i = 0; + total_size = 0; + while (tab_path[i]) + total_size += ft_strlen(tab_path[i++]); + total_size = (total_size == 0) ? 1 : total_size; + if ((ret = ft_strnew(total_size + i)) == NULL) + return (NULL); + i = 0; + ft_strcat(ret, "/"); + while (tab_path[i]) + { + if (i > 0) + ft_strcat(ret, "/"); + ft_strcat(ret, tab_path[i++]); + } + return (ret); +} + +void ft_reducepath(char ***tab) +{ + size_t i; + size_t j; + int strcmp; + + i = 0; + while ((*tab)[i]) + { + if ((strcmp = ft_strcmp((*tab)[i], "..")) == 0 + || ft_strcmp((*tab)[i], ".") == 0) + { + ft_strdel(&((*tab)[i])); + if ((j = i) == i && strcmp == 0 && i != 0) + ft_strdel(&((*tab)[i - 1])); + while ((*tab)[++j]) + (*tab)[j - ((strcmp == 0 && i != 0) ? 2 : 1)] = (*tab)[j]; + if (strcmp == 0 && i != 0) + (*tab)[j - 2] = NULL; + (*tab)[j - 1] = NULL; + if (strcmp == 0 && i != 0) + i--; + } + else + i++; + } +} + +char *ft_realpath(char *r_path, char **a_path) +{ + char **tab_path; + + if ((tab_path = ft_strsplit(r_path, '/')) == NULL) + return (NULL); + ft_reducepath(&tab_path); + *a_path = ft_tabtopath(tab_path); + ft_del_words_tables(&tab_path); + return (*a_path); +} diff --git a/ft_strsplitstr2.c b/ft_strsplitstr2.c deleted file mode 100644 index a4c1b02..0000000 --- a/ft_strsplitstr2.c +++ /dev/null @@ -1,68 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strsplitstr2.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: tmaze +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/26 11:33:06 by tmaze #+# #+# */ -/* Updated: 2018/11/26 12:42:46 by tmaze ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -static int isin(char c, char *str) -{ - size_t i; - - i = 0; - while (str[i]) - if (c == str[i++]) - return (1); - return (0); -} - -static void ft_cntdelstr(void* content, size_t content_size) -{ - ft_strdel((char**)content); - content_size = 0; -} - -t_list *ft_strsplitstr2(char *str, char *split) -{ - size_t i; - size_t j; - char *token; - t_list *lst; - t_list *new; - - lst = NULL; - i = 0; - j = 0; - while (str[i]) - { - if (isin(str[i], split)) - { - if ((token = ft_strnew(i - j + 1)) == NULL) - { - ft_lstdel(&lst, &ft_cntdelstr); - return (NULL); - } - token[i + j + 1] = '\0'; - ft_strsub(str, j, i); - if ((new = ft_lstnew((void*)token, ft_strlen(token))) == NULL) - { - ft_strdel(&token); - ft_lstdel(&lst, &ft_cntdelstr); - return (NULL); - } - ft_lstaddend(&lst, new); - while ((isin(str[i], split))) - i++; - j = i; - } - i++; - } - return (lst); -} diff --git a/libft.h b/libft.h index 4034562..2f460a4 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */ -/* Updated: 2018/11/26 12:36:58 by tmaze ### ########.fr */ +/* Updated: 2019/01/29 18:18:28 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -174,6 +174,6 @@ void ft_lstaddsort(t_list **lst, t_list *new, int ft_round(float x, float ind); -t_list *ft_strsplitstr2(char *str, char *split); +char *ft_realpath(char *r_path, char **a_path); #endif