From 138f4a0dc28f5c43ad7047c8394d173a8de0301c Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Sun, 1 Dec 2019 16:15:47 +0100 Subject: [PATCH] remis quelques headers et a la norme --- Makefile | 33 +++---- echo.txt | 0 srcd/part2/ft_split.c | 123 ----------------------- {srcd => srcs}/add/ft_any.c | 0 {srcd => srcs}/add/ft_arraymap.c | 0 {srcd => srcs}/add/ft_atoibase.c | 0 {srcd => srcs}/add/ft_convertbase.c | 0 {srcd => srcs}/add/ft_foreach.c | 0 {srcd => srcs}/add/ft_issort.c | 0 {srcd => srcs}/add/ft_memalloc.c | 0 {srcd => srcs}/add/ft_memdel.c | 0 {srcd => srcs}/add/ft_putchar.c | 0 {srcd => srcs}/add/ft_putendl.c | 0 {srcd => srcs}/add/ft_putnbr.c | 0 {srcd => srcs}/add/ft_putnbrbase.c | 0 {srcd => srcs}/add/ft_putnbrendl.c | 0 {srcd => srcs}/add/ft_putnbrendl_fd.c | 0 {srcd => srcs}/add/ft_putstr.c | 0 {srcd => srcs}/add/ft_strcat.c | 0 {srcd => srcs}/add/ft_strclr.c | 0 {srcd => srcs}/add/ft_strcmp.c | 0 {srcd => srcs}/add/ft_strcpy.c | 0 {srcd => srcs}/add/ft_strdel.c | 0 {srcd => srcs}/add/ft_strequ.c | 0 {srcd => srcs}/add/ft_striter.c | 0 {srcd => srcs}/add/ft_striteri.c | 0 {srcd => srcs}/add/ft_strjoinfree.c | 0 {srcd => srcs}/add/ft_strmap.c | 0 {srcd => srcs}/add/ft_strmultisplit.c | 0 {srcd => srcs}/add/ft_strncat.c | 0 {srcd => srcs}/add/ft_strncpy.c | 0 {srcd => srcs}/add/ft_strnequ.c | 0 {srcd => srcs}/add/ft_strnew.c | 0 {srcd => srcs}/add/ft_strstr.c | 0 {srcd => srcs}/bonus/ft_lstadd_back.c | 0 {srcd => srcs}/bonus/ft_lstadd_front.c | 0 {srcd => srcs}/bonus/ft_lstclear.c | 0 {srcd => srcs}/bonus/ft_lstdelone.c | 0 {srcd => srcs}/bonus/ft_lstiter.c | 4 +- {srcd => srcs}/bonus/ft_lstlast.c | 0 {srcd => srcs}/bonus/ft_lstmap.c | 8 +- {srcd => srcs}/bonus/ft_lstnew.c | 0 {srcd => srcs}/bonus/ft_lstsize.c | 0 srcs/ft_any.c | 26 ----- srcs/ft_arraymap.c | 28 ------ srcs/ft_atoi.c | 39 -------- srcs/ft_atoibase.c | 75 -------------- srcs/ft_bzero.c | 27 ----- srcs/ft_calloc.c | 21 ---- srcs/ft_convertbase.c | 86 ---------------- srcs/ft_foreach.c | 22 ----- srcs/ft_isalnum.c | 18 ---- srcs/ft_isalpha.c | 18 ---- srcs/ft_isascii.c | 18 ---- srcs/ft_isdigit.c | 18 ---- srcs/ft_isprint.c | 18 ---- srcs/ft_issort.c | 26 ----- srcs/ft_itoa.c | 55 ----------- srcs/ft_lstadd_back.c | 91 ----------------- srcs/ft_lstadd_front.c | 94 ------------------ srcs/ft_lstclear.c | 95 ------------------ srcs/ft_lstdelone.c | 96 ------------------ srcs/ft_lstiter.c | 85 ---------------- srcs/ft_lstlast.c | 100 ------------------- srcs/ft_lstmap.c | 131 ------------------------- srcs/ft_lstnew.c | 59 ----------- srcs/ft_lstsize.c | 86 ---------------- srcs/ft_memalloc.c | 27 ----- srcs/ft_memccpy.c | 36 ------- srcs/ft_memchr.c | 30 ------ srcs/ft_memcmp.c | 32 ------ srcs/ft_memcpy.c | 52 ---------- srcs/ft_memdel.c | 26 ----- srcs/ft_memmove.c | 37 ------- srcs/ft_memset.c | 29 ------ srcs/ft_putchar.c | 18 ---- srcs/ft_putchar_fd.c | 18 ---- srcs/ft_putendl.c | 19 ---- srcs/ft_putendl_fd.c | 23 ----- srcs/ft_putnbr.c | 18 ---- srcs/ft_putnbr_fd.c | 28 ------ srcs/ft_putnbrbase.c | 59 ----------- srcs/ft_putnbrendl.c | 18 ---- srcs/ft_putnbrendl_fd.c | 29 ------ srcs/ft_putstr.c | 22 ----- srcs/ft_putstr_fd.c | 23 ----- srcs/ft_strcat.c | 32 ------ srcs/ft_strchr.c | 33 ------- srcs/ft_strclr.c | 23 ----- srcs/ft_strcmp.c | 28 ------ srcs/ft_strcpy.c | 28 ------ srcs/ft_strdel.c | 26 ----- srcs/ft_strdup.c | 32 ------ srcs/ft_strequ.c | 24 ----- srcs/ft_striter.c | 23 ----- srcs/ft_striteri.c | 26 ----- srcs/ft_strjoin.c | 54 ---------- srcs/ft_strjoinfree.c | 28 ------ srcs/ft_strlcat.c | 108 -------------------- srcs/ft_strlcpy.c | 54 ---------- srcs/ft_strlen.c | 27 ----- srcs/ft_strmap.c | 32 ------ srcs/ft_strmapi.c | 72 -------------- srcs/ft_strmultisplit.c | 83 ---------------- srcs/ft_strncat.c | 32 ------ srcs/ft_strncmp.c | 32 ------ srcs/ft_strncpy.c | 30 ------ srcs/ft_strnequ.c | 25 ----- srcs/ft_strnew.c | 27 ----- srcs/ft_strnstr.c | 42 -------- srcs/ft_strrchr.c | 32 ------ srcs/ft_strstr.c | 42 -------- srcs/ft_strtrim.c | 90 ----------------- srcs/ft_substr.c | 52 ---------- srcs/ft_tolower.c | 20 ---- srcs/ft_toupper.c | 20 ---- {srcd => srcs}/part1/ft_atoi.c | 0 {srcd => srcs}/part1/ft_bzero.c | 0 {srcd => srcs}/part1/ft_calloc.c | 16 +-- {srcd => srcs}/part1/ft_isalnum.c | 0 {srcd => srcs}/part1/ft_isalpha.c | 0 {srcd => srcs}/part1/ft_isascii.c | 0 {srcd => srcs}/part1/ft_isdigit.c | 0 {srcd => srcs}/part1/ft_isprint.c | 0 {srcd => srcs}/part1/ft_memccpy.c | 0 {srcd => srcs}/part1/ft_memchr.c | 0 {srcd => srcs}/part1/ft_memcmp.c | 0 {srcd => srcs}/part1/ft_memcpy.c | 4 +- {srcd => srcs}/part1/ft_memmove.c | 0 {srcd => srcs}/part1/ft_memset.c | 0 {srcd => srcs}/part1/ft_strchr.c | 0 {srcd => srcs}/part1/ft_strdup.c | 0 {srcd => srcs}/part1/ft_strlcat.c | 0 {srcd => srcs}/part1/ft_strlcpy.c | 2 +- {srcd => srcs}/part1/ft_strlen.c | 0 {srcd => srcs}/part1/ft_strncmp.c | 0 {srcd => srcs}/part1/ft_strnstr.c | 0 {srcd => srcs}/part1/ft_strrchr.c | 0 {srcd => srcs}/part1/ft_tolower.c | 0 {srcd => srcs}/part1/ft_toupper.c | 0 {srcd => srcs}/part2/ft_itoa.c | 0 {srcd => srcs}/part2/ft_putchar_fd.c | 0 {srcd => srcs}/part2/ft_putendl_fd.c | 0 {srcd => srcs}/part2/ft_putnbr_fd.c | 0 {srcd => srcs}/part2/ft_putstr_fd.c | 0 srcs/{ => part2}/ft_split.c | 4 +- {srcd => srcs}/part2/ft_strjoin.c | 0 {srcd => srcs}/part2/ft_strmapi.c | 0 {srcd => srcs}/part2/ft_strtrim.c | 0 {srcd => srcs}/part2/ft_substr.c | 12 +++ testresults | 15 --- 151 files changed, 45 insertions(+), 3229 deletions(-) delete mode 100644 echo.txt delete mode 100644 srcd/part2/ft_split.c rename {srcd => srcs}/add/ft_any.c (100%) rename {srcd => srcs}/add/ft_arraymap.c (100%) rename {srcd => srcs}/add/ft_atoibase.c (100%) rename {srcd => srcs}/add/ft_convertbase.c (100%) rename {srcd => srcs}/add/ft_foreach.c (100%) rename {srcd => srcs}/add/ft_issort.c (100%) rename {srcd => srcs}/add/ft_memalloc.c (100%) rename {srcd => srcs}/add/ft_memdel.c (100%) rename {srcd => srcs}/add/ft_putchar.c (100%) rename {srcd => srcs}/add/ft_putendl.c (100%) rename {srcd => srcs}/add/ft_putnbr.c (100%) rename {srcd => srcs}/add/ft_putnbrbase.c (100%) rename {srcd => srcs}/add/ft_putnbrendl.c (100%) rename {srcd => srcs}/add/ft_putnbrendl_fd.c (100%) rename {srcd => srcs}/add/ft_putstr.c (100%) rename {srcd => srcs}/add/ft_strcat.c (100%) rename {srcd => srcs}/add/ft_strclr.c (100%) rename {srcd => srcs}/add/ft_strcmp.c (100%) rename {srcd => srcs}/add/ft_strcpy.c (100%) rename {srcd => srcs}/add/ft_strdel.c (100%) rename {srcd => srcs}/add/ft_strequ.c (100%) rename {srcd => srcs}/add/ft_striter.c (100%) rename {srcd => srcs}/add/ft_striteri.c (100%) rename {srcd => srcs}/add/ft_strjoinfree.c (100%) rename {srcd => srcs}/add/ft_strmap.c (100%) rename {srcd => srcs}/add/ft_strmultisplit.c (100%) rename {srcd => srcs}/add/ft_strncat.c (100%) rename {srcd => srcs}/add/ft_strncpy.c (100%) rename {srcd => srcs}/add/ft_strnequ.c (100%) rename {srcd => srcs}/add/ft_strnew.c (100%) rename {srcd => srcs}/add/ft_strstr.c (100%) rename {srcd => srcs}/bonus/ft_lstadd_back.c (100%) rename {srcd => srcs}/bonus/ft_lstadd_front.c (100%) rename {srcd => srcs}/bonus/ft_lstclear.c (100%) rename {srcd => srcs}/bonus/ft_lstdelone.c (100%) rename {srcd => srcs}/bonus/ft_lstiter.c (97%) rename {srcd => srcs}/bonus/ft_lstlast.c (100%) rename {srcd => srcs}/bonus/ft_lstmap.c (95%) rename {srcd => srcs}/bonus/ft_lstnew.c (100%) rename {srcd => srcs}/bonus/ft_lstsize.c (100%) delete mode 100644 srcs/ft_any.c delete mode 100644 srcs/ft_arraymap.c delete mode 100644 srcs/ft_atoi.c delete mode 100644 srcs/ft_atoibase.c delete mode 100644 srcs/ft_bzero.c delete mode 100644 srcs/ft_calloc.c delete mode 100644 srcs/ft_convertbase.c delete mode 100644 srcs/ft_foreach.c delete mode 100644 srcs/ft_isalnum.c delete mode 100644 srcs/ft_isalpha.c delete mode 100644 srcs/ft_isascii.c delete mode 100644 srcs/ft_isdigit.c delete mode 100644 srcs/ft_isprint.c delete mode 100644 srcs/ft_issort.c delete mode 100644 srcs/ft_itoa.c delete mode 100644 srcs/ft_lstadd_back.c delete mode 100644 srcs/ft_lstadd_front.c delete mode 100644 srcs/ft_lstclear.c delete mode 100644 srcs/ft_lstdelone.c delete mode 100644 srcs/ft_lstiter.c delete mode 100644 srcs/ft_lstlast.c delete mode 100644 srcs/ft_lstmap.c delete mode 100644 srcs/ft_lstnew.c delete mode 100644 srcs/ft_lstsize.c delete mode 100644 srcs/ft_memalloc.c delete mode 100644 srcs/ft_memccpy.c delete mode 100644 srcs/ft_memchr.c delete mode 100644 srcs/ft_memcmp.c delete mode 100644 srcs/ft_memcpy.c delete mode 100644 srcs/ft_memdel.c delete mode 100644 srcs/ft_memmove.c delete mode 100644 srcs/ft_memset.c delete mode 100644 srcs/ft_putchar.c delete mode 100644 srcs/ft_putchar_fd.c delete mode 100644 srcs/ft_putendl.c delete mode 100644 srcs/ft_putendl_fd.c delete mode 100644 srcs/ft_putnbr.c delete mode 100644 srcs/ft_putnbr_fd.c delete mode 100644 srcs/ft_putnbrbase.c delete mode 100644 srcs/ft_putnbrendl.c delete mode 100644 srcs/ft_putnbrendl_fd.c delete mode 100644 srcs/ft_putstr.c delete mode 100644 srcs/ft_putstr_fd.c delete mode 100644 srcs/ft_strcat.c delete mode 100644 srcs/ft_strchr.c delete mode 100644 srcs/ft_strclr.c delete mode 100644 srcs/ft_strcmp.c delete mode 100644 srcs/ft_strcpy.c delete mode 100644 srcs/ft_strdel.c delete mode 100644 srcs/ft_strdup.c delete mode 100644 srcs/ft_strequ.c delete mode 100644 srcs/ft_striter.c delete mode 100644 srcs/ft_striteri.c delete mode 100644 srcs/ft_strjoin.c delete mode 100644 srcs/ft_strjoinfree.c delete mode 100644 srcs/ft_strlcat.c delete mode 100644 srcs/ft_strlcpy.c delete mode 100644 srcs/ft_strlen.c delete mode 100644 srcs/ft_strmap.c delete mode 100644 srcs/ft_strmapi.c delete mode 100644 srcs/ft_strmultisplit.c delete mode 100644 srcs/ft_strncat.c delete mode 100644 srcs/ft_strncmp.c delete mode 100644 srcs/ft_strncpy.c delete mode 100644 srcs/ft_strnequ.c delete mode 100644 srcs/ft_strnew.c delete mode 100644 srcs/ft_strnstr.c delete mode 100644 srcs/ft_strrchr.c delete mode 100644 srcs/ft_strstr.c delete mode 100644 srcs/ft_strtrim.c delete mode 100644 srcs/ft_substr.c delete mode 100644 srcs/ft_tolower.c delete mode 100644 srcs/ft_toupper.c rename {srcd => srcs}/part1/ft_atoi.c (100%) rename {srcd => srcs}/part1/ft_bzero.c (100%) rename {srcd => srcs}/part1/ft_calloc.c (94%) rename {srcd => srcs}/part1/ft_isalnum.c (100%) rename {srcd => srcs}/part1/ft_isalpha.c (100%) rename {srcd => srcs}/part1/ft_isascii.c (100%) rename {srcd => srcs}/part1/ft_isdigit.c (100%) rename {srcd => srcs}/part1/ft_isprint.c (100%) rename {srcd => srcs}/part1/ft_memccpy.c (100%) rename {srcd => srcs}/part1/ft_memchr.c (100%) rename {srcd => srcs}/part1/ft_memcmp.c (100%) rename {srcd => srcs}/part1/ft_memcpy.c (94%) rename {srcd => srcs}/part1/ft_memmove.c (100%) rename {srcd => srcs}/part1/ft_memset.c (100%) rename {srcd => srcs}/part1/ft_strchr.c (100%) rename {srcd => srcs}/part1/ft_strdup.c (100%) rename {srcd => srcs}/part1/ft_strlcat.c (100%) rename {srcd => srcs}/part1/ft_strlcpy.c (96%) rename {srcd => srcs}/part1/ft_strlen.c (100%) rename {srcd => srcs}/part1/ft_strncmp.c (100%) rename {srcd => srcs}/part1/ft_strnstr.c (100%) rename {srcd => srcs}/part1/ft_strrchr.c (100%) rename {srcd => srcs}/part1/ft_tolower.c (100%) rename {srcd => srcs}/part1/ft_toupper.c (100%) rename {srcd => srcs}/part2/ft_itoa.c (100%) rename {srcd => srcs}/part2/ft_putchar_fd.c (100%) rename {srcd => srcs}/part2/ft_putendl_fd.c (100%) rename {srcd => srcs}/part2/ft_putnbr_fd.c (100%) rename {srcd => srcs}/part2/ft_putstr_fd.c (100%) rename srcs/{ => part2}/ft_split.c (93%) rename {srcd => srcs}/part2/ft_strjoin.c (100%) rename {srcd => srcs}/part2/ft_strmapi.c (100%) rename {srcd => srcs}/part2/ft_strtrim.c (100%) rename {srcd => srcs}/part2/ft_substr.c (61%) delete mode 100644 testresults diff --git a/Makefile b/Makefile index d162244..af38573 100644 --- a/Makefile +++ b/Makefile @@ -52,16 +52,6 @@ SRCS = ft_memset.c \ ft_putstr_fd.c \ ft_putendl_fd.c \ ft_putnbr_fd.c \ - \ - ft_lstnew.c \ - ft_lstadd_front.c \ - ft_lstsize.c \ - ft_lstlast.c \ - ft_lstadd_back.c \ - ft_lstdelone.c \ - ft_lstclear.c \ - ft_lstiter.c \ - ft_lstmap.c \ ODIR = ./builds OBJS = $(SRCS:%.c=$(ODIR)/%.o) @@ -120,34 +110,39 @@ ECHO = "\033[33mcompiling objetcs\033[0m" all: $(ODIR) $(NAME) $(ODIR): -# @echo "\033[33mcreate $(ODIR)\033[0m" + @printf "\033[35m\n" mkdir -p $(ODIR) + @printf "\033[0m\n" $(NAME): $(OBJS) $(DEPS) -# @echo "\033[33mbuilding $(NAME)\033[0m" + @printf "\033[33m\n" ar -rc $@ $(OBJS) - @ranlib $@ + ranlib $@ + @printf "\033[0m" bonus: $(OBJB) -# @echo "\033[33madding the bonus functions to $(NAME)\033[0m" + @printf "\033[33m\n" ar -rc $(NAME) $(OBJB) - @ranlib $(NAME) + ranlib $(NAME) + @printf "\033[0m" $(ODIR)/%.o: %.c + @printf "\033[36m" $(CC) $(CFLAGS) -c -o $@ $< -announce: - @echo $(ECHO) - clean: + @printf "\033[31m" /bin/rm -rf $(ODIR) + @printf "\033[0m" fclean: clean + @printf "\033[31m" /bin/rm -f $(NAME) + @printf "\033[0m" re: fclean all -.PHONY: echo echob bonus clean fclean re all +.PHONY: bonus clean fclean re all diff --git a/echo.txt b/echo.txt deleted file mode 100644 index e69de29..0000000 diff --git a/srcd/part2/ft_split.c b/srcd/part2/ft_split.c deleted file mode 100644 index 8f8dab5..0000000 --- a/srcd/part2/ft_split.c +++ /dev/null @@ -1,123 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_split.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:00:13 by hulamy #+# #+# */ -/* Updated: 2019/11/27 21:35:21 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** return an array of string with each word found in str, with c as separator -*/ - -/* -** #include -** -** size_t ft_strlen(const char *str) -** { -** size_t i; -** -** i = 0; -** while (str[i]) -** i++; -** return (i); -** } -** -** char *ft_substr(char const *s, unsigned int start, size_t len) -** { -** char *str; -** size_t i; -** -** if (!s) -** return (NULL); -** if (ft_strlen(s) < start) -** return (""); -** if (!(str = (char *)malloc(sizeof(char) * (len + 1)))) -** return (NULL); -** i = 0; -** while (i < len && s[start]) -** str[i++] = s[start++]; -** str[i] = '\0'; -** return (str); -** } -** -** char **ft_split(char const *s, char c); -** -** int main(int ac, char **av) -** //int main(void) -** { -** char **str; -** int i; -** -** char *s; -** char c; -** -** if (ac == 3) -** { -** i = 0; -** s = av[1]; -** // s = "lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse"; -** c = av[2][0]; -** // c = ' '; -** str = ft_split(s, c); -** while (str[i]) -** printf("%s\n", str[i++]); -** } -** return (0); -** } -*/ - -#include "libft.h" - -static int ft_count_word(char const *s, char c) -{ - int i; - int words; - - i = 0; - words = 0; - while (s[i]) - { - if (s[i] != c) - { - words++; - while (s[i] && s[i] != c) - i++; - } - else - i++; - } - return (words); -} - -char **ft_split(char const *s, char c) -{ - char **array; - int i; - int j; - int len; - - i = -1; - j = 0; - if (!s || !c) - return (NULL); - if (!(array = (char **)malloc(sizeof(char *) * (ft_count_word(s, c) + 1)))) - return (NULL); - while (s[++i]) - { - if (s[i] != c) - { - len = 0; - while (s[i + len] && s[i + len] != c) - len++; - array[j++] = ft_substr(s, i, len); - i = i + len - 1; - } - } - array[j] = 0; - return (array); -} diff --git a/srcd/add/ft_any.c b/srcs/add/ft_any.c similarity index 100% rename from srcd/add/ft_any.c rename to srcs/add/ft_any.c diff --git a/srcd/add/ft_arraymap.c b/srcs/add/ft_arraymap.c similarity index 100% rename from srcd/add/ft_arraymap.c rename to srcs/add/ft_arraymap.c diff --git a/srcd/add/ft_atoibase.c b/srcs/add/ft_atoibase.c similarity index 100% rename from srcd/add/ft_atoibase.c rename to srcs/add/ft_atoibase.c diff --git a/srcd/add/ft_convertbase.c b/srcs/add/ft_convertbase.c similarity index 100% rename from srcd/add/ft_convertbase.c rename to srcs/add/ft_convertbase.c diff --git a/srcd/add/ft_foreach.c b/srcs/add/ft_foreach.c similarity index 100% rename from srcd/add/ft_foreach.c rename to srcs/add/ft_foreach.c diff --git a/srcd/add/ft_issort.c b/srcs/add/ft_issort.c similarity index 100% rename from srcd/add/ft_issort.c rename to srcs/add/ft_issort.c diff --git a/srcd/add/ft_memalloc.c b/srcs/add/ft_memalloc.c similarity index 100% rename from srcd/add/ft_memalloc.c rename to srcs/add/ft_memalloc.c diff --git a/srcd/add/ft_memdel.c b/srcs/add/ft_memdel.c similarity index 100% rename from srcd/add/ft_memdel.c rename to srcs/add/ft_memdel.c diff --git a/srcd/add/ft_putchar.c b/srcs/add/ft_putchar.c similarity index 100% rename from srcd/add/ft_putchar.c rename to srcs/add/ft_putchar.c diff --git a/srcd/add/ft_putendl.c b/srcs/add/ft_putendl.c similarity index 100% rename from srcd/add/ft_putendl.c rename to srcs/add/ft_putendl.c diff --git a/srcd/add/ft_putnbr.c b/srcs/add/ft_putnbr.c similarity index 100% rename from srcd/add/ft_putnbr.c rename to srcs/add/ft_putnbr.c diff --git a/srcd/add/ft_putnbrbase.c b/srcs/add/ft_putnbrbase.c similarity index 100% rename from srcd/add/ft_putnbrbase.c rename to srcs/add/ft_putnbrbase.c diff --git a/srcd/add/ft_putnbrendl.c b/srcs/add/ft_putnbrendl.c similarity index 100% rename from srcd/add/ft_putnbrendl.c rename to srcs/add/ft_putnbrendl.c diff --git a/srcd/add/ft_putnbrendl_fd.c b/srcs/add/ft_putnbrendl_fd.c similarity index 100% rename from srcd/add/ft_putnbrendl_fd.c rename to srcs/add/ft_putnbrendl_fd.c diff --git a/srcd/add/ft_putstr.c b/srcs/add/ft_putstr.c similarity index 100% rename from srcd/add/ft_putstr.c rename to srcs/add/ft_putstr.c diff --git a/srcd/add/ft_strcat.c b/srcs/add/ft_strcat.c similarity index 100% rename from srcd/add/ft_strcat.c rename to srcs/add/ft_strcat.c diff --git a/srcd/add/ft_strclr.c b/srcs/add/ft_strclr.c similarity index 100% rename from srcd/add/ft_strclr.c rename to srcs/add/ft_strclr.c diff --git a/srcd/add/ft_strcmp.c b/srcs/add/ft_strcmp.c similarity index 100% rename from srcd/add/ft_strcmp.c rename to srcs/add/ft_strcmp.c diff --git a/srcd/add/ft_strcpy.c b/srcs/add/ft_strcpy.c similarity index 100% rename from srcd/add/ft_strcpy.c rename to srcs/add/ft_strcpy.c diff --git a/srcd/add/ft_strdel.c b/srcs/add/ft_strdel.c similarity index 100% rename from srcd/add/ft_strdel.c rename to srcs/add/ft_strdel.c diff --git a/srcd/add/ft_strequ.c b/srcs/add/ft_strequ.c similarity index 100% rename from srcd/add/ft_strequ.c rename to srcs/add/ft_strequ.c diff --git a/srcd/add/ft_striter.c b/srcs/add/ft_striter.c similarity index 100% rename from srcd/add/ft_striter.c rename to srcs/add/ft_striter.c diff --git a/srcd/add/ft_striteri.c b/srcs/add/ft_striteri.c similarity index 100% rename from srcd/add/ft_striteri.c rename to srcs/add/ft_striteri.c diff --git a/srcd/add/ft_strjoinfree.c b/srcs/add/ft_strjoinfree.c similarity index 100% rename from srcd/add/ft_strjoinfree.c rename to srcs/add/ft_strjoinfree.c diff --git a/srcd/add/ft_strmap.c b/srcs/add/ft_strmap.c similarity index 100% rename from srcd/add/ft_strmap.c rename to srcs/add/ft_strmap.c diff --git a/srcd/add/ft_strmultisplit.c b/srcs/add/ft_strmultisplit.c similarity index 100% rename from srcd/add/ft_strmultisplit.c rename to srcs/add/ft_strmultisplit.c diff --git a/srcd/add/ft_strncat.c b/srcs/add/ft_strncat.c similarity index 100% rename from srcd/add/ft_strncat.c rename to srcs/add/ft_strncat.c diff --git a/srcd/add/ft_strncpy.c b/srcs/add/ft_strncpy.c similarity index 100% rename from srcd/add/ft_strncpy.c rename to srcs/add/ft_strncpy.c diff --git a/srcd/add/ft_strnequ.c b/srcs/add/ft_strnequ.c similarity index 100% rename from srcd/add/ft_strnequ.c rename to srcs/add/ft_strnequ.c diff --git a/srcd/add/ft_strnew.c b/srcs/add/ft_strnew.c similarity index 100% rename from srcd/add/ft_strnew.c rename to srcs/add/ft_strnew.c diff --git a/srcd/add/ft_strstr.c b/srcs/add/ft_strstr.c similarity index 100% rename from srcd/add/ft_strstr.c rename to srcs/add/ft_strstr.c diff --git a/srcd/bonus/ft_lstadd_back.c b/srcs/bonus/ft_lstadd_back.c similarity index 100% rename from srcd/bonus/ft_lstadd_back.c rename to srcs/bonus/ft_lstadd_back.c diff --git a/srcd/bonus/ft_lstadd_front.c b/srcs/bonus/ft_lstadd_front.c similarity index 100% rename from srcd/bonus/ft_lstadd_front.c rename to srcs/bonus/ft_lstadd_front.c diff --git a/srcd/bonus/ft_lstclear.c b/srcs/bonus/ft_lstclear.c similarity index 100% rename from srcd/bonus/ft_lstclear.c rename to srcs/bonus/ft_lstclear.c diff --git a/srcd/bonus/ft_lstdelone.c b/srcs/bonus/ft_lstdelone.c similarity index 100% rename from srcd/bonus/ft_lstdelone.c rename to srcs/bonus/ft_lstdelone.c diff --git a/srcd/bonus/ft_lstiter.c b/srcs/bonus/ft_lstiter.c similarity index 97% rename from srcd/bonus/ft_lstiter.c rename to srcs/bonus/ft_lstiter.c index 4874552..ee67de6 100644 --- a/srcd/bonus/ft_lstiter.c +++ b/srcs/bonus/ft_lstiter.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:14:11 by hulamy #+# #+# */ -/* Updated: 2019/11/29 16:27:05 by hulamy ### ########.fr */ +/* Updated: 2019/12/01 16:03:40 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -76,7 +76,7 @@ void ft_lstiter(t_list *lst, void (*f)(void *)) { if (!f) - return; + return ; while (lst) { f(lst->content); diff --git a/srcd/bonus/ft_lstlast.c b/srcs/bonus/ft_lstlast.c similarity index 100% rename from srcd/bonus/ft_lstlast.c rename to srcs/bonus/ft_lstlast.c diff --git a/srcd/bonus/ft_lstmap.c b/srcs/bonus/ft_lstmap.c similarity index 95% rename from srcd/bonus/ft_lstmap.c rename to srcs/bonus/ft_lstmap.c index 942efd4..41e7a25 100644 --- a/srcd/bonus/ft_lstmap.c +++ b/srcs/bonus/ft_lstmap.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:15:42 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:34:19 by hulamy ### ########.fr */ +/* Updated: 2019/12/01 16:02:13 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -121,7 +121,9 @@ t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)) t_list *new; t_list *tmp; - if(!(tmp = ft_lstnew(f(lst->content)))) + if (!lst) + return (NULL); + if (!(tmp = ft_lstnew(f(lst->content)))) { del(tmp->content); free(tmp); @@ -131,7 +133,7 @@ t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)) while (lst->next) { lst = lst->next; - if(!(tmp->next = ft_lstnew(f(lst->content)))) + if (!(tmp->next = ft_lstnew(f(lst->content)))) { del(tmp->next->content); free(tmp->next); diff --git a/srcd/bonus/ft_lstnew.c b/srcs/bonus/ft_lstnew.c similarity index 100% rename from srcd/bonus/ft_lstnew.c rename to srcs/bonus/ft_lstnew.c diff --git a/srcd/bonus/ft_lstsize.c b/srcs/bonus/ft_lstsize.c similarity index 100% rename from srcd/bonus/ft_lstsize.c rename to srcs/bonus/ft_lstsize.c diff --git a/srcs/ft_any.c b/srcs/ft_any.c deleted file mode 100644 index 349e3a9..0000000 --- a/srcs/ft_any.c +++ /dev/null @@ -1,26 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_any.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/16 15:14:49 by hulamy #+# #+# */ -/* Updated: 2018/11/16 15:14:53 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_any(char **tab, int (*f)(char*)) -{ - int i; - - i = -1; - if (!tab) - return (0); - while (tab[++i]) - if (f(tab[i]) == 1) - return (1); - return (0); -} diff --git a/srcs/ft_arraymap.c b/srcs/ft_arraymap.c deleted file mode 100644 index 267510a..0000000 --- a/srcs/ft_arraymap.c +++ /dev/null @@ -1,28 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_arraymap.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/16 15:17:24 by hulamy #+# #+# */ -/* Updated: 2018/11/16 15:17:27 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int *ft_arraymap(int *tab, int length, int (*f)(int)) -{ - int i; - int *newtab; - - i = -1; - if (!tab) - return (NULL); - if (!(newtab = (int*)malloc(sizeof(*newtab) * (length + 1)))) - return (NULL); - while (++i < length) - newtab[i] = (*f)(tab[i]); - return (newtab); -} diff --git a/srcs/ft_atoi.c b/srcs/ft_atoi.c deleted file mode 100644 index 74da199..0000000 --- a/srcs/ft_atoi.c +++ /dev/null @@ -1,39 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_atoi.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:54:29 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:54:35 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_atoi(const char *str) -{ - long long nbr; - int i; - int n; - - i = 0; - n = 1; - nbr = 0; - while ((str[i] == 32) || (str[i] > 8 && str[i] < 14)) - i++; - if (str[i] == '-') - n = -1; - if (str[i] == '+' || str[i] == '-') - i++; - while (str[i] >= '0' && str[i] <= '9') - { - if ((nbr >= 922337203685477580 - && ((str[i] > 8 && n < 0) || (str[i] > 7 && n > 0)))) - return ((n > 0) ? -1 : 0); - else - nbr = nbr * 10 + (str[i++] - '0'); - } - return (nbr * n); -} diff --git a/srcs/ft_atoibase.c b/srcs/ft_atoibase.c deleted file mode 100644 index fdb92d1..0000000 --- a/srcs/ft_atoibase.c +++ /dev/null @@ -1,75 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_atoibase.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/16 15:15:31 by hulamy #+# #+# */ -/* Updated: 2018/11/16 15:22:34 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -static int is_valid_base(char *base, int i, int j) -{ - while (base[i]) - { - j = i + 1; - while (base[j]) - { - if (base[i] == base[j]) - return (0); - j++; - } - if (base[i] == '-' || base[i] == '+') - return (0); - i++; - } - if (i >= 2) - return (1); - return (0); -} - -static int skip(int i, char *str, int *n) -{ - while ((str[i] == 32) || (str[i] > 8 && str[i] < 14)) - i++; - if (str[i] == '+' || str[i] == '-') - { - if (str[i] == '-') - *n = -1; - i++; - } - return (i); -} - -int ft_atoibase(char *str, char *base) -{ - int i; - int j; - int length; - int res; - int n; - - length = 0; - res = 0; - n = 1; - if (!is_valid_base(base, 0, 0)) - return (0); - while (base[length]) - length++; - i = skip(0, str, &n); - while (str[i] && str[i] > 32 && str[i] != '-' && str[i] != '+') - { - j = 0; - while (str[i] != base[j] && base[j]) - j++; - if (base[j] == '\0') - return (0); - res = (res * length) + j; - i++; - } - return (res * n); -} diff --git a/srcs/ft_bzero.c b/srcs/ft_bzero.c deleted file mode 100644 index f66336a..0000000 --- a/srcs/ft_bzero.c +++ /dev/null @@ -1,27 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_bzero.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:54:43 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:54:44 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_bzero(void *s, size_t n) -{ - size_t i; - unsigned char *ptr; - - if (n) - { - ptr = (unsigned char *)s; - i = 0; - while (i < n) - ptr[i++] = '\0'; - } -} diff --git a/srcs/ft_calloc.c b/srcs/ft_calloc.c deleted file mode 100644 index 4848191..0000000 --- a/srcs/ft_calloc.c +++ /dev/null @@ -1,21 +0,0 @@ -/* -** exemple allocation for 5 integers with malloc then calloc : -** a = (int *)malloc(5 * sizeof(int)); //5*4bytes = 20 bytes -** free(a); -** a = (int *)calloc(5, sizeof(int)); -** -** allocate count * size byte of memory and -** return a pointer to the allocated memory -*/ - -#include "libft.h" - -void *ft_calloc(size_t count, size_t size) -{ - void *tmp; - - if (!(tmp = malloc(count * size))) - return (NULL); - ft_bzero(tmp, count * size); - return (tmp); -} diff --git a/srcs/ft_convertbase.c b/srcs/ft_convertbase.c deleted file mode 100644 index 7fe9bad..0000000 --- a/srcs/ft_convertbase.c +++ /dev/null @@ -1,86 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_convertbase.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/16 15:15:55 by hulamy #+# #+# */ -/* Updated: 2019/04/17 17:09:35 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -static int ft_malloc_size(int decimal, int length, int i) -{ - if (decimal <= 0) - i++; - while (decimal) - { - decimal /= length; - i++; - } - return (i); -} - -static char *ft_decimal_to_base(int decimal, char *base, char *res, int size) -{ - long nb; - int i; - - nb = decimal; - i = 0; - while (base[i]) - i++; - if (nb < 0) - nb = -nb; - while (--size >= 0) - { - res[size] = base[nb % i]; - nb /= i; - } - return (res); -} - -static int ft_base_to_decimal(char *nbr, char *base, int length, int i) -{ - long decimal; - int j; - - decimal = 0; - if (nbr[i] == '-') - i++; - while (nbr[i]) - { - j = 0; - while (nbr[i] != base[j] && base[j]) - j++; - decimal = (decimal * length) + j; - i++; - } - if (nbr[0] == '-') - decimal = -decimal; - return (decimal); -} - -char *ft_convertbase(char *nbr, char *base_from, char *base_to) -{ - int length; - int size; - int decimal; - char *res; - - res = 0; - length = 0; - while (base_from[length]) - length++; - decimal = ft_base_to_decimal(nbr, base_from, length, 0); - length = 0; - while (base_to[length]) - length++; - size = ft_malloc_size(decimal, length, 0); - res = (char *)malloc(sizeof(char) * (size + 1)); - res[size] = '\0'; - return (ft_decimal_to_base(decimal, base_to, res, size)); -} diff --git a/srcs/ft_foreach.c b/srcs/ft_foreach.c deleted file mode 100644 index aaf7649..0000000 --- a/srcs/ft_foreach.c +++ /dev/null @@ -1,22 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_foreach.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/16 15:16:10 by hulamy #+# #+# */ -/* Updated: 2018/11/16 15:16:11 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_foreach(int *tab, int length, void (*f)(int)) -{ - int i; - - i = 0; - while (i < length && tab && tab[i]) - (*f)(tab[i++]); -} diff --git a/srcs/ft_isalnum.c b/srcs/ft_isalnum.c deleted file mode 100644 index dc1bb03..0000000 --- a/srcs/ft_isalnum.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_isalnum.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:55:05 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:55:06 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_isalnum(int c) -{ - return (ft_isalpha(c) || ft_isdigit(c)); -} diff --git a/srcs/ft_isalpha.c b/srcs/ft_isalpha.c deleted file mode 100644 index e0ec883..0000000 --- a/srcs/ft_isalpha.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_isalpha.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:55:15 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:55:17 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_isalpha(int c) -{ - return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')); -} diff --git a/srcs/ft_isascii.c b/srcs/ft_isascii.c deleted file mode 100644 index f201880..0000000 --- a/srcs/ft_isascii.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_isascii.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:55:24 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:55:25 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_isascii(int c) -{ - return (c >= 0 && c <= 127); -} diff --git a/srcs/ft_isdigit.c b/srcs/ft_isdigit.c deleted file mode 100644 index 69e0809..0000000 --- a/srcs/ft_isdigit.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_isdigit.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:55:32 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:55:33 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_isdigit(int c) -{ - return (c >= '0' && c <= '9'); -} diff --git a/srcs/ft_isprint.c b/srcs/ft_isprint.c deleted file mode 100644 index 21395ab..0000000 --- a/srcs/ft_isprint.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_isprint.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:55:43 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:55:44 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_isprint(int c) -{ - return (c >= 32 && c < 127); -} diff --git a/srcs/ft_issort.c b/srcs/ft_issort.c deleted file mode 100644 index 842195b..0000000 --- a/srcs/ft_issort.c +++ /dev/null @@ -1,26 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_issort.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/16 15:18:14 by hulamy #+# #+# */ -/* Updated: 2018/11/16 15:18:15 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_issort(int *tab, int length, int (*f)(int, int)) -{ - int i; - - i = -1; - if (!tab) - return (0); - while (++i < length - 1) - if (f(tab[i], tab[i + 1]) > 0) - return (0); - return (1); -} diff --git a/srcs/ft_itoa.c b/srcs/ft_itoa.c deleted file mode 100644 index af0406b..0000000 --- a/srcs/ft_itoa.c +++ /dev/null @@ -1,55 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_itoa.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:59:01 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:21:01 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** take an integer and give a string -*/ - -/* -** #include -** -** char *ft_itoa(int n) -** -** int main(int ac, char **av) -** { -** if (ac == 2) -** { -** printf("%s\n",ft_itoa(atoi(av[1]))); -** } -** return 0; -** } -*/ - -#include "libft.h" - -char *ft_itoa(int n) -{ - char *str; - int len; - long int nbis; - - len = (n < 0) ? 2 : 1; - nbis = n; - while (nbis /= 10) - len++; - nbis = n; - nbis *= (nbis < 0) ? -1 : 1; - if (!(str = (char *)malloc(sizeof(char) * (len + 1)))) - return (NULL); - str[len] = '\0'; - str[--len] = nbis % 10 + '0'; - while (nbis /= 10) - str[--len] = nbis % 10 + '0'; - if (n < 0) - str[0] = '-'; - return (str); -} diff --git a/srcs/ft_lstadd_back.c b/srcs/ft_lstadd_back.c deleted file mode 100644 index 37084d1..0000000 --- a/srcs/ft_lstadd_back.c +++ /dev/null @@ -1,91 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_lstadd_back.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:11:53 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:36:12 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** add an element to the end of a list -** or first if list has no element so far -*/ - -/* -** #include -** -** typedef struct s_list -** { -** void *content; -** struct s_list *next; -** } t_list; -** -** t_list *ft_lstnew(void *content) -** { -** t_list *lst; -** -** if (!(lst = (t_list *)malloc(sizeof(*lst)))) -** return (NULL); -** if (!content) -** lst->content = NULL; -** else -** lst->content = content; -** lst->next = NULL; -** return (lst); -** } -** -** void ft_lstadd_back(t_list **alst, t_list *new); -** -** int main(void) -** { -** char tresor; -** char matos; -** char friends; -** t_list *toto; -** t_list *tmp; -** -** tresor = 'a'; -** matos = 'b'; -** friends = 'c'; -** toto = ft_lstnew(&tresor); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** tmp = ft_lstnew(&matos); -** ft_lstadd_back(&toto, tmp); -** printf("----------------------\n"); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** tmp = ft_lstnew(&friends); -** ft_lstadd_back(&toto, tmp); -** printf("----------------------\n"); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content)); -** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next)); -** return (0); -** } -*/ - -#include "libft.h" - -void ft_lstadd_back(t_list **alst, t_list *new) -{ - t_list *tmp; - - if (alst) - { - tmp = *alst; - if (!tmp) - *alst = new; - else - { - while (tmp->next) - tmp = tmp->next; - tmp->next = new; - } - new->next = NULL; - } -} diff --git a/srcs/ft_lstadd_front.c b/srcs/ft_lstadd_front.c deleted file mode 100644 index 3f90569..0000000 --- a/srcs/ft_lstadd_front.c +++ /dev/null @@ -1,94 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_lstadd_front.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:12:02 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:36:54 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** add an element to the begining of a list -*/ - -/* -** #include -** -** typedef struct s_list -** { -** void *content; -** struct s_list *next; -** } t_list; -** -** void *ft_memcpy(void *dst, const void *src, size_t n) -** { -** size_t i; -** char *ptr; -** char *ptr2; -** -** ptr = (char *)dst; -** ptr2 = (char *)src; -** i = -1; -** while (++i < n) -** ptr[i] = ptr2[i]; -** return (dst); -** } -** -** t_list *ft_lstnew(void *content) -** { -** t_list *lst; -** -** if (!(lst = (t_list *)malloc(sizeof(*lst)))) -** return (NULL); -** if (!content) -** lst->content = NULL; -** else -** { -** if (!(lst->content = malloc(sizeof(content)))) -** return (NULL); -** ft_memcpy(lst->content, content, sizeof(content)); -** } -** lst->next = NULL; -** return (lst); -** } -** -** void ft_lstadd_front(t_list **alst, t_list *new); -** -** int main(void) -** { -** char tresor; -** char matos; -** char friends; -** t_list *toto; -** t_list *tmp; -** -** tresor = 'a'; -** matos = 'b'; -** friends = 'c'; -** toto = ft_lstnew(&tresor); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** tmp = ft_lstnew(&matos); -** ft_lstadd_front(&toto, tmp); -** printf("----------------------\n"); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** tmp = ft_lstnew(&friends); -** ft_lstadd_front(&toto, tmp); -** printf("----------------------\n"); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->dqta:%c\n",*(char*)(toto->next->next->content)); -** return (0); -** } -*/ - -#include "libft.h" - -void ft_lstadd_front(t_list **alst, t_list *new) -{ - new->next = *alst; - *alst = new; -} diff --git a/srcs/ft_lstclear.c b/srcs/ft_lstclear.c deleted file mode 100644 index d151381..0000000 --- a/srcs/ft_lstclear.c +++ /dev/null @@ -1,95 +0,0 @@ -/* -** delete and free an element of the list and all the followings -*/ - -/* -** #include -** -** typedef struct s_list -** { -** void *content; -** struct s_list *next; -** } t_list; -** -** t_list *ft_lstnew(void *content) -** { -** t_list *lst; -** -** if (!(lst = (t_list *)malloc(sizeof(*lst)))) -** return (NULL); -** if (!content) -** lst->content = NULL; -** else -** lst->content = content; -** lst->next = NULL; -** return (lst); -** } -** -** void ft_lstadd_back(t_list **alst, t_list *new) -** { -** t_list *tmp; -** -** if (alst) -** { -** tmp = *alst; -** if (!tmp) -** *alst = new; -** else -** { -** while (tmp->next) -** tmp = tmp->next; -** tmp->next = new; -** } -** new->next = NULL; -** } -** } -** -** void ft_delete(void *element) -** { -** *(char*)element = '\0'; -** } -** -** void ft_lstdelone(t_list *lst, void (*del)(void *)) -** { -** del(lst->content); -** free(lst); -** lst = NULL; -** } -** -** void ft_lstclear(t_list **lst, void (*del)(void *)); -** -** int main(void) -** { -** t_list *toto; -** void (ft_delete)(void*); -** -** printf("sizeof(t_list)%lu\n",sizeof(t_list)); -** toto = ft_lstnew("a"); -** toto->next = ft_lstnew("b"); -** toto->next->next = ft_lstnew("c"); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content)); -** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next)); -** ft_lstclear(&(toto->next), ft_delete); -** printf("----------------------\n"); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt :%s\n",(char*)(toto->next->next)); -** return (0); -** } -*/ - -#include "libft.h" - -void ft_lstclear(t_list **lst, void (*del)(void *)) -{ - t_list *next; - - while (*lst != NULL) - { - next = (*lst)->next; - ft_lstdelone(*lst, del); - *lst = next; - } -} diff --git a/srcs/ft_lstdelone.c b/srcs/ft_lstdelone.c deleted file mode 100644 index 9ce8910..0000000 --- a/srcs/ft_lstdelone.c +++ /dev/null @@ -1,96 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_lstdelone.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:14:03 by hulamy #+# #+# */ -/* Updated: 2019/11/28 16:56:40 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** free an element and delete its content with del -** next is not free -*/ - -/* -** #include -** -** typedef struct s_list -** { -** void *content; -** struct s_list *next; -** } t_list; -** -** t_list *ft_lstnew(void *content) -** { -** t_list *lst; -** -** if (!(lst = (t_list *)malloc(sizeof(*lst)))) -** return (NULL); -** if (!content) -** lst->content = NULL; -** else -** lst->content = content; -** lst->next = NULL; -** return (lst); -** } -** -** void ft_lstadd_back(t_list **alst, t_list *new) -** { -** t_list *tmp; -** -** if (alst) -** { -** tmp = *alst; -** if (!tmp) -** *alst = new; -** else -** { -** while (tmp->next) -** tmp = tmp->next; -** tmp->next = new; -** } -** new->next = NULL; -** } -** } -** -** void ft_delete(void *element) -** { -** *(char*)element = '\0'; -** } -** -** void ft_lstdelone(t_list *lst, void (*del)(void *)); -** -** int main(void) -** { -** t_list *toto; -** void (ft_delete)(void*); -** -** toto = ft_lstnew("a"); -** toto->next = ft_lstnew("b"); -** toto->next->next = ft_lstnew("c"); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content)); -** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next)); -** ft_lstdelone(toto->next, ft_delete); -** printf("----------------------\n"); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content)); -** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next)); -** return (0); -** } -*/ - -#include "libft.h" - -void ft_lstdelone(t_list *lst, void (*del)(void *)) -{ - del(lst->content); - free(lst); - lst = NULL; -} diff --git a/srcs/ft_lstiter.c b/srcs/ft_lstiter.c deleted file mode 100644 index c380e2f..0000000 --- a/srcs/ft_lstiter.c +++ /dev/null @@ -1,85 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_lstiter.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:14:11 by hulamy #+# #+# */ -/* Updated: 2019/11/29 16:23:54 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** go through all elements of the list and apply the function f to each of them -*/ - -/* -** #include -** -** typedef struct s_list -** { -** void *content; -** struct s_list *next; -** } t_list; -** -** t_list *ft_lstnew(void *content) -** { -** t_list *lst; -** -** if (!(lst = (t_list *)malloc(sizeof(*lst)))) -** return (NULL); -** if (!content) -** lst->content = NULL; -** else -** lst->content = content; -** lst->next = NULL; -** return (lst); -** } -** -** void ft_lstiter(t_list *lst, void (*f)(void*)); -** -** void to_uppercase(void *element) -** { -** // *(char*)(((t_list*)element)->content) -= 32; -** // or : -** t_list *tmp; -** -** tmp = (t_list*)element; -** *(char*)(tmp->content) -= 32; -** } -** -** int main(void) -** { -** t_list *toto; -** void to_uppercase(void*); -** -** toto = ft_lstnew("a"); -** toto->next = ft_lstnew("b"); -** toto->next->next = ft_lstnew("c"); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content)); -** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next)); -** printf("---------------------------\n"); -** ft_lstiter(toto, to_uppercase); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content)); -** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next)); -** return (0); -** } -*/ - -#include "libft.h" - -void ft_lstiter(t_list *lst, void (*f)(void *)) -{ - if (!f) - return; - while (lst) - { - f(lst->content); - lst = lst->next; - } -} diff --git a/srcs/ft_lstlast.c b/srcs/ft_lstlast.c deleted file mode 100644 index b562025..0000000 --- a/srcs/ft_lstlast.c +++ /dev/null @@ -1,100 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_lstlast.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:14:49 by hulamy #+# #+# */ -/* Updated: 2019/11/28 16:42:21 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** return a pointer to the last element of a list -*/ - -/* -** #include -** -** typedef struct s_list -** { -** void *content; -** struct s_list *next; -** } t_list; -** -** void *ft_memcpy(void *dst, const void *src, size_t n) -** { -** size_t i; -** char *ptr; -** char *ptr2; -** -** ptr = (char *)dst; -** ptr2 = (char *)src; -** i = -1; -** while (++i < n) -** ptr[i] = ptr2[i]; -** return (dst); -** } -** -** t_list *ft_lstnew(void *content) -** { -** t_list *lst; -** -** if (!(lst = (t_list *)malloc(sizeof(*lst)))) -** return (NULL); -** if (!content) -** lst->content = NULL; -** else -** { -** if (!(lst->content = malloc(sizeof(content)))) -** return (NULL); -** ft_memcpy(lst->content, content, sizeof(content)); -** } -** lst->next = NULL; -** return (lst); -** } -** -** void ft_lstadd_front(t_list **alst, t_list *new) -** { -** new->next = *alst; -** *alst = new; -** } -** -** t_list *ft_lstlast(t_list *lst); -** -** int main(void) -** { -** char tresor; -** t_list *toto; -** t_list *tmp; -** -** tresor = 'a'; -** toto = ft_lstnew(&tresor); -** tresor = 'b'; -** tmp = ft_lstnew(&tresor); -** ft_lstadd_front(&toto, tmp); -** tresor = 'c'; -** tmp = ft_lstnew(&tresor); -** ft_lstadd_front(&toto, tmp); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content)); -** tmp = ft_lstlast(toto); -** printf("%c\n",*(char*)(tmp->content)); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content)); -** return (0); -** } -*/ - -#include "libft.h" - -t_list *ft_lstlast(t_list *lst) -{ - if (lst) - while (lst->next) - lst = lst->next; - return (lst); -} diff --git a/srcs/ft_lstmap.c b/srcs/ft_lstmap.c deleted file mode 100644 index af76d5c..0000000 --- a/srcs/ft_lstmap.c +++ /dev/null @@ -1,131 +0,0 @@ -/* -** iterate trhough linked list and apply to each element a function f -** if necessary the function del is used to delete an element -*/ - -/* -** #include -** #include -** #include -** -** typedef struct s_list -** { -** void *content; -** struct s_list *next; -** } t_list; -** -** t_list *ft_lstnew(void *content) -** { -** t_list *lst; -** -** if (!(lst = (t_list *)malloc(sizeof(*lst)))) -** return (NULL); -** if (!content) -** lst->content = NULL; -** else -** lst->content = content; -** lst->next = NULL; -** return (lst); -** } -** -** void ft_lstadd_back(t_list **alst, t_list *new) -** { -** t_list *tmp; -** -** if (alst) -** { -** tmp = *alst; -** if (!tmp) -** *alst = new; -** else -** { -** while (tmp->next) -** tmp = tmp->next; -** tmp->next = new; -** } -** new->next = NULL; -** } -** } -** -** char *ft_strdup(const char *src) -** { -** int i; -** char *str; -** -** i = 0; -** while (src[i] != '\0') -** i++; -** if (!(str = (char*)malloc(sizeof(*str) * (i + 1)))) -** return (NULL); -** while (i-- >= 0) -** str[i + 1] = src[i + 1]; -** return (str); -** } -** -** void *to_uppercase(void *element) -** { -** char *i; -** -** if (!(i = ft_strdup((char*)element))) -** return (NULL); -** *i -= 32; -** return ((void *)i); -** } -** -** void ft_delete(void *element) -** { -** *(char*)element = '\0'; -** } -** -** t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)); -** -** int main(void) -** { -** t_list *toto; -** void *(to_uppercase)(void *); -** void (ft_delete)(void*); -** -** toto = ft_lstnew("aa"); -** toto->next = ft_lstnew("b"); -** toto->next->next = ft_lstnew("c"); -** printf("toto->data :%s\n",(char*)(toto->content)); -** printf("toto->nxt->data :%s\n",(char*)(toto->next->content)); -** printf("toto->nxt->nxt->data:%s\n",(char*)(toto->next->next->content)); -** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next)); -** toto = ft_lstmap(toto, to_uppercase, ft_delete); -** printf("----------------------\n"); -** printf("toto->data :%s\n",(char*)(toto->content)); -** printf("toto->nxt->data :%s\n",(char*)(toto->next->content)); -** printf("toto->nxt->nxt->data:%s\n",(char*)(toto->next->next->content)); -** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next)); -** return (0); -** } -*/ - -#include "libft.h" - -t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)) -{ - t_list *new; - t_list *tmp; - - if(!(tmp = ft_lstnew(f(lst->content)))) - { - del(tmp->content); - free(tmp); - return (NULL); - } - new = tmp; - while (lst->next) - { - lst = lst->next; - if(!(tmp->next = ft_lstnew(f(lst->content)))) - { - del(tmp->next->content); - free(tmp->next); - return (NULL); - } - tmp = tmp->next; - } - return (new); -} diff --git a/srcs/ft_lstnew.c b/srcs/ft_lstnew.c deleted file mode 100644 index 401f6c9..0000000 --- a/srcs/ft_lstnew.c +++ /dev/null @@ -1,59 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_lstnew.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:16:20 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:29:46 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** create a new list -*/ - -/* -** #include -** -** typedef struct s_list -** { -** void *content; -** struct s_list *next; -** } t_list; -** -** t_list *ft_lstnew(void *content); -** -** int main(void) -** { -** char tresor; -** t_list *toto; -** -** tresor = 'd'; -** printf("tresor : %c\n",tresor); -** toto = ft_lstnew(&tresor); -** //toto->content was alocated as void* so it need cast -** printf("toto->content : %c\n",*(char*)(toto->content)); -** tresor = 'D'; -** printf("transform tresor : %c\n",tresor); -** printf("and also toto->content: %c\n",*(char*)(toto->content)); -** return (0); -** } -*/ - -#include "libft.h" - -t_list *ft_lstnew(void *content) -{ - t_list *lst; - - if (!(lst = (t_list *)malloc(sizeof(*lst)))) - return (NULL); - if (!content) - lst->content = NULL; - else - lst->content = content; - lst->next = NULL; - return (lst); -} diff --git a/srcs/ft_lstsize.c b/srcs/ft_lstsize.c deleted file mode 100644 index 5ff5f2d..0000000 --- a/srcs/ft_lstsize.c +++ /dev/null @@ -1,86 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_lstsize.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:31:48 by hulamy #+# #+# */ -/* Updated: 2019/11/25 16:06:41 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** return the size of the linked list -*/ - -/* -** #include -** -** typedef struct s_list -** { -** void *content; -** struct s_list *next; -** } t_list; -** -** t_list *ft_lstnew(void *content) -** { -** t_list *lst; -** -** if (!(lst = (t_list *)malloc(sizeof(*lst)))) -** return (NULL); -** if (!content) -** lst->content = NULL; -** else -** lst->content = content; -** lst->next = NULL; -** return (lst); -** } -** -** void ft_lstadd_front(t_list **alst, t_list *new) -** { -** new->next = *alst; -** *alst = new; -** } -** -** int ft_lstsize(t_list *lst); -** -** int main(void) -** { -** char tresor; -** t_list *toto; -** t_list *tmp; -** -** tresor = 'a'; -** toto = ft_lstnew(&tresor); -** tresor = 'b'; -** tmp = ft_lstnew(&tresor); -** ft_lstadd_front(&toto, tmp); -** tresor = 'c'; -** tmp = ft_lstnew(&tresor); -** ft_lstadd_front(&toto, tmp); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->dqta:%c\n",*(char*)(toto->next->next->content)); -** printf("%i\n",ft_lstsize(toto)); -** printf("toto->data :%c\n",*(char*)(toto->content)); -** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); -** printf("toto->nxt->nxt->dqta:%c\n",*(char*)(toto->next->next->content)); -** return (0); -** } -*/ - -#include "libft.h" - -int ft_lstsize(t_list *lst) -{ - int size; - - size = 0; - while (lst) - { - size++; - lst = lst->next; - } - return (size); -} diff --git a/srcs/ft_memalloc.c b/srcs/ft_memalloc.c deleted file mode 100644 index 072e7f1..0000000 --- a/srcs/ft_memalloc.c +++ /dev/null @@ -1,27 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_memalloc.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/19 15:21:44 by hulamy #+# #+# */ -/* Updated: 2019/11/19 15:23:17 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** allocate size byte of memory and return a pointer to the allocated memory -*/ - -#include "libft.h" - -void *ft_memalloc(size_t size) -{ - void *tmp; - - if (!size || !(tmp = malloc(size))) - return (NULL); - ft_bzero(tmp, size); - return (tmp); -} diff --git a/srcs/ft_memccpy.c b/srcs/ft_memccpy.c deleted file mode 100644 index fee3c2f..0000000 --- a/srcs/ft_memccpy.c +++ /dev/null @@ -1,36 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_memccpy.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 15:24:51 by hulamy #+# #+# */ -/* Updated: 2019/11/25 15:25:09 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** copy string until character is found and place cursor in dst -** after last byte copied -*/ - -#include "libft.h" - -void *ft_memccpy(void *dst, const void *src, int c, size_t n) -{ - unsigned char *dest; - unsigned char *sourc; - size_t i; - - i = -1; - dest = (unsigned char *)dst; - sourc = (unsigned char *)src; - while (++i < n) - { - dest[i] = sourc[i]; - if (sourc[i] == (unsigned char)c) - return (dst + i + 1); - } - return (NULL); -} diff --git a/srcs/ft_memchr.c b/srcs/ft_memchr.c deleted file mode 100644 index ab61ff4..0000000 --- a/srcs/ft_memchr.c +++ /dev/null @@ -1,30 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_memchr.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:55:51 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:55:54 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** locate character in string and return its position -*/ - -#include "libft.h" - -void *ft_memchr(const void *s, int c, size_t n) -{ - unsigned char *sbis; - size_t i; - - sbis = (unsigned char *)s; - i = -1; - while (++i < n) - if (sbis[i] == (unsigned char)c) - return ((void *)sbis + i); - return (NULL); -} diff --git a/srcs/ft_memcmp.c b/srcs/ft_memcmp.c deleted file mode 100644 index c05a028..0000000 --- a/srcs/ft_memcmp.c +++ /dev/null @@ -1,32 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_memcmp.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:56:05 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:56:07 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** compare two bytes strings (doesnt recognize a null terminated string) -** and return value of difference between first two different character -*/ - -#include "libft.h" - -int ft_memcmp(const void *s1, const void *s2, size_t n) -{ - unsigned char *frst; - unsigned char *scnd; - size_t i; - - i = 0; - frst = (unsigned char *)s1; - scnd = (unsigned char *)s2; - while (i < n && frst[i] == scnd[i]) - i++; - return ((i == n) ? 0 : frst[i] - scnd[i]); -} diff --git a/srcs/ft_memcpy.c b/srcs/ft_memcpy.c deleted file mode 100644 index b1cea09..0000000 --- a/srcs/ft_memcpy.c +++ /dev/null @@ -1,52 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_memcpy.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:56:16 by hulamy #+# #+# */ -/* Updated: 2019/11/28 15:08:38 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** copy n characters from src to dst and return dst -*/ - -/* -** #include -** -** void *ft_memcpy(void *dst, const void *src, size_t n); -** -** int main(int ac, char **av) -** { -** if (ac == 4) -** { -** printf("%s\n", ft_memcpy(av[1], av[2], atoi(av[3]))); -** } -** else -** { -** printf("%s\n", ft_memcpy("troubadour", "bravo", 4)); -** } -** return (0); -** } -*/ - -#include "libft.h" - -void *ft_memcpy(void *dst, const void *src, size_t n) -{ - int i; - char *ptr; - char *ptr2; - - i = -1; - ptr = (char *)dst; - ptr2 = (char *)src; - if (dst == src) - return (dst); - while (++i < (int)n) - ptr[i] = ptr2[i]; - return (dst); -} diff --git a/srcs/ft_memdel.c b/srcs/ft_memdel.c deleted file mode 100644 index f057043..0000000 --- a/srcs/ft_memdel.c +++ /dev/null @@ -1,26 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_memdel.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:13:26 by hulamy #+# #+# */ -/* Updated: 2019/04/03 15:44:12 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** free memory -*/ - -#include "libft.h" - -void ft_memdel(void **ap) -{ - if (ap && *ap) - { - free(*ap); - *ap = 0; - } -} diff --git a/srcs/ft_memmove.c b/srcs/ft_memmove.c deleted file mode 100644 index 3ac3db6..0000000 --- a/srcs/ft_memmove.c +++ /dev/null @@ -1,37 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_memmove.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:56:25 by hulamy #+# #+# */ -/* Updated: 2019/11/28 14:57:58 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** copy n characters from src to dst in a non destructive way and return dst -*/ - -#include "libft.h" - -void *ft_memmove(void *dst, const void *src, size_t len) -{ - size_t i; - char *cpsrc; - char *cpdst; - - i = -1; - cpsrc = (char *)src; - cpdst = (char *)dst; - if (dst == src) - return (dst); - if (cpsrc < cpdst) - while (len--) - cpdst[len] = cpsrc[len]; - else - while (++i < len) - cpdst[i] = cpsrc[i]; - return (dst); -} diff --git a/srcs/ft_memset.c b/srcs/ft_memset.c deleted file mode 100644 index 10c2d7c..0000000 --- a/srcs/ft_memset.c +++ /dev/null @@ -1,29 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_memset.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:56:37 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:56:38 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** copy n time a character in a string and return the string -*/ - -#include "libft.h" - -void *ft_memset(void *b, int c, size_t len) -{ - char *ptr; - size_t i; - - ptr = (char *)b; - i = 0; - while (i < len) - ptr[i++] = c; - return (b); -} diff --git a/srcs/ft_putchar.c b/srcs/ft_putchar.c deleted file mode 100644 index b0aa9cb..0000000 --- a/srcs/ft_putchar.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putchar.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:14:00 by hulamy #+# #+# */ -/* Updated: 2018/11/14 21:14:01 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_putchar(char c) -{ - write(1, &c, 1); -} diff --git a/srcs/ft_putchar_fd.c b/srcs/ft_putchar_fd.c deleted file mode 100644 index a48c1d5..0000000 --- a/srcs/ft_putchar_fd.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putchar_fd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:59:40 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:59:42 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_putchar_fd(char c, int fd) -{ - write(fd, &c, 1); -} diff --git a/srcs/ft_putendl.c b/srcs/ft_putendl.c deleted file mode 100644 index c1d9a6a..0000000 --- a/srcs/ft_putendl.c +++ /dev/null @@ -1,19 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putendl.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:14:32 by hulamy #+# #+# */ -/* Updated: 2018/11/14 21:14:33 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_putendl(char const *s) -{ - ft_putstr(s); - ft_putchar('\n'); -} diff --git a/srcs/ft_putendl_fd.c b/srcs/ft_putendl_fd.c deleted file mode 100644 index 5a0ef44..0000000 --- a/srcs/ft_putendl_fd.c +++ /dev/null @@ -1,23 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putendl_fd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:59:47 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:59:48 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** write the string s on the given file descriptor fd, followed by a newline -*/ - -#include "libft.h" - -void ft_putendl_fd(char *s, int fd) -{ - ft_putstr_fd(s, fd); - ft_putchar_fd('\n', fd); -} diff --git a/srcs/ft_putnbr.c b/srcs/ft_putnbr.c deleted file mode 100644 index bb8e2d7..0000000 --- a/srcs/ft_putnbr.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putnbr.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:14:57 by hulamy #+# #+# */ -/* Updated: 2018/11/14 21:14:58 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_putnbr(int n) -{ - ft_putnbr_fd(n, 1); -} diff --git a/srcs/ft_putnbr_fd.c b/srcs/ft_putnbr_fd.c deleted file mode 100644 index afc9e85..0000000 --- a/srcs/ft_putnbr_fd.c +++ /dev/null @@ -1,28 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putnbr_fd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:59:56 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:59:57 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_putnbr_fd(int n, int fd) -{ - long l; - - l = n; - if (l < 0) - { - ft_putchar_fd('-', fd); - l *= -1; - } - if (l >= 10) - ft_putnbr_fd(l / 10, fd); - ft_putchar_fd((l % 10) + '0', fd); -} diff --git a/srcs/ft_putnbrbase.c b/srcs/ft_putnbrbase.c deleted file mode 100644 index bf0d627..0000000 --- a/srcs/ft_putnbrbase.c +++ /dev/null @@ -1,59 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putnbrbase.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/16 15:17:00 by hulamy #+# #+# */ -/* Updated: 2018/11/16 15:23:43 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -static int check(char *base) -{ - int i; - int j; - - i = 0; - while (base[i]) - { - j = i + 1; - while (base[j]) - { - if (base[i] == base[j]) - return (0); - j++; - } - if (base[i] == '-' || base[i] == '+') - return (0); - i++; - } - if (i >= 2) - return (1); - return (0); -} - -void ft_putnbrbase(int nbr, char *base) -{ - int i; - long n; - - i = 0; - n = nbr; - if (check(base)) - { - if (n < 0) - { - ft_putchar('-'); - n = -n; - } - while (base[i]) - i++; - if (n >= i) - ft_putnbrbase(n / i, base); - ft_putchar(base[n % i]); - } -} diff --git a/srcs/ft_putnbrendl.c b/srcs/ft_putnbrendl.c deleted file mode 100644 index ddd05f6..0000000 --- a/srcs/ft_putnbrendl.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putnbrendl.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/02/19 10:38:07 by hulamy #+# #+# */ -/* Updated: 2019/02/19 10:42:46 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_putnbrendl(int n) -{ - ft_putnbrendl_fd(n, 1); -} diff --git a/srcs/ft_putnbrendl_fd.c b/srcs/ft_putnbrendl_fd.c deleted file mode 100644 index 266dc55..0000000 --- a/srcs/ft_putnbrendl_fd.c +++ /dev/null @@ -1,29 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putnbrendl_fd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/02/19 10:37:58 by hulamy #+# #+# */ -/* Updated: 2019/02/19 10:42:48 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_putnbrendl_fd(int n, int fd) -{ - long l; - - l = n; - if (l < 0) - { - ft_putchar_fd('-', fd); - l *= -1; - } - if (l >= 10) - ft_putnbr_fd(l / 10, fd); - ft_putchar_fd((l % 10) + '0', fd); - ft_putchar_fd('\n', fd); -} diff --git a/srcs/ft_putstr.c b/srcs/ft_putstr.c deleted file mode 100644 index 78617eb..0000000 --- a/srcs/ft_putstr.c +++ /dev/null @@ -1,22 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putstr.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:15:19 by hulamy #+# #+# */ -/* Updated: 2018/11/14 21:15:19 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -void ft_putstr(char const *s) -{ - int i; - - i = 0; - while (s && s[i]) - ft_putchar(s[i++]); -} diff --git a/srcs/ft_putstr_fd.c b/srcs/ft_putstr_fd.c deleted file mode 100644 index cf6ad12..0000000 --- a/srcs/ft_putstr_fd.c +++ /dev/null @@ -1,23 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_putstr_fd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:00:04 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:00:05 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** write the string s on the given file descritor fd -*/ - -#include "libft.h" - -void ft_putstr_fd(char *s, int fd) -{ - while (s && *s) - ft_putchar_fd(*s++, fd); -} diff --git a/srcs/ft_strcat.c b/srcs/ft_strcat.c deleted file mode 100644 index d78543c..0000000 --- a/srcs/ft_strcat.c +++ /dev/null @@ -1,32 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strcat.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:15:40 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:12:58 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** append src to dest (dest must have sufficient space) and return dest -*/ - -#include "libft.h" - -char *ft_strcat(char *dest, const char *src) -{ - int i; - int j; - - i = 0; - j = 0; - while (dest[i]) - i++; - while (src[j]) - dest[i++] = src[j++]; - dest[i] = '\0'; - return (dest); -} diff --git a/srcs/ft_strchr.c b/srcs/ft_strchr.c deleted file mode 100644 index b220565..0000000 --- a/srcs/ft_strchr.c +++ /dev/null @@ -1,33 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strchr.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:56:46 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:56:47 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** locate the first occurence of character c in string s -** and return pointer to its location -*/ - -#include "libft.h" - -char *ft_strchr(const char *s, int c) -{ - int i; - int j; - - i = 0; - j = -1; - while (s[i]) - i++; - while (++j < i + 1) - if (s[j] == c) - return ((char *)s + j); - return (NULL); -} diff --git a/srcs/ft_strclr.c b/srcs/ft_strclr.c deleted file mode 100644 index 5e3952c..0000000 --- a/srcs/ft_strclr.c +++ /dev/null @@ -1,23 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strclr.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:15:58 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:17:42 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** fill string with zeros -*/ - -#include "libft.h" - -void ft_strclr(char *s) -{ - if (s) - ft_bzero(s, ft_strlen(s)); -} diff --git a/srcs/ft_strcmp.c b/srcs/ft_strcmp.c deleted file mode 100644 index f6603c3..0000000 --- a/srcs/ft_strcmp.c +++ /dev/null @@ -1,28 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strcmp.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:16:08 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:18:30 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** compare two null terminated strings and return value -** of difference between first two different character -*/ - -#include "libft.h" - -int ft_strcmp(const char *s1, const char *s2) -{ - int i; - - i = 0; - while (s1[i] && s1[i] == s2[i]) - i++; - return ((unsigned char)s1[i] - (unsigned char)s2[i]); -} diff --git a/srcs/ft_strcpy.c b/srcs/ft_strcpy.c deleted file mode 100644 index 7d2a45b..0000000 --- a/srcs/ft_strcpy.c +++ /dev/null @@ -1,28 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strcpy.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:16:17 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:19:19 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** copy string src to dst including '\0' and return dst -*/ - -#include "libft.h" - -char *ft_strcpy(char *dest, const char *src) -{ - int i; - - i = -1; - while (src[++i]) - dest[i] = src[i]; - dest[i] = '\0'; - return (dest); -} diff --git a/srcs/ft_strdel.c b/srcs/ft_strdel.c deleted file mode 100644 index 82cbc2e..0000000 --- a/srcs/ft_strdel.c +++ /dev/null @@ -1,26 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strdel.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:16:25 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:19:54 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** free memory -*/ - -#include "libft.h" - -void ft_strdel(char **as) -{ - if (as && *as) - { - free(*as); - *as = 0; - } -} diff --git a/srcs/ft_strdup.c b/srcs/ft_strdup.c deleted file mode 100644 index b159a1c..0000000 --- a/srcs/ft_strdup.c +++ /dev/null @@ -1,32 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strdup.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:56:54 by hulamy #+# #+# */ -/* Updated: 2019/11/28 16:24:25 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** save a copy of string src by allocating memory and return pointer to copy -*/ - -#include "libft.h" - -char *ft_strdup(const char *src) -{ - int i; - char *str; - - i = 0; - while (src[i] != '\0') - i++; - if (!(str = (char*)malloc(sizeof(*str) * (i + 1)))) - return (NULL); - while (i-- >= 0) - str[i + 1] = src[i + 1]; - return (str); -} diff --git a/srcs/ft_strequ.c b/srcs/ft_strequ.c deleted file mode 100644 index fa4d4e4..0000000 --- a/srcs/ft_strequ.c +++ /dev/null @@ -1,24 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strequ.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:16:44 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:21:02 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** return 0 if strings s1 and s2 are identical and 1 if not -*/ - -#include "libft.h" - -int ft_strequ(char const *s1, char const *s2) -{ - if (!s1 || !s2) - return (0); - return (ft_strcmp(s1, s2) == 0); -} diff --git a/srcs/ft_striter.c b/srcs/ft_striter.c deleted file mode 100644 index 9d3b21f..0000000 --- a/srcs/ft_striter.c +++ /dev/null @@ -1,23 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_striter.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:16:53 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:21:14 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** apply function f to each element of string s -*/ - -#include "libft.h" - -void ft_striter(char *s, void (*f)(char *)) -{ - while (s && *s && f) - f(s++); -} diff --git a/srcs/ft_striteri.c b/srcs/ft_striteri.c deleted file mode 100644 index 60fd7f6..0000000 --- a/srcs/ft_striteri.c +++ /dev/null @@ -1,26 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_striteri.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:17:04 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:21:27 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** apply function f to each element of string s with index specified -*/ - -#include "libft.h" - -void ft_striteri(char *s, void (*f)(unsigned int, char *)) -{ - int i; - - i = 0; - while (s && *s && f) - f(i++, s++); -} diff --git a/srcs/ft_strjoin.c b/srcs/ft_strjoin.c deleted file mode 100644 index a325582..0000000 --- a/srcs/ft_strjoin.c +++ /dev/null @@ -1,54 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strjoin.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:01:26 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:01:34 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** create a new string by concatenating the two strings s1 and s2 -*/ - -#include "libft.h" - -static char *ft_doit(char const *s1, char const *s2, char *dest) -{ - int j; - int i; - - j = 0; - i = 0; - while (s1[j] != '\0') - { - dest[i] = s1[j]; - i++; - j++; - } - j = 0; - while (s2[j] != '\0') - { - dest[i] = s2[j]; - i++; - j++; - } - dest[i] = '\0'; - return (dest); -} - -char *ft_strjoin(char const *s1, char const *s2) -{ - char *str; - - if (!s1 || !s2) - return (NULL); - if (!(str = (char *)malloc(sizeof(char) * - (ft_strlen(s1) + ft_strlen(s2) + 1)))) - return (NULL); - str = ft_doit(s1, s2, str); - return (str); -} diff --git a/srcs/ft_strjoinfree.c b/srcs/ft_strjoinfree.c deleted file mode 100644 index 8e0247b..0000000 --- a/srcs/ft_strjoinfree.c +++ /dev/null @@ -1,28 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strjoinfree.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/03/05 15:05:28 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:22:28 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** create a new string by concatenating the two strings s1 -** and s2 then freeing them -*/ - -#include "libft.h" - -char *ft_strjoinfree(char *s1, char *s2) -{ - char *str; - - if (!(str = ft_strjoin(s1, s2))) - return (NULL); - free(s1); - return (str); -} diff --git a/srcs/ft_strlcat.c b/srcs/ft_strlcat.c deleted file mode 100644 index 91d14d8..0000000 --- a/srcs/ft_strlcat.c +++ /dev/null @@ -1,108 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strlcat.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:57:02 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:23:18 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** append src to sized dest and return size of final dest -*/ - -/* -** #include -** -** size_t ft_strlcat(char *dest, const char *src, size_t size); -** -** size_t ft_strlcat2(char *dest, char *src, size_t size); -** -** int ft_strlen(char *str) -** { -** int i; -** -** i = 0; -** while (str[i]) -** i++; -** return (i); -** } -** -** int main(int ac, char **av) -** { -** char tmp1[100]; -** char tmp2[100]; -** int i; -** -** i = atoi(av[3]); -** strcpy(tmp1, av[1]); -** strcpy(tmp2, av[2]); -** -** if (ac == 4) -** { -** printf("----strlcat: %zu - %s - %s\n", strlcat(tmp1, tmp2, i), -** tmp1, tmp2); -** -** strcpy(tmp1, av[1]); -** strcpy(tmp2, av[2]); -** -** printf("-ft_strlcat: %zu - %s - %s\n", ft_strlcat(tmp1, tmp2, i), -** tmp1, tmp2); -** -** strcpy(tmp1, av[1]); -** strcpy(tmp2, av[2]); -** -** printf("ft_strlcat2: %zu - %s - %s\n", ft_strlcat2(tmp1, tmp2, i), -** tmp1, tmp2); -** } -** } -** -** size_t ft_strlcat2(char *dest, char *src, size_t size) -** { -** size_t i; -** size_t dest_length; -** size_t src_length; -** -** i = 0; -** dest_length = ft_strlen(dest); -** src_length = ft_strlen(src); -** if (size > dest_length + 1) -** { -** while (i < (size - dest_length - 1)) -** { -** dest[i + dest_length] = src[i]; -** i++; -** } -** dest[dest_length + i] = '\0'; -** } -** if (size >= dest_length) -** return (dest_length + src_length); -** return (src_length + size); -** } -*/ - -#include "libft.h" - -size_t ft_strlcat(char *dest, const char *src, size_t size) -{ - size_t i; - size_t j; - - i = 0; - j = 0; - while (dest[i] && i < size) - i++; - while (src[j]) - { - if (j + i < size - 1 && size) - { - dest[i + j] = src[j]; - dest[i + j + 1] = '\0'; - } - j++; - } - return (i + j); -} diff --git a/srcs/ft_strlcpy.c b/srcs/ft_strlcpy.c deleted file mode 100644 index db57b07..0000000 --- a/srcs/ft_strlcpy.c +++ /dev/null @@ -1,54 +0,0 @@ -/* -** copy size - 1 length of src into dest, -** terminate it with a '\0' -** and return size of src -*/ - -/* -** #include -** -** size_t ft_strlcpy(char *dest, const char *src, size_t size); -** -** int main(int argc, char **argv) -** { -** char str[100]; -** int i; -** unsigned int u; -** unsigned int v; -** -** i = atoi(argv[3]); -** strcpy(str, argv[2]); -** if (argc > 3) -** { -** u = strlcpy(argv[2], argv[1], i); -** printf("strlcpy : %s - %s - %d",argv[1], argv[2], i); -** printf(" - return:%d\n",u); -** strcpy(argv[2], str); -** printf("(re-init : %s - %s - %d)\n",argv[1], argv[2], i); -** v = ft_strlcpy(argv[2], argv[1], i); -** printf("ft_strlcpy: %s - %s - %d",argv[1], argv[2], i); -** printf(" - return:%d\n",v); -** } -** return (0); -** } -*/ - -#include "libft.h" - -size_t ft_strlcpy(char *dest, const char *src, size_t size) -{ - size_t i; - size_t j; - - i = 0; - j = 0; - while (src[i] != '\0') - { - if (i + 1 < size) - dest[i] = src[j++]; - i++; - } - if (size > 0) - dest[j] = '\0'; - return (i); -} diff --git a/srcs/ft_strlen.c b/srcs/ft_strlen.c deleted file mode 100644 index 8af143b..0000000 --- a/srcs/ft_strlen.c +++ /dev/null @@ -1,27 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strlen.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:57:48 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:57:49 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** return length of of string -*/ - -#include "libft.h" - -size_t ft_strlen(const char *str) -{ - size_t i; - - i = 0; - while (str[i]) - i++; - return (i); -} diff --git a/srcs/ft_strmap.c b/srcs/ft_strmap.c deleted file mode 100644 index ef82f97..0000000 --- a/srcs/ft_strmap.c +++ /dev/null @@ -1,32 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strmap.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:17:49 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:23:12 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** create a new array with the result of function f on every element of s -*/ - -#include "libft.h" - -char *ft_strmap(char const *s, char (*f)(char)) -{ - char *str; - int i; - - if (!s) - return (NULL); - if (!(str = ft_strnew(ft_strlen(s)))) - return (NULL); - i = -1; - while (s[++i]) - str[i] = f(s[i]); - return (str); -} diff --git a/srcs/ft_strmapi.c b/srcs/ft_strmapi.c deleted file mode 100644 index 16060f2..0000000 --- a/srcs/ft_strmapi.c +++ /dev/null @@ -1,72 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strmapi.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:01:40 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:19:43 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** create a new array with the result of function f on every element of -** s by index i -*/ - -/* -** #include -** -** size_t ft_strlen(const char *str) -** { -** size_t i; -** -** i = 0; -** while (str[i]) -** i++; -** return (i); -** } -** char touppercase(unsigned int i, char c) -** { -** if (i < 3) -** c -= 32; -** return (c); -** } -** -** char *ft_strmapi(char const *s, char (*f)(unsigned int, char)); -** -** int main(int ac, char **av) -** { -** char *str; -** char touppercase(unsigned int, char); -** -** if (ac != 2) -** return (0); -** str = av[1]; -** printf("%s\n",str); -** str = ft_strmapi(str, touppercase); -** printf("%s\n",str); -** return (0); -** } -*/ - -#include "libft.h" - -char *ft_strmapi(char const *s, char (*f)(unsigned int, char)) -{ - char *str; - int i; - int size; - - if (!s) - return (NULL); - size = ft_strlen(s); - if (!(str = (char *)malloc(sizeof(char) * (size + 1)))) - return (NULL); - str[size] = '\0'; - i = -1; - while (s[++i]) - str[i] = f(i, s[i]); - return (str); -} diff --git a/srcs/ft_strmultisplit.c b/srcs/ft_strmultisplit.c deleted file mode 100644 index ed2ed98..0000000 --- a/srcs/ft_strmultisplit.c +++ /dev/null @@ -1,83 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strmultisplit.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/16 15:18:29 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:23:57 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** return an array of string with each word found in str -** with any character of charset difining a separator -*/ - -#include "libft.h" - -static int ft_is_separator(char c, char *charset, int i) -{ - while (charset[i]) - { - if (c == charset[i]) - return (1); - i++; - } - c = charset[i]; - return (0); -} - -static int ft_count(char *str, int word, char **tab, char *charset) -{ - int i; - int j; - int k; - - k = 0; - i = 0; - while (ft_is_separator(str[k], charset, 0) == 1) - k++; - while (str[k] != '\0' && i != word) - { - j = 0; - while (!ft_is_separator(str[k + j], charset, 0) && str[k + j] != '\0') - { - if (word == -2) - tab[i][j] = str[k + j]; - j++; - } - k += j; - while (ft_is_separator(str[k], charset, 0)) - k++; - i++; - } - if (word == -1) - return (i); - return (j); -} - -char **ft_strmultisplit(char *str, char *charset) -{ - char **tab; - int i; - int j; - int k; - - k = 0; - tab = 0; - i = ft_count(str, -1, tab, charset); - if (!(tab = (char**)malloc(sizeof(tab) * (i + 1)))) - return (NULL); - tab[i] = 0; - while (k < i) - { - j = ft_count(str, k + 1, tab, charset); - tab[k] = (char*)malloc(sizeof(*tab) * (j + 1)); - tab[k][j] = '\0'; - k++; - } - ft_count(str, -2, tab, charset); - return (tab); -} diff --git a/srcs/ft_strncat.c b/srcs/ft_strncat.c deleted file mode 100644 index cf52aae..0000000 --- a/srcs/ft_strncat.c +++ /dev/null @@ -1,32 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strncat.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:18:24 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:24:11 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** append n character of src to dest and return dest -*/ - -#include "libft.h" - -char *ft_strncat(char *dest, const char *src, size_t nb) -{ - size_t i; - size_t j; - - i = 0; - j = 0; - while (dest[i]) - i++; - while (src[j] && j < nb) - dest[i++] = src[j++]; - dest[i] = '\0'; - return (dest); -} diff --git a/srcs/ft_strncmp.c b/srcs/ft_strncmp.c deleted file mode 100644 index 7022624..0000000 --- a/srcs/ft_strncmp.c +++ /dev/null @@ -1,32 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strncmp.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:57:59 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:58:00 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** compare size first character of two null terminated strings -** and return value of difference between first two different character -*/ - -#include "libft.h" - -int ft_strncmp(const char *s1, const char *s2, size_t n) -{ - size_t i; - int res; - - i = 0; - res = 0; - while (s1[i] && s1[i] == s2[i] && i < n - 1) - i++; - if (n != 0) - res = (unsigned char)s1[i] - (unsigned char)s2[i]; - return (res); -} diff --git a/srcs/ft_strncpy.c b/srcs/ft_strncpy.c deleted file mode 100644 index 91ea1b3..0000000 --- a/srcs/ft_strncpy.c +++ /dev/null @@ -1,30 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strncpy.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:18:44 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:24:59 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** copy n characters from string src to dst including '\0' -** if space remain it's filled zith '\0', and return dst -*/ - -#include "libft.h" - -char *ft_strncpy(char *dest, const char *src, size_t n) -{ - size_t i; - - i = -1; - while (++i < n && src[i]) - dest[i] = src[i]; - while (i < n) - dest[i++] = '\0'; - return (dest); -} diff --git a/srcs/ft_strnequ.c b/srcs/ft_strnequ.c deleted file mode 100644 index 668f3fa..0000000 --- a/srcs/ft_strnequ.c +++ /dev/null @@ -1,25 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strnequ.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:18:55 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:25:20 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** return 0 if n first character of strings s1 and s2 are identical -** and 1 if not -*/ - -#include "libft.h" - -int ft_strnequ(char const *s1, char const *s2, size_t n) -{ - if (!s1 || !s2) - return (0); - return (ft_strncmp(s1, s2, n) == 0); -} diff --git a/srcs/ft_strnew.c b/srcs/ft_strnew.c deleted file mode 100644 index 645feff..0000000 --- a/srcs/ft_strnew.c +++ /dev/null @@ -1,27 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strnew.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:19:08 by hulamy #+# #+# */ -/* Updated: 2019/11/21 17:00:30 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** create a new string of length size, fill with zero, and return pointer to it -*/ - -#include "libft.h" - -char *ft_strnew(size_t size) -{ - char *str; - - if (!(str = (char *)malloc(sizeof(char) * (size + 1)))) - return (NULL); - ft_bzero(str, size + 1); - return (str); -} diff --git a/srcs/ft_strnstr.c b/srcs/ft_strnstr.c deleted file mode 100644 index 52ff0d2..0000000 --- a/srcs/ft_strnstr.c +++ /dev/null @@ -1,42 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strnstr.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:58:10 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:58:11 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** locate the first occurence of the string little in len first characters -** of big and return a pointer to this occurence if found -*/ - -#include "libft.h" - -char *ft_strnstr(const char *big, const char *little, size_t len) -{ - size_t i; - size_t j; - - j = 0; - i = 0; - if (!ft_strlen(little)) - return ((char *)big); - while (i == 0 && j <= len) - { - while (little[i] == big[j + i] && little[i] && j + i <= len) - i++; - if (little[i]) - { - j++; - if (!big[j] || j >= len) - return (0); - i = 0; - } - } - return ((char *)big + j); -} diff --git a/srcs/ft_strrchr.c b/srcs/ft_strrchr.c deleted file mode 100644 index 1c8faa8..0000000 --- a/srcs/ft_strrchr.c +++ /dev/null @@ -1,32 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strrchr.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:58:20 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:58:21 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** locate the last occurence of character c in string s -** and return pointer to its location -*/ - -#include "libft.h" - -char *ft_strrchr(const char *s, int c) -{ - int i; - - i = 0; - while (s[i]) - i++; - i++; - while (i--) - if (s[i] == c) - return ((char *)s + i); - return (NULL); -} diff --git a/srcs/ft_strstr.c b/srcs/ft_strstr.c deleted file mode 100644 index c7a3535..0000000 --- a/srcs/ft_strstr.c +++ /dev/null @@ -1,42 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strstr.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2018/11/14 21:19:45 by hulamy #+# #+# */ -/* Updated: 2019/03/25 15:26:59 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** locate the first occurence of the string little in big -** and return a pointer to this occurence if found -*/ - -#include "libft.h" - -char *ft_strstr(const char *str, const char *to_find) -{ - int i; - int j; - - j = 0; - i = 0; - if (!ft_strlen(to_find)) - return ((char *)str); - while (i == 0) - { - while (to_find[i] && to_find[i] == str[j + i]) - i++; - if (to_find[i]) - { - j++; - if (str[j] == '\0' && to_find[i]) - return (0); - i = 0; - } - } - return ((char *)str + j); -} diff --git a/srcs/ft_strtrim.c b/srcs/ft_strtrim.c deleted file mode 100644 index 46f6133..0000000 --- a/srcs/ft_strtrim.c +++ /dev/null @@ -1,90 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_strtrim.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:01:49 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:20:41 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** create a copy of s without the firsts and lasts empty characters -*/ - -/* -** #include -** -** char *ft_substr(char const *s, unsigned int start, size_t len) -** { -** char *str; -** size_t i; -** -** if (!s) -** return (NULL); -** if (!(str = (char *)malloc(sizeof(char) * (len + 1)))) -** return (NULL); -** str[len] = '\0'; -** i = 0; -** while (i < len) -** str[i++] = s[start++]; -** return (str); -** } -** -** size_t ft_strlen(const char *str) -** { -** size_t i; -** -** i = 0; -** while (str[i]) -** i++; -** return (i); -** } -** -** char *ft_strchr(const char *s, int c) -** { -** int i; -** int j; -** -** i = 0; -** j = -1; -** while (s[i]) -** i++; -** while (++j < i + 1) -** if (s[j] == c) -** return ((char *)s + j); -** return (NULL); -** } -** -** char *ft_strtrim(char const *s1, char const *set); -** -** int main(int ac, char **av) -** { -** if (ac == 3) -** printf("%s\n",ft_strtrim(av[1], av[2])); -** -** return (0); -** } -*/ - -#include "libft.h" - -char *ft_strtrim(char const *s1, char const *set) -{ - int len; - char *str; - - if (!s1) - return (NULL); - while (s1[0] && ft_strchr(set, s1[0])) - s1++; - len = ft_strlen(s1) - 1; - while (len >= 0 && ft_strchr(set, s1[len])) - len--; - len++; - if (!(str = ft_substr(s1, 0, len))) - return (NULL); - return (str); -} diff --git a/srcs/ft_substr.c b/srcs/ft_substr.c deleted file mode 100644 index 091545d..0000000 --- a/srcs/ft_substr.c +++ /dev/null @@ -1,52 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_substr.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 14:01:58 by hulamy #+# #+# */ -/* Updated: 2019/11/28 16:32:34 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* -** create a copy of a portion of s, begining at start and of length len -*/ - -/* -** #include -** -** char *ft_substr(char const *s, unsigned int start, size_t len); -** -** int main(int ac, char **av) -** { -** char *str; -** -** if (ac != 4) -** return (0); -** str = ft_substr(av[1], atoi(av[2]), atoi(av[3])); -** printf("%s\n",str); -** return (0); -** } -*/ - -#include "libft.h" - -char *ft_substr(char const *s, unsigned int start, size_t len) -{ - char *str; - size_t i; - - if (!s) - return (NULL); - if (ft_strlen(s) < start) - return (ft_strdup("")); - if (!(str = (char *)malloc(sizeof(char) * (len + 1)))) - return (NULL); - i = 0; - while (i < len && s[start]) - str[i++] = s[start++]; - str[i] = '\0'; - return (str); -} diff --git a/srcs/ft_tolower.c b/srcs/ft_tolower.c deleted file mode 100644 index 2cd5cb6..0000000 --- a/srcs/ft_tolower.c +++ /dev/null @@ -1,20 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_tolower.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:58:30 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:58:32 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_tolower(int c) -{ - if (c >= 'A' && c <= 'Z') - return (c + 32); - return (c); -} diff --git a/srcs/ft_toupper.c b/srcs/ft_toupper.c deleted file mode 100644 index cc842a5..0000000 --- a/srcs/ft_toupper.c +++ /dev/null @@ -1,20 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_toupper.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/25 13:58:39 by hulamy #+# #+# */ -/* Updated: 2019/11/25 13:58:43 by hulamy ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_toupper(int c) -{ - if (c >= 'a' && c <= 'z') - return (c - 32); - return (c); -} diff --git a/srcd/part1/ft_atoi.c b/srcs/part1/ft_atoi.c similarity index 100% rename from srcd/part1/ft_atoi.c rename to srcs/part1/ft_atoi.c diff --git a/srcd/part1/ft_bzero.c b/srcs/part1/ft_bzero.c similarity index 100% rename from srcd/part1/ft_bzero.c rename to srcs/part1/ft_bzero.c diff --git a/srcd/part1/ft_calloc.c b/srcs/part1/ft_calloc.c similarity index 94% rename from srcd/part1/ft_calloc.c rename to srcs/part1/ft_calloc.c index b8ef390..5c2ed9f 100644 --- a/srcd/part1/ft_calloc.c +++ b/srcs/part1/ft_calloc.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 13:54:53 by hulamy #+# #+# */ -/* Updated: 2019/11/28 16:00:32 by hulamy ### ########.fr */ +/* Updated: 2019/12/01 16:04:12 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,14 +20,14 @@ ** return a pointer to the allocated memory */ -/* +/* ** #include -** +** ** void ft_bzero(void *s, size_t n) ** { ** size_t i; ** unsigned char *ptr; -** +** ** if (n) ** { ** ptr = (unsigned char *)s; @@ -36,20 +36,20 @@ ** ptr[i++] = '\0'; ** } ** } -** +** ** void *ft_calloc(size_t count, size_t size); -** +** ** int main(void) ** { ** void *str; -** +** ** str = ft_calloc(0, 0); ** if (str == ((void *)0)) ** printf("failed\n"); ** free(str); ** return (0); ** } -*/ +*/ #include "libft.h" diff --git a/srcd/part1/ft_isalnum.c b/srcs/part1/ft_isalnum.c similarity index 100% rename from srcd/part1/ft_isalnum.c rename to srcs/part1/ft_isalnum.c diff --git a/srcd/part1/ft_isalpha.c b/srcs/part1/ft_isalpha.c similarity index 100% rename from srcd/part1/ft_isalpha.c rename to srcs/part1/ft_isalpha.c diff --git a/srcd/part1/ft_isascii.c b/srcs/part1/ft_isascii.c similarity index 100% rename from srcd/part1/ft_isascii.c rename to srcs/part1/ft_isascii.c diff --git a/srcd/part1/ft_isdigit.c b/srcs/part1/ft_isdigit.c similarity index 100% rename from srcd/part1/ft_isdigit.c rename to srcs/part1/ft_isdigit.c diff --git a/srcd/part1/ft_isprint.c b/srcs/part1/ft_isprint.c similarity index 100% rename from srcd/part1/ft_isprint.c rename to srcs/part1/ft_isprint.c diff --git a/srcd/part1/ft_memccpy.c b/srcs/part1/ft_memccpy.c similarity index 100% rename from srcd/part1/ft_memccpy.c rename to srcs/part1/ft_memccpy.c diff --git a/srcd/part1/ft_memchr.c b/srcs/part1/ft_memchr.c similarity index 100% rename from srcd/part1/ft_memchr.c rename to srcs/part1/ft_memchr.c diff --git a/srcd/part1/ft_memcmp.c b/srcs/part1/ft_memcmp.c similarity index 100% rename from srcd/part1/ft_memcmp.c rename to srcs/part1/ft_memcmp.c diff --git a/srcd/part1/ft_memcpy.c b/srcs/part1/ft_memcpy.c similarity index 94% rename from srcd/part1/ft_memcpy.c rename to srcs/part1/ft_memcpy.c index d681587..b9f0b38 100644 --- a/srcd/part1/ft_memcpy.c +++ b/srcs/part1/ft_memcpy.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 13:56:16 by hulamy #+# #+# */ -/* Updated: 2019/11/28 15:09:27 by hulamy ### ########.fr */ +/* Updated: 2019/12/01 14:54:14 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -41,6 +41,6 @@ void *ft_memcpy(void *dst, const void *src, size_t n) if (dst == src) return (dst); while (++i < (int)n) - ptr[n] = ptr2[n]; + ptr[i] = ptr2[i]; return (dst); } diff --git a/srcd/part1/ft_memmove.c b/srcs/part1/ft_memmove.c similarity index 100% rename from srcd/part1/ft_memmove.c rename to srcs/part1/ft_memmove.c diff --git a/srcd/part1/ft_memset.c b/srcs/part1/ft_memset.c similarity index 100% rename from srcd/part1/ft_memset.c rename to srcs/part1/ft_memset.c diff --git a/srcd/part1/ft_strchr.c b/srcs/part1/ft_strchr.c similarity index 100% rename from srcd/part1/ft_strchr.c rename to srcs/part1/ft_strchr.c diff --git a/srcd/part1/ft_strdup.c b/srcs/part1/ft_strdup.c similarity index 100% rename from srcd/part1/ft_strdup.c rename to srcs/part1/ft_strdup.c diff --git a/srcd/part1/ft_strlcat.c b/srcs/part1/ft_strlcat.c similarity index 100% rename from srcd/part1/ft_strlcat.c rename to srcs/part1/ft_strlcat.c diff --git a/srcd/part1/ft_strlcpy.c b/srcs/part1/ft_strlcpy.c similarity index 96% rename from srcd/part1/ft_strlcpy.c rename to srcs/part1/ft_strlcpy.c index 9b33a47..5971964 100644 --- a/srcd/part1/ft_strlcpy.c +++ b/srcs/part1/ft_strlcpy.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 13:57:19 by hulamy #+# #+# */ -/* Updated: 2019/11/25 15:53:19 by hulamy ### ########.fr */ +/* Updated: 2019/12/01 16:12:57 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcd/part1/ft_strlen.c b/srcs/part1/ft_strlen.c similarity index 100% rename from srcd/part1/ft_strlen.c rename to srcs/part1/ft_strlen.c diff --git a/srcd/part1/ft_strncmp.c b/srcs/part1/ft_strncmp.c similarity index 100% rename from srcd/part1/ft_strncmp.c rename to srcs/part1/ft_strncmp.c diff --git a/srcd/part1/ft_strnstr.c b/srcs/part1/ft_strnstr.c similarity index 100% rename from srcd/part1/ft_strnstr.c rename to srcs/part1/ft_strnstr.c diff --git a/srcd/part1/ft_strrchr.c b/srcs/part1/ft_strrchr.c similarity index 100% rename from srcd/part1/ft_strrchr.c rename to srcs/part1/ft_strrchr.c diff --git a/srcd/part1/ft_tolower.c b/srcs/part1/ft_tolower.c similarity index 100% rename from srcd/part1/ft_tolower.c rename to srcs/part1/ft_tolower.c diff --git a/srcd/part1/ft_toupper.c b/srcs/part1/ft_toupper.c similarity index 100% rename from srcd/part1/ft_toupper.c rename to srcs/part1/ft_toupper.c diff --git a/srcd/part2/ft_itoa.c b/srcs/part2/ft_itoa.c similarity index 100% rename from srcd/part2/ft_itoa.c rename to srcs/part2/ft_itoa.c diff --git a/srcd/part2/ft_putchar_fd.c b/srcs/part2/ft_putchar_fd.c similarity index 100% rename from srcd/part2/ft_putchar_fd.c rename to srcs/part2/ft_putchar_fd.c diff --git a/srcd/part2/ft_putendl_fd.c b/srcs/part2/ft_putendl_fd.c similarity index 100% rename from srcd/part2/ft_putendl_fd.c rename to srcs/part2/ft_putendl_fd.c diff --git a/srcd/part2/ft_putnbr_fd.c b/srcs/part2/ft_putnbr_fd.c similarity index 100% rename from srcd/part2/ft_putnbr_fd.c rename to srcs/part2/ft_putnbr_fd.c diff --git a/srcd/part2/ft_putstr_fd.c b/srcs/part2/ft_putstr_fd.c similarity index 100% rename from srcd/part2/ft_putstr_fd.c rename to srcs/part2/ft_putstr_fd.c diff --git a/srcs/ft_split.c b/srcs/part2/ft_split.c similarity index 93% rename from srcs/ft_split.c rename to srcs/part2/ft_split.c index 8f8dab5..f8c729d 100644 --- a/srcs/ft_split.c +++ b/srcs/part2/ft_split.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:00:13 by hulamy #+# #+# */ -/* Updated: 2019/11/27 21:35:21 by hulamy ### ########.fr */ +/* Updated: 2019/12/01 16:01:20 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -60,9 +60,7 @@ ** { ** i = 0; ** s = av[1]; -** // s = "lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse"; ** c = av[2][0]; -** // c = ' '; ** str = ft_split(s, c); ** while (str[i]) ** printf("%s\n", str[i++]); diff --git a/srcd/part2/ft_strjoin.c b/srcs/part2/ft_strjoin.c similarity index 100% rename from srcd/part2/ft_strjoin.c rename to srcs/part2/ft_strjoin.c diff --git a/srcd/part2/ft_strmapi.c b/srcs/part2/ft_strmapi.c similarity index 100% rename from srcd/part2/ft_strmapi.c rename to srcs/part2/ft_strmapi.c diff --git a/srcd/part2/ft_strtrim.c b/srcs/part2/ft_strtrim.c similarity index 100% rename from srcd/part2/ft_strtrim.c rename to srcs/part2/ft_strtrim.c diff --git a/srcd/part2/ft_substr.c b/srcs/part2/ft_substr.c similarity index 61% rename from srcd/part2/ft_substr.c rename to srcs/part2/ft_substr.c index 54e1685..c99c75f 100644 --- a/srcd/part2/ft_substr.c +++ b/srcs/part2/ft_substr.c @@ -1,3 +1,15 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_substr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: hulamy +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/12/01 16:00:10 by hulamy #+# #+# */ +/* Updated: 2019/12/01 16:00:12 by hulamy ### ########.fr */ +/* */ +/* ************************************************************************** */ + /* ** create a copy of a portion of s, begining at start and of length len */ diff --git a/testresults b/testresults deleted file mode 100644 index c7633aa..0000000 --- a/testresults +++ /dev/null @@ -1,15 +0,0 @@ -memcpy: - does not behave well with null as both params with size -memmove: - does not work well with null as both parameters and size -calloc: - does not work with 0 size -lstlast: - does not work with basic input -lstclear: - does not free the list - does not work with basic input -lstiter: - does not work with basic input -lstmap: - does not work with basic input