From b3e59abef6a141073e295b0354d8f28a66a15d0a Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 25 Oct 2019 02:59:59 +0200 Subject: Rendu branch with less fancy stuff --- .gitignore | 5 ----- README.md | 1 - pre2019_subject.en.pdf | Bin 1455686 -> 0 bytes subject.en.pdf | Bin 1657956 -> 0 bytes 4 files changed, 6 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md delete mode 100644 pre2019_subject.en.pdf delete mode 100644 subject.en.pdf diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 56fd0f2..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -a.out -*.o -*.so -*.a -main.c diff --git a/README.md b/README.md deleted file mode 100644 index e930431..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -# libft diff --git a/pre2019_subject.en.pdf b/pre2019_subject.en.pdf deleted file mode 100644 index e5bee09..0000000 Binary files a/pre2019_subject.en.pdf and /dev/null differ diff --git a/subject.en.pdf b/subject.en.pdf deleted file mode 100644 index 67a054c..0000000 Binary files a/subject.en.pdf and /dev/null differ -- cgit From cade8c9ab269b0981725f002fea34fda035fb707 Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 25 Oct 2019 03:37:52 +0200 Subject: Added strndup and lstpop_front --- Makefile | 6 +++--- ft_lstpop_front_bonus.c | 26 ++++++++++++++++++++++++++ ft_strndup.c | 31 +++++++++++++++++++++++++++++++ libft.h | 4 +++- 4 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 ft_lstpop_front_bonus.c create mode 100644 ft_strndup.c diff --git a/Makefile b/Makefile index 6758101..9dca309 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: cacharle +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2019/10/17 13:39:09 by cacharle ### ########.fr # +# Updated: 2019/10/25 03:31:58 by cacharle ### ########.fr # # # # **************************************************************************** # @@ -25,13 +25,13 @@ SRC = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c ft_isdigit.c f ft_striteri.c ft_strjoin.c ft_strlcat.c ft_strlen.c ft_strmap.c ft_strmapi.c \ ft_strncat.c ft_strncmp.c ft_strncpy.c ft_strnequ.c ft_strnew.c ft_strnstr.c \ ft_strrchr.c ft_split.c ft_strstr.c ft_substr.c ft_strtrim.c ft_tolower.c \ - ft_toupper.c ft_strlcpy.c ft_calloc.c + ft_toupper.c ft_strlcpy.c ft_calloc.c ft_strndup.c OBJ = $(SRC:.c=.o) INCLUDE = libft.h BONUSSRC = ft_lstadd_back_bonus.c ft_lstadd_front_bonus.c ft_lstclear_bonus.c \ ft_lstdelone_bonus.c ft_lstiter_bonus.c ft_lstlast_bonus.c \ - ft_lstmap_bonus.c ft_lstnew_bonus.c ft_lstsize_bonus.c + ft_lstmap_bonus.c ft_lstnew_bonus.c ft_lstsize_bonus.c ft_lstpop_front_bonus.c BONUSOBJ = $(BONUSSRC:.c=.o) all: $(NAME) diff --git a/ft_lstpop_front_bonus.c b/ft_lstpop_front_bonus.c new file mode 100644 index 0000000..f81315a --- /dev/null +++ b/ft_lstpop_front_bonus.c @@ -0,0 +1,26 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_lstpop_front_bonus.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/25 03:32:51 by cacharle #+# #+# */ +/* Updated: 2019/10/25 03:35:58 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include "libft.h" + +void ft_lstpop_front(t_list **lst, void (*del)(void *)) +{ + t_list *tmp; + + if (lst == NULL || *lst == NULL) + return ; + tmp = (*lst)->next; + del((*lst)->content); + free(*lst); + *lst = tmp; +} diff --git a/ft_strndup.c b/ft_strndup.c new file mode 100644 index 0000000..d43c0ce --- /dev/null +++ b/ft_strndup.c @@ -0,0 +1,31 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strndup.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/25 03:28:52 by cacharle #+# #+# */ +/* Updated: 2019/10/25 03:36:24 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include + +char *ft_strndup(const char *s1, size_t n) +{ + char *clone; + size_t i; + + if ((clone = (char*)malloc(sizeof(char) * (n + 1))) == NULL) + return (NULL); + i = 0; + while (i < n && s1[i]) + { + clone[i] = s1[i]; + i++; + } + clone[i] = '\0'; + return (clone); +} diff --git a/libft.h b/libft.h index 87b57c2..1ba3dda 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */ -/* Updated: 2019/10/17 09:08:31 by cacharle ### ########.fr */ +/* Updated: 2019/10/25 03:32:43 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -81,6 +81,7 @@ void ft_putchar_fd(char c, int fd); void ft_putstr_fd(char *s, int fd); void ft_putendl_fd(char *s, int fd); void ft_putnbr_fd(int n, int fd); +char *ft_strndup(const char *s1, size_t n); /* ** bonus @@ -96,5 +97,6 @@ void ft_lstclear(t_list **lst, void (*del)(void *)); void ft_lstiter(t_list *lst, void (*f)(void *)); t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)); +void ft_lstpop_front(t_list **lst, void (*del)(void *)); #endif -- cgit From 70b928b3ee9a1de7769531edd82c0b43cf6d4d84 Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 25 Oct 2019 04:08:13 +0200 Subject: Added ft_itoa_base --- ft_itoa_base.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ libft.h | 3 ++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 ft_itoa_base.c diff --git a/ft_itoa_base.c b/ft_itoa_base.c new file mode 100644 index 0000000..9f65422 --- /dev/null +++ b/ft_itoa_base.c @@ -0,0 +1,56 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_itoa_base.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/25 04:00:58 by cacharle #+# #+# */ +/* Updated: 2019/10/25 04:07:42 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +static int nbrlen_radix(long int nbr, int radix) +{ + int counter; + long unsigned int u_nbr; + + if (nbr == 0) + return (1); + counter = 0; + u_nbr = nbr; + if (nbr < 0) + { + counter++; + u_nbr = -nbr; + } + while (u_nbr > 0) + { + u_nbr /= radix; + counter++; + } + return (counter); +} + +char *ft_itoa_base(long int n, char *base) +{ + char *str; + int len; + int radix; + long unsigned int u_nbr; + + radix = ft_strlen(base); + len = nbrlen_radix(n, radix); + if ((str = (char*)malloc(sizeof(char) * (len + 1))) == NULL) + return (NULL); + str[len] = '\0'; + u_nbr = n < 0 ? -n : n; + if (n < 0) + str[0] = '-'; + while (--len >= (n < 0 ? 1 : 0)) + { + str[len] = base[u_nbr % radix]; + u_nbr /= radix; + } + return (str); +} diff --git a/libft.h b/libft.h index 1ba3dda..4a5fa36 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */ -/* Updated: 2019/10/25 03:32:43 by cacharle ### ########.fr */ +/* Updated: 2019/10/25 04:03:57 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -82,6 +82,7 @@ void ft_putstr_fd(char *s, int fd); void ft_putendl_fd(char *s, int fd); void ft_putnbr_fd(int n, int fd); char *ft_strndup(const char *s1, size_t n); +char *ft_itoa_base(long int n, char *base); /* ** bonus -- cgit From 5bf49994b911abc2b8ff3bdb525cdc23c71f2102 Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 5 Nov 2019 22:20:26 +0100 Subject: Added ft_strjoin_free and ft_strjoin_free_snd, Removed ft_itoa_base --- Makefile | 24 +++++++++++++--------- ft_itoa_base.c | 56 --------------------------------------------------- ft_strjoin_free.c | 35 ++++++++++++++++++++++++++++++++ ft_strjoin_free_snd.c | 29 ++++++++++++++++++++++++++ libft.h | 11 ++++++++-- 5 files changed, 87 insertions(+), 68 deletions(-) delete mode 100644 ft_itoa_base.c create mode 100644 ft_strjoin_free.c create mode 100644 ft_strjoin_free_snd.c diff --git a/Makefile b/Makefile index 9dca309..f713b34 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: cacharle +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2019/10/25 03:31:58 by cacharle ### ########.fr # +# Updated: 2019/11/05 22:16:32 by cacharle ### ########.fr # # # # **************************************************************************** # @@ -17,15 +17,19 @@ CC = gcc CCFLAGS = -Wall -Wextra -Werror NAME = libft.a -SRC = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c ft_isdigit.c ft_isprint.c \ - ft_itoa.c ft_memalloc.c ft_memccpy.c ft_memchr.c ft_memcmp.c ft_memcpy.c ft_memdel.c \ - ft_memmove.c ft_memset.c ft_putchar.c ft_putchar_fd.c ft_putendl.c ft_putendl_fd.c \ - ft_putnbr.c ft_putnbr_fd.c ft_putstr.c ft_putstr_fd.c ft_strcat.c ft_strchr.c \ - ft_strclr.c ft_strcmp.c ft_strcpy.c ft_strdel.c ft_strdup.c ft_strequ.c ft_striter.c \ - ft_striteri.c ft_strjoin.c ft_strlcat.c ft_strlen.c ft_strmap.c ft_strmapi.c \ - ft_strncat.c ft_strncmp.c ft_strncpy.c ft_strnequ.c ft_strnew.c ft_strnstr.c \ - ft_strrchr.c ft_split.c ft_strstr.c ft_substr.c ft_strtrim.c ft_tolower.c \ - ft_toupper.c ft_strlcpy.c ft_calloc.c ft_strndup.c +SRC = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c ft_isdigit.c \ + ft_isprint.c ft_itoa.c ft_memalloc.c ft_memccpy.c ft_memchr.c \ + ft_memcmp.c ft_memcpy.c ft_memdel.c ft_memmove.c ft_memset.c \ + ft_putchar.c ft_putchar_fd.c ft_putendl.c ft_putendl_fd.c \ + ft_putnbr.c ft_putnbr_fd.c ft_putstr.c ft_putstr_fd.c ft_strcat.c \ + ft_strchr.c ft_strclr.c ft_strcmp.c ft_strcpy.c ft_strdel.c \ + ft_strdup.c ft_strequ.c ft_striter.c ft_striteri.c ft_strjoin.c \ + ft_strlcat.c ft_strlen.c ft_strmap.c ft_strmapi.c ft_strncat.c \ + ft_strncmp.c ft_strncpy.c ft_strnequ.c ft_strnew.c ft_strnstr.c \ + ft_strrchr.c ft_split.c ft_strstr.c ft_substr.c ft_strtrim.c \ + ft_tolower.c ft_toupper.c ft_strlcpy.c ft_calloc.c ft_strndup.c \ + ft_strjoin_free.c ft_strjoin_free_snd.c + OBJ = $(SRC:.c=.o) INCLUDE = libft.h diff --git a/ft_itoa_base.c b/ft_itoa_base.c deleted file mode 100644 index 9f65422..0000000 --- a/ft_itoa_base.c +++ /dev/null @@ -1,56 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_itoa_base.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/10/25 04:00:58 by cacharle #+# #+# */ -/* Updated: 2019/10/25 04:07:42 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - -static int nbrlen_radix(long int nbr, int radix) -{ - int counter; - long unsigned int u_nbr; - - if (nbr == 0) - return (1); - counter = 0; - u_nbr = nbr; - if (nbr < 0) - { - counter++; - u_nbr = -nbr; - } - while (u_nbr > 0) - { - u_nbr /= radix; - counter++; - } - return (counter); -} - -char *ft_itoa_base(long int n, char *base) -{ - char *str; - int len; - int radix; - long unsigned int u_nbr; - - radix = ft_strlen(base); - len = nbrlen_radix(n, radix); - if ((str = (char*)malloc(sizeof(char) * (len + 1))) == NULL) - return (NULL); - str[len] = '\0'; - u_nbr = n < 0 ? -n : n; - if (n < 0) - str[0] = '-'; - while (--len >= (n < 0 ? 1 : 0)) - { - str[len] = base[u_nbr % radix]; - u_nbr /= radix; - } - return (str); -} diff --git a/ft_strjoin_free.c b/ft_strjoin_free.c new file mode 100644 index 0000000..18ce83d --- /dev/null +++ b/ft_strjoin_free.c @@ -0,0 +1,35 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strjoin_free.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/11/05 21:32:48 by cacharle #+# #+# */ +/* Updated: 2019/11/05 22:17:03 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include "libft.h" + +char *ft_strjoin_free(char const *s1, char const *s2, int free_nb) +{ + char *joined; + + if (s1 == NULL || s2 == NULL) + return (NULL); + if ((joined = (char*)malloc(sizeof(char) + * (ft_strlen(s1) + ft_strlen(s2) + 1))) == NULL) + return (NULL); + joined = ft_strcpy(joined, s1); + joined = ft_strcat(joined, s2); + if (free_nb == 1) + free((void*)s1); + if (free_nb == 2) + { + free((void*)s1); + free((void*)s2); + } + return (joined); +} diff --git a/ft_strjoin_free_snd.c b/ft_strjoin_free_snd.c new file mode 100644 index 0000000..46e36ae --- /dev/null +++ b/ft_strjoin_free_snd.c @@ -0,0 +1,29 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strjoin_free_snd.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/11/05 22:12:56 by cacharle #+# #+# */ +/* Updated: 2019/11/05 22:17:15 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include "libft.h" + +char *ft_strjoin_free_snd(char const *s1, char const *s2) +{ + char *joined; + + if (s1 == NULL || s2 == NULL) + return (NULL); + if ((joined = (char*)malloc(sizeof(char) + * (ft_strlen(s1) + ft_strlen(s2) + 1))) == NULL) + return (NULL); + joined = ft_strcpy(joined, s1); + joined = ft_strcat(joined, s2); + free((void*)s2); + return (joined); +} diff --git a/libft.h b/libft.h index 4a5fa36..7303028 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */ -/* Updated: 2019/10/25 04:03:57 by cacharle ### ########.fr */ +/* Updated: 2019/11/05 22:19:15 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -82,7 +82,6 @@ void ft_putstr_fd(char *s, int fd); void ft_putendl_fd(char *s, int fd); void ft_putnbr_fd(int n, int fd); char *ft_strndup(const char *s1, size_t n); -char *ft_itoa_base(long int n, char *base); /* ** bonus @@ -100,4 +99,12 @@ t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)); void ft_lstpop_front(t_list **lst, void (*del)(void *)); +/* +** added +*/ + +char *ft_strjoin_free(char const *s1, char const *s2, + int free_nb); +char *ft_strjoin_free_snd(char const *s1, char const *s2); + #endif -- cgit