diff --git a/Makefile b/Makefile index ac940e7..c4d58a6 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,8 @@ VPATH = srcs/part1/ \ srcs/bonus/ \ srcs/add/ -IDIR = includes +IDIR = . _DEP = libft.h \ - libonus.h DEPS = $(_DEP:%.h=$(IDIR)/%.h) CFLAGS = -I$(IDIR) @@ -58,9 +57,9 @@ OBJS = $(SRCS:%.c=$(ODIR)/%.o) SRCB = ft_lstnew.c \ ft_lstadd_front.c \ - ft_lstsize \ - ft_lstlast \ - ft_lstadd_back \ + ft_lstsize.c \ + ft_lstlast.c \ + ft_lstadd_back.c \ ft_lstdelone.c \ ft_lstclear.c \ ft_lstiter.c \ @@ -108,15 +107,24 @@ OBJB = $(SRCB:%.c=$(ODIR)/%.o) all: $(ODIR) $(NAME) +echo: + @echo "\033[33mcompiling objetcs\033[0m" + +echob: + @echo "\033[33mcompiling objetcs for bonus\033[0m" + $(ODIR): + @echo "\033[33mcreate $(ODIR)\033[0m" mkdir -p $(ODIR) -$(NAME): $(OBJS) $(DEPS) +$(NAME): echo $(OBJS) $(DEPS) + @echo "\033[33mbuilding $(NAME)\033[0m" ar -rc $@ $(OBJS) @ranlib $@ -bonus: $(OBJB) - ar rc $(NAME) $(OBJB) +bonus: echob $(OBJB) + @echo "\033[33madding the bonus functions to $(NAME)\033[0m" + ar -rc $(NAME) $(OBJB) @ranlib $(NAME) $(ODIR)/%.o: %.c @@ -130,7 +138,7 @@ fclean: clean re: fclean all -.PHONY: bonus clean fclean re all +.PHONY: echo echob bonus clean fclean re all diff --git a/builds/ft_any.o b/builds/ft_any.o new file mode 100644 index 0000000..cce06cb Binary files /dev/null and b/builds/ft_any.o differ diff --git a/builds/ft_arraymap.o b/builds/ft_arraymap.o new file mode 100644 index 0000000..f9e4acc Binary files /dev/null and b/builds/ft_arraymap.o differ diff --git a/builds/ft_atoi.o b/builds/ft_atoi.o new file mode 100644 index 0000000..c26e19f Binary files /dev/null and b/builds/ft_atoi.o differ diff --git a/builds/ft_atoibase.o b/builds/ft_atoibase.o new file mode 100644 index 0000000..e35df50 Binary files /dev/null and b/builds/ft_atoibase.o differ diff --git a/builds/ft_bzero.o b/builds/ft_bzero.o new file mode 100644 index 0000000..4b3c30b Binary files /dev/null and b/builds/ft_bzero.o differ diff --git a/builds/ft_calloc.o b/builds/ft_calloc.o new file mode 100644 index 0000000..fbe429d Binary files /dev/null and b/builds/ft_calloc.o differ diff --git a/builds/ft_convertbase.o b/builds/ft_convertbase.o new file mode 100644 index 0000000..61e5d56 Binary files /dev/null and b/builds/ft_convertbase.o differ diff --git a/builds/ft_foreach.o b/builds/ft_foreach.o new file mode 100644 index 0000000..2fc662c Binary files /dev/null and b/builds/ft_foreach.o differ diff --git a/builds/ft_isalnum.o b/builds/ft_isalnum.o new file mode 100644 index 0000000..015b3b3 Binary files /dev/null and b/builds/ft_isalnum.o differ diff --git a/builds/ft_isalpha.o b/builds/ft_isalpha.o new file mode 100644 index 0000000..d07172a Binary files /dev/null and b/builds/ft_isalpha.o differ diff --git a/builds/ft_isascii.o b/builds/ft_isascii.o new file mode 100644 index 0000000..ff18b21 Binary files /dev/null and b/builds/ft_isascii.o differ diff --git a/builds/ft_isdigit.o b/builds/ft_isdigit.o new file mode 100644 index 0000000..d17bc22 Binary files /dev/null and b/builds/ft_isdigit.o differ diff --git a/builds/ft_isprint.o b/builds/ft_isprint.o new file mode 100644 index 0000000..9f1a66c Binary files /dev/null and b/builds/ft_isprint.o differ diff --git a/builds/ft_issort.o b/builds/ft_issort.o new file mode 100644 index 0000000..7a83dba Binary files /dev/null and b/builds/ft_issort.o differ diff --git a/builds/ft_itoa.o b/builds/ft_itoa.o new file mode 100644 index 0000000..c5b1096 Binary files /dev/null and b/builds/ft_itoa.o differ diff --git a/builds/ft_lstadd_back.o b/builds/ft_lstadd_back.o new file mode 100644 index 0000000..f02cdff Binary files /dev/null and b/builds/ft_lstadd_back.o differ diff --git a/builds/ft_lstadd_front.o b/builds/ft_lstadd_front.o new file mode 100644 index 0000000..40f7f1e Binary files /dev/null and b/builds/ft_lstadd_front.o differ diff --git a/builds/ft_lstclear.o b/builds/ft_lstclear.o new file mode 100644 index 0000000..76e23c1 Binary files /dev/null and b/builds/ft_lstclear.o differ diff --git a/builds/ft_lstdelone.o b/builds/ft_lstdelone.o new file mode 100644 index 0000000..a1b3fdc Binary files /dev/null and b/builds/ft_lstdelone.o differ diff --git a/builds/ft_lstiter.o b/builds/ft_lstiter.o new file mode 100644 index 0000000..04eb803 Binary files /dev/null and b/builds/ft_lstiter.o differ diff --git a/builds/ft_lstlast.o b/builds/ft_lstlast.o new file mode 100644 index 0000000..b37fbb5 Binary files /dev/null and b/builds/ft_lstlast.o differ diff --git a/builds/ft_lstmap.o b/builds/ft_lstmap.o new file mode 100644 index 0000000..c96eea9 Binary files /dev/null and b/builds/ft_lstmap.o differ diff --git a/builds/ft_lstnew.o b/builds/ft_lstnew.o new file mode 100644 index 0000000..e828de6 Binary files /dev/null and b/builds/ft_lstnew.o differ diff --git a/builds/ft_lstsize.o b/builds/ft_lstsize.o new file mode 100644 index 0000000..bc91468 Binary files /dev/null and b/builds/ft_lstsize.o differ diff --git a/builds/ft_memalloc.o b/builds/ft_memalloc.o new file mode 100644 index 0000000..b32fe17 Binary files /dev/null and b/builds/ft_memalloc.o differ diff --git a/builds/ft_memccpy.o b/builds/ft_memccpy.o new file mode 100644 index 0000000..2a2ecfa Binary files /dev/null and b/builds/ft_memccpy.o differ diff --git a/builds/ft_memchr.o b/builds/ft_memchr.o new file mode 100644 index 0000000..ec95ddf Binary files /dev/null and b/builds/ft_memchr.o differ diff --git a/builds/ft_memcmp.o b/builds/ft_memcmp.o new file mode 100644 index 0000000..bb309e9 Binary files /dev/null and b/builds/ft_memcmp.o differ diff --git a/builds/ft_memcpy.o b/builds/ft_memcpy.o new file mode 100644 index 0000000..e7dbbfd Binary files /dev/null and b/builds/ft_memcpy.o differ diff --git a/builds/ft_memdel.o b/builds/ft_memdel.o new file mode 100644 index 0000000..32443ad Binary files /dev/null and b/builds/ft_memdel.o differ diff --git a/builds/ft_memmove.o b/builds/ft_memmove.o new file mode 100644 index 0000000..a3f516b Binary files /dev/null and b/builds/ft_memmove.o differ diff --git a/builds/ft_memset.o b/builds/ft_memset.o new file mode 100644 index 0000000..dc2776a Binary files /dev/null and b/builds/ft_memset.o differ diff --git a/builds/ft_putchar.o b/builds/ft_putchar.o new file mode 100644 index 0000000..824021b Binary files /dev/null and b/builds/ft_putchar.o differ diff --git a/builds/ft_putchar_fd.o b/builds/ft_putchar_fd.o new file mode 100644 index 0000000..11915f7 Binary files /dev/null and b/builds/ft_putchar_fd.o differ diff --git a/builds/ft_putendl.o b/builds/ft_putendl.o new file mode 100644 index 0000000..0b04594 Binary files /dev/null and b/builds/ft_putendl.o differ diff --git a/builds/ft_putendl_fd.o b/builds/ft_putendl_fd.o new file mode 100644 index 0000000..760260a Binary files /dev/null and b/builds/ft_putendl_fd.o differ diff --git a/builds/ft_putnbr.o b/builds/ft_putnbr.o new file mode 100644 index 0000000..ff7faf4 Binary files /dev/null and b/builds/ft_putnbr.o differ diff --git a/builds/ft_putnbr_fd.o b/builds/ft_putnbr_fd.o new file mode 100644 index 0000000..46a2cd7 Binary files /dev/null and b/builds/ft_putnbr_fd.o differ diff --git a/builds/ft_putnbrbase.o b/builds/ft_putnbrbase.o new file mode 100644 index 0000000..69fb613 Binary files /dev/null and b/builds/ft_putnbrbase.o differ diff --git a/builds/ft_putnbrendl.o b/builds/ft_putnbrendl.o new file mode 100644 index 0000000..8ece334 Binary files /dev/null and b/builds/ft_putnbrendl.o differ diff --git a/builds/ft_putnbrendl_fd.o b/builds/ft_putnbrendl_fd.o new file mode 100644 index 0000000..800357f Binary files /dev/null and b/builds/ft_putnbrendl_fd.o differ diff --git a/builds/ft_putstr.o b/builds/ft_putstr.o new file mode 100644 index 0000000..d8b8995 Binary files /dev/null and b/builds/ft_putstr.o differ diff --git a/builds/ft_putstr_fd.o b/builds/ft_putstr_fd.o new file mode 100644 index 0000000..9f3cfc6 Binary files /dev/null and b/builds/ft_putstr_fd.o differ diff --git a/builds/ft_split.o b/builds/ft_split.o new file mode 100644 index 0000000..4310474 Binary files /dev/null and b/builds/ft_split.o differ diff --git a/builds/ft_strcat.o b/builds/ft_strcat.o new file mode 100644 index 0000000..0ebe706 Binary files /dev/null and b/builds/ft_strcat.o differ diff --git a/builds/ft_strchr.o b/builds/ft_strchr.o new file mode 100644 index 0000000..bac94b1 Binary files /dev/null and b/builds/ft_strchr.o differ diff --git a/builds/ft_strclr.o b/builds/ft_strclr.o new file mode 100644 index 0000000..328e998 Binary files /dev/null and b/builds/ft_strclr.o differ diff --git a/builds/ft_strcmp.o b/builds/ft_strcmp.o new file mode 100644 index 0000000..b0e1b1c Binary files /dev/null and b/builds/ft_strcmp.o differ diff --git a/builds/ft_strcpy.o b/builds/ft_strcpy.o new file mode 100644 index 0000000..c134e33 Binary files /dev/null and b/builds/ft_strcpy.o differ diff --git a/builds/ft_strdel.o b/builds/ft_strdel.o new file mode 100644 index 0000000..338d2ac Binary files /dev/null and b/builds/ft_strdel.o differ diff --git a/builds/ft_strdup.o b/builds/ft_strdup.o new file mode 100644 index 0000000..7ece743 Binary files /dev/null and b/builds/ft_strdup.o differ diff --git a/builds/ft_strequ.o b/builds/ft_strequ.o new file mode 100644 index 0000000..5b0cf3f Binary files /dev/null and b/builds/ft_strequ.o differ diff --git a/builds/ft_striter.o b/builds/ft_striter.o new file mode 100644 index 0000000..0d61613 Binary files /dev/null and b/builds/ft_striter.o differ diff --git a/builds/ft_striteri.o b/builds/ft_striteri.o new file mode 100644 index 0000000..4d9a992 Binary files /dev/null and b/builds/ft_striteri.o differ diff --git a/builds/ft_strjoin.o b/builds/ft_strjoin.o new file mode 100644 index 0000000..e6ab5e1 Binary files /dev/null and b/builds/ft_strjoin.o differ diff --git a/builds/ft_strjoinfree.o b/builds/ft_strjoinfree.o new file mode 100644 index 0000000..9df166b Binary files /dev/null and b/builds/ft_strjoinfree.o differ diff --git a/builds/ft_strlcat.o b/builds/ft_strlcat.o new file mode 100644 index 0000000..0892cfa Binary files /dev/null and b/builds/ft_strlcat.o differ diff --git a/builds/ft_strlcpy.o b/builds/ft_strlcpy.o new file mode 100644 index 0000000..ebe1963 Binary files /dev/null and b/builds/ft_strlcpy.o differ diff --git a/builds/ft_strlen.o b/builds/ft_strlen.o new file mode 100644 index 0000000..d29b8bc Binary files /dev/null and b/builds/ft_strlen.o differ diff --git a/builds/ft_strmap.o b/builds/ft_strmap.o new file mode 100644 index 0000000..2cfdcb5 Binary files /dev/null and b/builds/ft_strmap.o differ diff --git a/builds/ft_strmapi.o b/builds/ft_strmapi.o new file mode 100644 index 0000000..9a3c744 Binary files /dev/null and b/builds/ft_strmapi.o differ diff --git a/builds/ft_strmultisplit.o b/builds/ft_strmultisplit.o new file mode 100644 index 0000000..9788fe4 Binary files /dev/null and b/builds/ft_strmultisplit.o differ diff --git a/builds/ft_strncat.o b/builds/ft_strncat.o new file mode 100644 index 0000000..5e48d00 Binary files /dev/null and b/builds/ft_strncat.o differ diff --git a/builds/ft_strncmp.o b/builds/ft_strncmp.o new file mode 100644 index 0000000..696b45f Binary files /dev/null and b/builds/ft_strncmp.o differ diff --git a/builds/ft_strncpy.o b/builds/ft_strncpy.o new file mode 100644 index 0000000..05adfaa Binary files /dev/null and b/builds/ft_strncpy.o differ diff --git a/builds/ft_strnequ.o b/builds/ft_strnequ.o new file mode 100644 index 0000000..1c3e4b1 Binary files /dev/null and b/builds/ft_strnequ.o differ diff --git a/builds/ft_strnew.o b/builds/ft_strnew.o new file mode 100644 index 0000000..cfeef28 Binary files /dev/null and b/builds/ft_strnew.o differ diff --git a/builds/ft_strnstr.o b/builds/ft_strnstr.o new file mode 100644 index 0000000..30af5dd Binary files /dev/null and b/builds/ft_strnstr.o differ diff --git a/builds/ft_strrchr.o b/builds/ft_strrchr.o new file mode 100644 index 0000000..ffe58c9 Binary files /dev/null and b/builds/ft_strrchr.o differ diff --git a/builds/ft_strstr.o b/builds/ft_strstr.o new file mode 100644 index 0000000..b018768 Binary files /dev/null and b/builds/ft_strstr.o differ diff --git a/builds/ft_strtrim.o b/builds/ft_strtrim.o new file mode 100644 index 0000000..c95c666 Binary files /dev/null and b/builds/ft_strtrim.o differ diff --git a/builds/ft_substr.o b/builds/ft_substr.o new file mode 100644 index 0000000..db0f886 Binary files /dev/null and b/builds/ft_substr.o differ diff --git a/builds/ft_tolower.o b/builds/ft_tolower.o new file mode 100644 index 0000000..db4d757 Binary files /dev/null and b/builds/ft_tolower.o differ diff --git a/builds/ft_toupper.o b/builds/ft_toupper.o new file mode 100644 index 0000000..f8150b5 Binary files /dev/null and b/builds/ft_toupper.o differ diff --git a/libft.a b/libft.a new file mode 100644 index 0000000..1b5906c Binary files /dev/null and b/libft.a differ diff --git a/libft.h b/libft.h index b5589a5..b2df1a6 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:45:53 by hulamy #+# #+# */ -/* Updated: 2019/11/25 15:45:05 by hulamy ### ########.fr */ +/* Updated: 2019/11/25 17:11:09 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -52,22 +52,22 @@ void ft_putstr_fd(char *s, int fd); void ft_putendl_fd(char *s, int fd); void ft_putnbr_fd(int n, int fd); -t_list *ft_lstnew(void *content); -void ft_lstadd_front(t_list **alst, t_list *n); -int ft_lstsize(t_list *lst); -t_list *ft_lstlast(t_list *lst); -void ft_lstadd_back(t_list **alst, t_list *n); -void ft_lstdelone(t_list **lst, void (*del)(void *)); -void ft_lstclear(t_list **lst, void (*del)(void *)); -void ft_lstiter(t_list *lst, void (*f)(void *)); -t_list *ft_lstmap(t_list *l, void *(*f)(void*), void (*d)(void*)); - typedef struct s_list { void *content; struct s_list *next; } t_list; +t_list *ft_lstnew(void *content); +void ft_lstadd_front(t_list **alst, t_list *n); +int ft_lstsize(t_list *lst); +t_list *ft_lstlast(t_list *lst); +void ft_lstadd_back(t_list **alst, t_list *n); +void ft_lstdelone(t_list *lst, void (*del)(void *)); +void ft_lstclear(t_list **lst, void (*del)(void *)); +void ft_lstiter(t_list *lst, void (*f)(void *)); +t_list *ft_lstmap(t_list *l, void *(*f)(void*), void (*d)(void*)); + char *ft_strcat(char *s1, const char *s2); int ft_strcmp(const char *s1, const char *s2); char *ft_strcpy(char *dst, const char *src); diff --git a/srcs/bonus/.DS_Store b/srcs/bonus/.DS_Store deleted file mode 100644 index 697b981..0000000 Binary files a/srcs/bonus/.DS_Store and /dev/null differ diff --git a/srcs/bonus/a.out b/srcs/bonus/a.out deleted file mode 100755 index 3eb7c7c..0000000 Binary files a/srcs/bonus/a.out and /dev/null differ diff --git a/srcs/bonus/ft_lstsize.c b/srcs/bonus/ft_lstsize.c index 60a44c9..5ff5f2d 100644 --- a/srcs/bonus/ft_lstsize.c +++ b/srcs/bonus/ft_lstsize.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:31:48 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:32:30 by hulamy ### ########.fr */ +/* Updated: 2019/11/25 16:06:41 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/part1/.ft_strlcpy.c.swp b/srcs/part1/.ft_strlcpy.c.swp deleted file mode 100644 index a03db52..0000000 Binary files a/srcs/part1/.ft_strlcpy.c.swp and /dev/null differ diff --git a/srcs/part1/ft_strlcpy.c b/srcs/part1/ft_strlcpy.c index 45be72c..9b33a47 100644 --- a/srcs/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 14:28:12 by hulamy ### ########.fr */ +/* Updated: 2019/11/25 15:53:19 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -45,6 +45,8 @@ ** } */ +#include "libft.h" + size_t ft_strlcpy(char *dest, const char *src, size_t size) { size_t i; diff --git a/srcs/part2/ft_split.c b/srcs/part2/ft_split.c index 67dca63..0c7111c 100644 --- a/srcs/part2/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/25 14:01:09 by hulamy ### ########.fr */ +/* Updated: 2019/11/25 15:54:07 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -53,7 +53,7 @@ char **ft_split(char const *s, char c) len = 0; while (s[i + len] && s[i + len] != c) len++; - array[j++] = ft_strsub(s, i, len); + array[j++] = ft_substr(s, i, len); i = i + len - 1; } }