sync

C_09/git_old/ex02/ft_split.c

@@ -6,13 +6,15 @@
 /*   By: gbaconni <gbaconni@42lausanne.ch>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/08/22 18:14:04 by gbaconni          #+#    #+#             */
-/*   Updated: 2021/08/24 13:00:34 by gbaconni         ###   ########.fr       */
+/*   Updated: 2021/08/26 09:53:30 by gbaconni         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include <stdlib.h>
 #include <stdio.h>
 
+int	g_t = 0;
+
 static char	*ft_strncpy(char *dest, char *src, unsigned int n)
 {
 	unsigned int	i;
@@ -28,19 +30,22 @@ static char	*ft_strncpy(char *dest, char *src, unsigned int n)
 		dest[i] = '\0';
 		i++;
 	}
+	dest[i] = '\0';
 	return (dest);
 }
 
 static int	ft_is_charset(char c, char *charset)
 {
-	char	*p_charset;
-	int		r;
+	int			i;
 
-	r = 0;
-	p_charset = charset;
-	while (*p_charset != '\0')
-		r |= (*p_charset++ == c);
-	return (r);
+	i = 0;
+	while (charset[i] != '\0')
+	{
+		if (c == charset[i])
+			return (1);
+		i++;
+	}
+	return (0);
 }
 
 static int	ft_split_len(char *str, char *charset)
@@ -49,6 +54,8 @@ static int	ft_split_len(char *str, char *charset)
 	int		size;
 
 	size = 2;
+	if (str == NULL || charset == NULL)
+		return (size);
 	p_str = str;
 	while (*p_str != '\0')
 	{
@@ -63,6 +70,8 @@ char	*ft_copy(char *str, int size)
 	char	*result;
 
 	result = (char *) malloc((size + 1) * sizeof(char));
+	if (!result)
+		return (NULL);
 	if (size > 0)
 		ft_strncpy(result, str, size);
 	else
@@ -74,24 +83,25 @@ char	**ft_split(char *str, char *charset)
 {
 	char	**strs;
 	char	*start;
-	int		size;
 	int		i;
 
-	size = ft_split_len(str, charset);
-	strs = malloc((size) * sizeof(strs));
+	strs = malloc(ft_split_len(str, charset) * sizeof(strs));
+	if (strs == NULL || charset == NULL || str == NULL)
+		return (NULL);
 	start = str;
 	i = 0;
 	while (1)
 	{
-		if (ft_is_charset(*str, charset) == 1 || *str == '\0')
+		if (ft_is_charset(*str, charset) == 1 || (*str == '\0' && g_t > 0))
 		{
-			size = str - start;
-			if (size > 0)
-				strs[i++] = ft_copy(start, size);
+			if (str - start > 0)
+				strs[i++] = ft_copy(start, str - start);
 			start = str + 1;
-			if (*str == '\0')
-				break ;
 		}
+		else
+			g_t++;
+		if (*str == '\0')
+			break ;
 		str++;
 	}
 	strs[i] = ft_copy(str, 0);

C_09/git_old/ex02/main.c

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

C_09/git_old/ex02/main.sh

@@ -3,7 +3,8 @@ set -e
 rm -f a.out
 #norminette -R CheckForbiddenSourceHeader ft_*.c
 norminette -R CheckForbiddenSourceHeader
+#gcc -Wall -Wextra -Werror -fsanitize=address -g -o a.out *.c
 gcc -Wall -Wextra -Werror -o a.out *.c
 echo $(basename $PWD):
-./a.out
+./a.out "$@"
 rm -f a.out