Added ft_strsjoin, ft_strsjoinf, ft_compar_str, ft_vecsort, ft_vecpush_safe

6 files changed, 137 insertions, 5 deletions

diff --git a/src/algo/ft_compar_str.c b/src/algo/ft_compar_str.c
new file mode 100644
index 0000000..0d3e6ff
--- /dev/null
+++ b/src/algo/ft_compar_str.c
@@ -0,0 +1,18 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_compar_str.c                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/04 15:44:24 by charles           #+#    #+#             */
+/*   Updated: 2020/04/04 15:46:28 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_algo.h"
+
+int	ft_compar_str(const void *s1_p, const void *s2_p)
+{
+	return (ft_strcmp(*(const char**)s1_p, *(const char**)s2_p));
+}
diff --git a/src/str/ft_strsep.c b/src/str/ft_strsep.c
index 2000706..50197fb 100644
--- a/src/str/ft_strsep.c
+++ b/src/str/ft_strsep.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/10 04:44:11 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/10 04:51:15 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/04 12:48:24 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,13 +15,18 @@
 char	*ft_strsep(char **stringp, const char *delim)
 {
 	char	*tmp;
+	char	*origin;
 
-	if (stringp == NULL || *stringp == NULL || delim == NULL)
+	if (*stringp == NULL)
 		return (NULL);
+	origin = *stringp;
 	tmp = ft_strpbrk(*stringp, delim);
 	if (tmp == NULL)
-		return (NULL);
+	{
+		*stringp = NULL;
+		return (origin);
+	}
 	*tmp = '\0';
-	*stringp = tmp;
-	return (tmp);
+	*stringp = tmp + 1;
+	return (origin);
 }
diff --git a/src/str/ft_strsjoin.c b/src/str/ft_strsjoin.c
new file mode 100644
index 0000000..507903b
--- /dev/null
+++ b/src/str/ft_strsjoin.c
@@ -0,0 +1,42 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strsjoin.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/04 14:30:08 by charles           #+#    #+#             */
+/*   Updated: 2020/04/04 14:45:58 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_str.h"
+
+char	*ft_strsjoin(char **strs, char *delim)
+{
+	int		i;
+	size_t	join_len;
+	size_t	delim_len;
+	char	*join;
+
+	delim_len = ft_strlen(delim);
+	join_len = 0;
+	i = -1;
+	while (strs[++i] != NULL)
+	{
+		join_len += ft_strlen(strs[i]);
+		if (strs[i + 1] != NULL)
+			join_len += delim_len;
+	}
+	if ((join = (char*)malloc(sizeof(char) * (join_len + 1))) == NULL)
+		return (NULL);
+	join[0] = '\0';
+	i = -1;
+	while (strs[++i] != NULL)
+	{
+		ft_strcat(join, strs[i]);
+		if (strs[i + 1] != NULL)
+			ft_strcat(join, delim);
+	}
+	return (join);
+}
diff --git a/src/str/ft_strsjoinf.c b/src/str/ft_strsjoinf.c
new file mode 100644
index 0000000..f5077c1
--- /dev/null
+++ b/src/str/ft_strsjoinf.c
@@ -0,0 +1,22 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strsjoinf.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/04 14:27:33 by charles           #+#    #+#             */
+/*   Updated: 2020/04/04 14:29:49 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_str.h"
+
+char	*ft_strsjoinf(char **strs, char *delim)
+{
+	char	*ret;
+
+	ret = ft_strsjoin(strs, delim);
+	ft_split_destroy(strs);
+	return (ret);
+}
diff --git a/src/vec/ft_vecpush_safe.c b/src/vec/ft_vecpush_safe.c
new file mode 100644
index 0000000..8e5a8d4
--- /dev/null
+++ b/src/vec/ft_vecpush_safe.c
@@ -0,0 +1,27 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_vecpush_safe.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/04 13:29:48 by charles           #+#    #+#             */
+/*   Updated: 2020/04/04 14:24:19 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_vec.h"
+
+/*
+** \brief     Wrapper around ft_vecpush which reject null element
+** \param vec  Pushed vector
+** \param pushed  Element pushed which can't be NULL
+** \return        NULL if pushed is NULL, whatever ft_vecpush returns otherwise
+*/
+
+t_ftvec		*ft_vecpush_safe(t_ftvec *vec, void *pushed)
+{
+	if (pushed == NULL)
+		return (NULL);
+	return (ft_vecpush(vec, pushed));
+}
diff --git a/src/vec/ft_vecsort.c b/src/vec/ft_vecsort.c
new file mode 100644
index 0000000..99b1a5f
--- /dev/null
+++ b/src/vec/ft_vecsort.c
@@ -0,0 +1,18 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_vecsort.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/04 15:53:23 by charles           #+#    #+#             */
+/*   Updated: 2020/04/04 15:55:21 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_vec.h"
+
+void	ft_vecsort(t_ftvec *vec, t_ftcompar_func cmp)
+{
+	ft_qsort(vec->data, vec->size, sizeof(void*), cmp);
+}