sync

C_09/git/ex02/ft_split.c

@@ -6,23 +6,13 @@
 /*   By: gbaconni <gbaconni@42lausanne.ch>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/08/22 18:14:04 by gbaconni          #+#    #+#             */
-/*   Updated: 2021/08/23 18:02:47 by gbaconni         ###   ########.fr       */
+/*   Updated: 2021/08/24 13:00:34 by gbaconni         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include <stdlib.h>
 #include <stdio.h>
 
-static int	ft_strlen(char *str)
-{
-	char	*p_str;
-
-	p_str = str;
-	while (*p_str != '\0')
-		p_str++;
-	return (p_str - str);
-}
-
 static char	*ft_strncpy(char *dest, char *src, unsigned int n)
 {
 	unsigned int	i;
@@ -46,10 +36,10 @@ static int	ft_is_charset(char c, char *charset)
 	char	*p_charset;
 	int		r;
 
-	r = 1;
+	r = 0;
 	p_charset = charset;
 	while (*p_charset != '\0')
-		r &= (*p_charset++ == c);
+		r |= (*p_charset++ == c);
 	return (r);
 }
 
@@ -68,34 +58,42 @@ static int	ft_split_len(char *str, char *charset)
 	return (size);
 }
 
+char	*ft_copy(char *str, int size)
+{
+	char	*result;
+
+	result = (char *) malloc((size + 1) * sizeof(char));
+	if (size > 0)
+		ft_strncpy(result, str, size);
+	else
+		result[0] = '\0';
+	return (result);
+}
+
 char	**ft_split(char *str, char *charset)
 {
 	char	**strs;
-	char	*p_str;
 	char	*start;
 	int		size;
 	int		i;
 
 	size = ft_split_len(str, charset);
 	strs = malloc((size) * sizeof(strs));
-	p_str = str;
 	start = str;
 	i = 0;
-	while (*p_str != '\0')
+	while (1)
 	{
-		if (ft_is_charset(*p_str, charset) == 1)
+		if (ft_is_charset(*str, charset) == 1 || *str == '\0')
 		{
-			size = end - begin;
+			size = str - start;
 			if (size > 0)
-			{
-				strs[i++] = (char *) malloc((size + 1) * sizeof(char));
-				ft_strncpy(strs[i], str + start, size);
-			}
-			start = p_str + 1;
+				strs[i++] = ft_copy(start, size);
+			start = str + 1;
+			if (*str == '\0')
+				break ;
 		}
-		p_str++;
+		str++;
 	}
-	strs[i] = (char *) malloc(sizeof(char));
-	strs[i][0] = '\0';
+	strs[i] = ft_copy(str, 0);
 	return (strs);
 }

C_09/git/ex02/main.c

@@ -6,7 +6,7 @@
 /*   By: gbaconni <gbaconni@42lausanne.ch>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/08/18 10:50:59 by gbaconni          #+#    #+#             */
-/*   Updated: 2021/08/23 16:17:56 by gbaconni         ###   ########.fr       */
+/*   Updated: 2021/08/24 11:56:21 by gbaconni         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,13 +21,20 @@ int	main(void)
 {
 	char	str[32];
 	char	charset[32];
-	char	**result;
+	char	**strs;
+	int		i;
 
 	printf("Input String [Max 32]: ");
 	scanf("%s", str);
 	printf("Input Charset [Max 32]: ");
 	scanf("%s", charset);
-	result = ft_split(str, charset);
+	strs = ft_split(str, charset);
 	printf("str=%s charset=%s (ft_split)\n", str, charset);
+	i = 0;
+	while (strs[i][0] != '\0')
+	{
+		printf("strs[%d] = %s\n", i, strs[i]);
+		i++;
+	}
 	return (0);
 }