sync

C_08/Makefile

@@ -11,7 +11,7 @@
 #
 
 clone:
-	@git clone git@vogsphere.42lausanne.ch:vogsphere/intra-uuid-dc28ac79-9ee2-482c-b047-2b9717fad174-3732452 git
+	@git clone git@vogsphere.42lausanne.ch:vogsphere/intra-uuid-8cc1a727-a53a-4b89-8390-43d2c0aaf631-3740340 git
 
 cc:
 	@norminette -R CheckForbiddenSourceHeader

C_08/git/ex00/main.sh

@@ -7,7 +7,7 @@ find . -type f -name '*.c' \! -name 'main.c' -exec \
 norminette -R CheckForbiddenSourceHeader {} \;
 echo
 gcc -Wall -Wextra -Werror -o a.out *.c
-cpp *.c | grep -B3 -A30 -e '[0-9] "main.c" [2-9]' -e '[0-9] "ft_[^"]*" [2-9]'
+#cpp *.c | tail -n 30
 echo
 echo $(basename $PWD):
 ./a.out "$@"

C_08/git/ex01/ft_boolean.h

@@ -6,7 +6,7 @@
 /*   By: gbaconni <gbaconni@42lausanne.ch>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/08/20 10:17:09 by gbaconni          #+#    #+#             */
-/*   Updated: 2021/08/20 12:05:50 by gbaconni         ###   ########.fr       */
+/*   Updated: 2021/08/22 15:41:04 by gbaconni         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 #ifndef FT_BOOLEAN_H
@@ -16,8 +16,8 @@
 
 typedef int	t_bool;
 
-# define TRUE 0
+# define TRUE 1
-# define FALSE 1
+# define FALSE 0
 # define EVEN(nbr) nbr % 2 == 0
 # define EVEN_MSG "I have an even number of arguments.\n"
 # define ODD_MSG "I have an odd number of arguments.\n"

C_08/git/ex01/main.sh

@@ -7,7 +7,7 @@ find . -type f -name '*.c' \! -name 'main.c' -exec \
 norminette -R CheckForbiddenSourceHeader {} \;
 echo
 gcc -Wall -Wextra -Werror -o a.out *.c
-cpp *.c | grep -B3 -A30 -e '[0-9] "main.c" [2-9]' -e '[0-9] "ft_[^"]*" [2-9]'
+#cpp *.c | tail -n 30
 echo
 echo $(basename $PWD):
 ./a.out "$@"

C_08/git/ex02/ft_abs.h

@@ -6,7 +6,7 @@
 /*   By: gbaconni <gbaconni@42lausanne.ch>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/08/20 10:17:09 by gbaconni          #+#    #+#             */
-/*   Updated: 2021/08/20 12:05:50 by gbaconni         ###   ########.fr       */
+/*   Updated: 2021/08/22 15:39:27 by gbaconni         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

C_08/git/ex02/main.sh

@@ -7,7 +7,7 @@ find . -type f -name '*.c' \! -name 'main.c' -exec \
 norminette -R CheckForbiddenSourceHeader {} \;
 echo
 gcc -Wall -Wextra -Werror -o a.out *.c
-cpp *.c | tail -n 30
+#cpp *.c | tail -n 30
 echo
 echo $(basename $PWD):
 ./a.out "$@"

C_08/git/ex03/main.sh

@@ -7,7 +7,7 @@ find . -type f -name '*.c' \! -name 'main.c' -exec \
 norminette -R CheckForbiddenSourceHeader {} \;
 echo
 gcc -Wall -Wextra -Werror -o a.out *.c
-cpp *.c | grep -B3 -A30 -e '[0-9] "main.c" [2-9]' -e '[0-9] "ft_[^"]*" [2-9]'
+#cpp *.c | tail -n 30
 echo
 echo $(basename $PWD):
 ./a.out "$@"

C_08/git/ex04/ft_stock_str.h

@@ -0,0 +1,9 @@
+#ifndef FT_STOCK__STR_H
+# define FT_STOCK__STR_H
+typedef struct	s_stock_str
+{
+	int size;
+	char *str;
+	char *copy;
+}				t_stock_str;
+#endif

C_08/git/ex04/ft_strs_to_tab.c

@@ -0,0 +1,22 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_point.h                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: gbaconni <gbaconni@42lausanne.ch>          +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2021/08/20 10:17:09 by gbaconni          #+#    #+#             */
+/*   Updated: 2021/08/20 12:05:50 by gbaconni         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef FT_POINT_H
+# define FT_POINT_H
+
+typedef struct s_point
+{
+	int	x;
+	int	y;
+}		t_point;
+void	set_point(t_point *point);
+#endif

C_08/git/ex04/main.c

@@ -0,0 +1,25 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   main.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: gbaconni <gbaconni@42lausanne.ch>          +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2021/08/24 14:00:37 by gbaconni          #+#    #+#             */
+/*   Updated: 2021/08/24 14:04:21 by gbaconni         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "ft_stock_str.h"
+
+struct s_stock_str	*ft_strs_to_tab(int ac, char **av);
+
+int	main(void)
+{
+	t_stock_str	*result;
+	char		**av;
+	int			ac;
+
+	result = ft_strs_to_tab(ac, av)
+	return (0);
+}

C_08/git/ex04/main.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+rm -f a.out
+find . -type f -name '*.h' -exec \
+norminette -R CheckDefine {} \;
+find . -type f -name '*.c' \! -name 'main.c' -exec \
+norminette -R CheckForbiddenSourceHeader {} \;
+echo
+gcc -Wall -Wextra -Werror -o a.out *.c
+#cpp *.c | tail -n 30
+echo
+echo $(basename $PWD):
+./a.out "$@"
+rm -f a.out

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++] = ft_copy(start, size);
-				strs[i++] = (char *) malloc((size + 1) * sizeof(char));
+			start = str + 1;
-				ft_strncpy(strs[i], str + start, size);
+			if (*str == '\0')
+				break ;
 		}
-			start = p_str + 1;
+		str++;
 	}
-		p_str++;
+	strs[i] = ft_copy(str, 0);
-	}
-	strs[i] = (char *) malloc(sizeof(char));
-	strs[i][0] = '\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);
 }