Splited include like src/, Adding feature toggle protection in header

9 files changed, 268 insertions, 138 deletions

diff --git a/include/ft_ctype.h b/include/ft_ctype.h
new file mode 100644
index 0000000..44e88b8
--- /dev/null
+++ b/include/ft_ctype.h
@@ -0,0 +1,35 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_ctype.h                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/01/17 09:59:10 by cacharle          #+#    #+#             */
+/*   Updated: 2020/01/17 10:00:13 by cacharle         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef FT_CTYPE_H
+# define FT_CTYPE_H
+
+/*
+** assertion
+*/
+
+int	ft_isalpha(int c);
+int	ft_isdigit(int c);
+int	ft_isalnum(int c);
+int	ft_isascii(int c);
+int	ft_isprint(int c);
+int	ft_isspace(int c);
+
+/*
+** conversion
+*/
+
+int	ft_toupper(int c);
+int	ft_tolower(int c);
+int	ft_todigit(int c);
+
+#endif
diff --git a/include/get_next_line.h b/include/ft_get_next_line.h
index 9d15202..03bf344 100644
--- a/include/get_next_line.h
+++ b/include/ft_get_next_line.h
@@ -6,20 +6,20 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/10/09 13:52:59 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/15 07:22:07 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/01/17 10:53:43 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#ifndef GET_NEXT_LINE_H
-# define GET_NEXT_LINE_H
+#ifndef FT_GET_NEXT_LINE_H
+# define FT_GET_NEXT_LINE_H
 
 # include <unistd.h>
 # include <stdlib.h>
 # include <limits.h>
 # include "libft.h"
 
-# ifndef BUFFER_SIZE
-#  define BUFFER_SIZE 32
+# ifndef GNL_BUFFER_SIZE
+#  define GNL_BUFFER_SIZE 32
 # endif
 
 # define GNL_STATUS_LINE 1
