sync

C_07/git/ex03/ft_strjoin.c

@@ -6,7 +6,7 @@
 /*   By: gbaconni <gbaconni@42lausanne.ch>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/08/19 11:25:51 by gbaconni          #+#    #+#             */
-/*   Updated: 2021/08/19 17:54:51 by gbaconni         ###   ########.fr       */
+/*   Updated: 2021/08/20 09:52:49 by gbaconni         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,8 +19,40 @@ static int	ft_strlen(char *str)
 	int	len;
 
 	len = 0;
-	while (str[len++] != '\0')
-		continue ;
+	while (str[len] != '\0')
+		len++;
+	return (len);
+}
+
+char	*ft_strcat(char *dest, char *src)
+{
+	char			*s1;
+	char			*s2;
+
+	s1 = dest;
+	s2 = src;
+	while (*s1 != '\0')
+		s1++;
+	while (*s2 != '\0')
+		*s1++ = *s2++;
+	*s1 = '\0';
+	return (dest);
+}
+
+int	ft_strslen(int size, char **strs, char *sep)
+{
+	int		len;
+	int		i;
+
+	len = 1;
+	i = 0;
+	while (i < size)
+	{
+		len += ft_strlen(strs[i]);
+		if (i < size - 1)
+			len += ft_strlen(sep);
+		i++;
+	}
 	return (len);
 }
 
@@ -30,20 +62,18 @@ char	*ft_strjoin(int size, char **strs, char *sep)
 	int		len;
 	int		i;
 
-	len = 0;
-	len = strlen(sep);
-	printf("strlen %d", len);
-	len = 0;
-	len = ft_strlen(sep);
-	printf("ft_strlen %d", len);
-	len = 0;
+	if (strs == NULL)
+		return (NULL);
+	len = ft_strslen(size, strs, sep);
+	str = (char *) malloc(len * sizeof(char));
 	i = 0;
 	while (i < size)
 	{
-		len += ft_strlen(strs[i]) - 1;
-		len += ft_strlen(sep) - 1;
+		ft_strcat(str, strs[i]);
+		if (i < size - 1)
+			ft_strcat(str, sep);
+		i++;
 	}
-	printf("len=%d\n", len);
-	str = (char *) malloc(len * sizeof(char));
+	strs[i] = "\0";
 	return (str);
 }