1 files changed, 68 insertions, 45 deletions
diff --git a/ft_strsplit.c b/ft_strsplit.c
index 2002add..3b80bfb 100644
--- a/ft_strsplit.c
+++ b/ft_strsplit.c
@@ -1,54 +1,77 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strsplit.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/10/07 10:22:09 by cacharle          #+#    #+#             */
+/*   Updated: 2019/10/07 11:11:15 by cacharle         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include <stdlib.h>
 
-static size_t   count_segment(char const *s, char c)
+static size_t	count_segment(char const *s, char c)
+{
+	size_t	counter;
+
+	counter = 0;
+	while (*s)
+	{
+		if (*s == c)
+		{
+			s++;
+			continue ;
+		}
+		counter++;
+		while (*s && *s != c)
+			s++;
+	}
+	return (counter);
+}
+
+static char		*ft_strndup(const char *s1, size_t n)
 {
-    size_t  counter;
+	char	*clone;
+	size_t	i;
 
-    counter = 0;
-    while (*s)
-    {
-        if (*s == c)
-        {
-            s++;
-            continue ;
-        }
-        counter++;
-        while (*s && *s != c)
-            s++;
-    }
-    return (counter);
+	if ((clone = (char*)malloc(sizeof(char) * (n + 1))) == NULL)
+		return (NULL);
+	i = 0;
+	while (i < n)
+	{
+		clone[i] = s1[i];
+		i++;
+	}
+	clone[i] = '\0';
+	return (clone);
 }
 
-char    **ft_strsplit(char const *s, char c)
+char			**ft_strsplit(char const *s, char c)
 {
-    char    **strs;
-    char    *tmp;
-    size_t  size;
-    size_t  i;
-    size_t  j;
+	char	**strs;
+	size_t	size;
+	size_t	i;
+	size_t	j;
 
-    size = count_segment(s, c);
-    if ((strs = (char**)malloc(sizeof(char*) * (size + 1))) == NULL)
-        return (NULL);
-    j = 0;
-    while (*s)
-    {
-        if (*s == c)
-        {
-            s++;
-            continue ;
-        }
-        i = 0;
-        while (s[i] && s[i] != c)
-            i++;
-        if ((tmp = (char*)malloc(sizeof(char) * (i + 1))) == NULL)
-            return (NULL);
-        i = 0;
-        while (*s && *s != c)
-            tmp[i++] = *s++;
-        tmp[i] = '\0';
-        strs[j++] = tmp;
-    }
-    strs[j] = 0;
-    return (strs);
+	size = count_segment(s, c);
+	if ((strs = (char**)malloc(sizeof(char*) * (size + 1))) == NULL)
+		return (NULL);
+	j = 0;
+	while (*s)
+	{
+		if (*s == c)
+		{
+			s++;
+			continue ;
+		}
+		i = 0;
+		while (s[i] && s[i] != c)
+			i++;
+		strs[j++] = ft_strndup(s, i);
+		s += i;
+	}
+	strs[j] = 0;
+	return (strs);
 }