diff --git a/include/ft_io.h b/include/ft_io.h
new file mode 100644
index 0000000..8c633fb
--- /dev/null
+++ b/include/ft_io.h
@@ -0,0 +1,25 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_io.h                                            :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/01/17 09:47:14 by cacharle          #+#    #+#             */
+/*   Updated: 2020/01/17 10:07:47 by cacharle         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef FT_IO_H
+# define FT_IO_H
+
+void	ft_putendl(char *s);
+void	ft_putchar(char c);
+void	ft_putstr(char const *s);
+void	ft_putnbr(int n);
+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);
+
+#endif
diff --git a/include/ft_lst.h b/include/ft_lst.h
new file mode 100644
index 0000000..134df71
--- /dev/null
+++ b/include/ft_lst.h
@@ -0,0 +1,36 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_lst.h                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/01/17 09:58:02 by cacharle          #+#    #+#             */
+/*   Updated: 2020/01/17 09:58:45 by cacharle         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef FT_LST_H
+# define FT_LST_H
+
+typedef struct		s_list
+{
+	void			*content;
+	struct s_list	*next;
+}					t_list;
+
+t_list				*ft_lstnew(void const *content);
+void				ft_lstadd_front(t_list **alst, t_list *new);
+int					ft_lstsize(t_list *lst);
+t_list				*ft_lstlast(t_list *lst);
+void				ft_lstadd_back(t_list **alst, t_list *new);
+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 *lst, void *(*f)(void *),
+								void (*del)(void *));
+void				ft_lstpop_front(t_list **lst, void (*del)(void *));
+t_list				*ft_lstreverse_ret(t_list *lst);
+void				ft_lstreverse(t_list **lst);
+
+#endif
diff --git a/include/ft_mem.h b/include/ft_mem.h
new file mode 100644
index 0000000..d1e47f6
--- /dev/null
+++ b/include/ft_mem.h
@@ -0,0 +1,31 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_mem.h                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/01/17 09:56:20 by cacharle          #+#    #+#             */
+/*   Updated: 2020/01/17 09:57:54 by cacharle         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef FT_MEM_H
+# define FT_MEM_H
+
+void				ft_bzero(void *s, size_t n);
+void				*ft_memset(void *s, int c, size_t n);
+void				*ft_memcpy(void *dest, const void *src, size_t n);
+void				*ft_memccpy(void *dest, const void *src, int c, size_t n);
+void				*ft_memmove(void *dst, const void *src, size_t len);
+void				*ft_memchr(const void *s, int c, size_t n);
+int					ft_memcmp(const void *s1, const void *s2, size_t n);
+void				*ft_calloc(size_t count, size_t size);
+
+/*
+** bloat ?
+*/
+
+void				ft_memdel(void **ap);
+
+#endif
diff --git a/include/ft_printf.h b/include/ft_printf.h
new file mode 100644
index 0000000..615039b
--- /dev/null
+++ b/include/ft_printf.h
@@ -0,0 +1,27 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_printf.h                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/01/17 10:05:59 by cacharle          #+#    #+#             */
+/*   Updated: 2020/01/17 10:10:18 by cacharle         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef FT_PRINTF_H
+# define FT_PRINTF_H
+
+int	ft_printf(const char *format, ...);
+int	ft_sprintf(char *str, const char *format, ...);
+int	ft_snprintf(char *str, size_t size, const char *format, ...);
+int	ft_asprintf(char **ret, const char *format, ...);
+int	ft_dprintf(int fd, const char *format, ...);
+int	ft_vprintf(const char *format, va_list ap);
+int	ft_vsprintf(char *str, const char *format, va_list ap);
+int	ft_vsnprintf(char *str, size_t size, const char *format, va_list ap);
+int	ft_vasprintf(char **ret, const char *format, va_list ap);
+int	ft_vdprintf(int fd, const char *format, va_list ap);
+
+#endif
diff --git a/include/ft_str.h b/include/ft_str.h
new file mode 100644
index 0000000..105da79
--- /dev/null
+++ b/include/ft_str.h
@@ -0,0 +1,66 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_str.h                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/01/17 09:50:14 by cacharle          #+#    #+#             */
+/*   Updated: 2020/01/17 10:22:38 by cacharle         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef FT_STR_H
+# define FT_STR_H
+
+/*
+** std
+*/
+
+size_t	ft_strlen(const char *s);
+char	*ft_strcpy(char *dest, const char *src);
+char	*ft_strncpy(char *dest, const char *src, size_t n);
+char	*ft_strdup(const char *s);
+char	*ft_strndup(const char *s1, size_t n);
+char	*ft_strcat(char *dest, const char *src);
+char	*ft_strncat(char *dest, const char *src, size_t n);
+size_t	ft_strlcat(char *dst, const char *src, size_t size);
+size_t	ft_strlcpy(char *dst, const char *src, size_t size);
+char	*ft_strchr(const char *s, int c);
+char	*ft_strrchr(const char *s, int c);
+char	*ft_strstr(const char *haystack, const char *needle);
+char	*ft_strnstr(const char *haystack, const char *needle, size_t len);
+int		ft_strcmp(const char *s1, const char *s2);
+int		ft_strncmp(const char *s1, const char *s2, size_t n);
+int		ft_atoi(const char *nptr);
+
+/*
+** extra
+*/
+
+void	ft_striter(char *s, void (*f)(char *));
+void	ft_striteri(char *s, void (*f)(unsigned int, char *));
+char	*ft_substr(char const *s, unsigned int start, size_t len);
+char	*ft_strjoin(char const *s1, char const *s2);
+char	*ft_strtrim(char const *s1, char const *set);
+char	**ft_split(char const *s, char c);
+char	*ft_strjoin_free(char const *s1, char const *s2, int free_nb);
+char	*ft_strjoin_free_snd(char const *s1, char const *s2);
+int		ft_strcount(char *str, char c);
+char	*ft_itoa(int n);
+int		ft_strict_atoi(const char *s);
+long	ft_strtol(const char *s, char **endptr, int base);
+
+/*
+** bloat ?
+*/
+
+char	*ft_strnew(size_t size);
+void	ft_strdel(char **as);
+void	ft_strclr(char *s);
+char	*ft_strmap(char const *s, char (*f)(char));
+char	*ft_strmapi(char *s, char (*f)(unsigned int, char));
+int		ft_strequ(char const *s1, char const *s2);
+int		ft_strnequ(char const *s1, char const *s2, size_t n);
+
+#endif
diff --git a/include/ft_types.h b/include/ft_types.h
new file mode 100644
index 0000000..948e33d
--- /dev/null
+++ b/include/ft_types.h
@@ -0,0 +1,26 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_types.h                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/01/17 09:59:15 by cacharle          #+#    #+#             */
+/*   Updated: 2020/01/17 10:16:14 by cacharle         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef FT_TYPES_H
+# define FT_TYPES_H
+
+typedef unsigned char		t_ftbyte;
+typedef int					t_ftbool;
+
+typedef char				t_ftchar;
+typedef unsigned char		t_ftuchar;
+typedef int					t_ftint;
+typedef unsigned int		t_ftuint;
+typedef long int			t_ftlong;
+typedef unsigned long int	t_ftulong;
+
+#endif
diff --git a/include/libft.h b/include/libft.h
index d7dc175..0b4d608 100644
--- a/include/libft.h
+++ b/include/libft.h
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/10/07 09:45:02 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/16 10:25:57 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/01/17 10:51:40 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,148 +18,32 @@
 # include <stdlib.h>
 # include <stddef.h>
 # include <limits.h>
-
 # include <errno.h>
 
+# include "ft_types.h"
+# include "ft_ctype.h"
+# include "ft_io.h"
+# include "ft_mem.h"
+# include "ft_str.h"
+
+# ifdef FT_FEATURES_FT_LST
+#  include "ft_lst.h"
+# endif
+
+# ifdef FT_FEATURES_FT_GET_NEXT_LINE
+#  include "ft_get_next_line.h"
+# endif
 
-# include "get_next_line.h"
+# ifdef FT_FEATURES_FT_PRINTF
+#  include "ft_printf.h"
+# endif
 
 # ifdef __linux__
 #  include <stdio.h>
 #  define OPEN_MAX FOPEN_MAX
 # endif
 
-# define MIN(x, y) ((x) < (y) ? (x) : (y))
-# define MAX(x, y) ((x) > (y) ? (x) : (y))
-
-typedef unsigned char	t_byte;
-typedef int				t_bool;
-
 # define TRUE 1
 # define FALSE 0
 
-/*
-** ctype
-*/
-
-int					ft_isalpha(int c);
-int					ft_isdigit(int c);
-int					ft_isalnum(int c);
-int					ft_isascii(int c);
-int					ft_isprint(int c);
-int					ft_isspace(int c);
-int					ft_toupper(int c);
-int					ft_tolower(int c);
-int					ft_todigit(int c);
-
-/*
-** io
-*/
-
-void				ft_putendl(char *s);
-void				ft_putchar(char c);
-void				ft_putstr(char const *s);
-void				ft_putnbr(int n);
-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);
-int					ft_printf(const char *format, ...);
-int					ft_sprintf(char *str, const char *format, ...);
-int					ft_snprintf(char *str, size_t size,
-								const char *format, ...);
-int					ft_asprintf(char **ret, const char *format, ...);
-int					ft_dprintf(int fd, const char *format, ...);
-
-int					ft_vprintf(const char *format, va_list ap);
-int					ft_vsprintf(char *str, const char *format, va_list ap);
-int					ft_vsnprintf(char *str, size_t size, const char *format,
-								va_list ap);
-int					ft_vasprintf(char **ret, const char *format, va_list ap);
-int					ft_vdprintf(int fd, const char *format, va_list ap);
-
-/*
-** lst
-*/
-
-typedef struct		s_list
-{
-	void			*content;
-	struct s_list	*next;
-}					t_list;
-
-t_list				*ft_lstnew(void const *content);
-void				ft_lstadd_front(t_list **alst, t_list *new);
-int					ft_lstsize(t_list *lst);
-t_list				*ft_lstlast(t_list *lst);
-void				ft_lstadd_back(t_list **alst, t_list *new);
-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 *lst, void *(*f)(void *),
-								void (*del)(void *));
-void				ft_lstpop_front(t_list **lst, void (*del)(void *));
-t_list				*ft_lstreverse_ret(t_list *lst);
-void				ft_lstreverse(t_list **lst);
-
-/*
-** mem
-*/
-
-void				*ft_memset(void *s, int c, size_t n);
-void				ft_bzero(void *s, size_t n);
-void				*ft_memcpy(void *dest, const void *src, size_t n);
-void				*ft_memccpy(void *dest, const void *src, int c, size_t n);
-void				*ft_memmove(void *dst, const void *src, size_t len);
-void				*ft_memchr(const void *s, int c, size_t n);
-int					ft_memcmp(const void *s1, const void *s2, size_t n);
-
-void				*ft_memalloc(size_t size);
-void				ft_memdel(void **ap);
-void				*ft_calloc(size_t count, size_t size);
-
-/*
-** str
-*/
-
-size_t				ft_strlen(const char *s);
-char				*ft_strdup(const char *s);
-char				*ft_strcpy(char *dest, const char *src);
-char				*ft_strncpy(char *dest, const char *src, size_t n);
-char				*ft_strcat(char *dest, const char *src);
-char				*ft_strncat(char *dest, const char *src, size_t n);
-size_t				ft_strlcat(char *dst, const char *src, size_t size);
-size_t				ft_strlcpy(char *dst, const char *src, size_t size);
-char				*ft_strchr(const char *s, int c);
-char				*ft_strrchr(const char *s, int c);
-char				*ft_strstr(const char *haystack, const char *needle);
-char				*ft_strnstr(const char *haystack,
-								const char *needle, size_t len);
-int					ft_strcmp(const char *s1, const char *s2);
-int					ft_strncmp(const char *s1, const char *s2, size_t n);
-void				ft_striter(char *s, void (*f)(char *));
-void				ft_striteri(char *s, void (*f)(unsigned int, char *));
-int					ft_atoi(const char *nptr);
-
-char				*ft_strnew(size_t size);
-void				ft_strdel(char **as);
-void				ft_strclr(char *s);
-char				*ft_strmap(char const *s, char (*f)(char));
-char				*ft_strmapi(char *s, char (*f)(unsigned int, char));
-int					ft_strequ(char const *s1, char const *s2);
-int					ft_strnequ(char const *s1, char const *s2, size_t n);
-char				*ft_substr(char const *s, unsigned int start, size_t len);
-char				*ft_strjoin(char const *s1, char const *s2);
-char				*ft_strtrim(char const *s1, char const *set);
-char				**ft_split(char const *s, char c);
-
-char				*ft_strjoin_free(char const *s1, char const *s2,
-										int free_nb);
-char				*ft_strjoin_free_snd(char const *s1, char const *s2);
-int					ft_strcount(char *str, char c);
-char				*ft_itoa(int n);
-int					ft_strict_atoi(const char *s);
-long				ft_strtol(const char *s, char **endptr, int base);
-
 #endif