Merge branch 'master' into ft_ssl

1 files changed, 25 insertions, 2 deletions

diff --git a/include/libft_str.h b/include/libft_str.h
index fca5fbc..571cda0 100644
--- a/include/libft_str.h
+++ b/include/libft_str.h
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/01/31 10:39:22 by cacharle          #+#    #+#             */
-/*   Updated: 2020/08/01 18:55:31 by charles          ###   ########.fr       */
+/*   Updated: 2020/08/02 10:52:36 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,9 @@
 # define LIBFT_STR_H
 
 # include <stddef.h>
+# include <stdbool.h>
 # include "libft_ctype.h"
+# include "libft_mem.h"
 
 typedef enum
 {
@@ -50,8 +52,10 @@ int		ft_atoi(const char *nptr);
 
 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_strsub(char const *s, size_t start, size_t len);
+char	*ft_strsubf(char const *s, size_t start, size_t len);
 char	*ft_strjoin(char const *s1, char const *s2);
+char	*ft_strjoin3(char const *s1, char const *s2, char const *s3);
 char	*ft_strjoinf(char const *s1, char const *s2, t_ftstrjoinf_tag tag);
 char	*ft_strtrim(char const *s1, char const *set);
 char	**ft_split(char const *s, char c);
@@ -59,6 +63,8 @@ int		ft_strcount(char *str, char c);
 char	*ft_itoa(int n);
 int		ft_atoi_strict(const char *s);
 long	ft_strtol(const char *s, char **endptr, int base);
+float	ft_strtof(const char *nptr, char **endptr);
+float	ft_atof(const char *nptr);
 int		ft_strcasecmp(const char *s1, const char *s2);
 int		ft_strncasecmp(const char *s1, const char *s2, size_t n);
 size_t	ft_strspn(const char *s, const char *charset);
@@ -73,6 +79,23 @@ int		ft_strnequ(char const *s1, char const *s2, size_t n);
 char	*ft_strtolower(char *s);
 char	*ft_strtoupper(char *s);
 char	*ft_strnew(size_t size);
+char	*ft_strcat3(char *dest, const char *src1, const char *src2);
+char	*ft_strmove(char *dest, const char *src);
+
+/*
+** glob
+*/
+
+bool	ft_fnmatch(const char *pattern, const char *string);
+
+/*
+** NULL terminated string array
+*/
+
+char	*ft_strsjoin(char **strs, char *delim);
+char	*ft_strsjoinf(char **strs, char *delim);
+void	*ft_strsdestroy(char **strs);
+size_t	ft_strslen(char **strs);
 
 /*
 ** bloat ?