From 4bba30bd826ce07e76110698db45c41d06866525 Mon Sep 17 00:00:00 2001 From: Guy Baconniere Date: Tue, 24 Aug 2021 15:04:25 +0200 Subject: [PATCH] sync --- C_08/Makefile | 2 +- C_08/git/ex00/main.sh | 2 +- C_08/git/ex01/ft_boolean.h | 6 ++-- C_08/git/ex01/main.sh | 2 +- C_08/git/ex02/ft_abs.h | 2 +- C_08/git/ex02/main.sh | 2 +- C_08/git/ex03/main.sh | 2 +- C_08/git/ex04/ft_stock_str.h | 9 ++++++ C_08/git/ex04/ft_strs_to_tab.c | 22 +++++++++++++++ C_08/git/ex04/main.c | 25 +++++++++++++++++ C_08/git/ex04/main.sh | 14 +++++++++ C_09/c-09.tar | Bin 0 -> 22528 bytes C_09/git/ex02/ft_split.c | 50 ++++++++++++++++----------------- C_09/git/ex02/main.c | 13 +++++++-- 14 files changed, 113 insertions(+), 38 deletions(-) create mode 100644 C_08/git/ex04/ft_stock_str.h create mode 100644 C_08/git/ex04/ft_strs_to_tab.c create mode 100644 C_08/git/ex04/main.c create mode 100755 C_08/git/ex04/main.sh create mode 100644 C_09/c-09.tar diff --git a/C_08/Makefile b/C_08/Makefile index 540f66a..e90b16f 100644 --- a/C_08/Makefile +++ b/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 diff --git a/C_08/git/ex00/main.sh b/C_08/git/ex00/main.sh index 6cef7f3..9db2b06 100755 --- a/C_08/git/ex00/main.sh +++ b/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 "$@" diff --git a/C_08/git/ex01/ft_boolean.h b/C_08/git/ex01/ft_boolean.h index 5de3a87..bab5db9 100644 --- a/C_08/git/ex01/ft_boolean.h +++ b/C_08/git/ex01/ft_boolean.h @@ -6,7 +6,7 @@ /* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 FALSE 1 +# define TRUE 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" diff --git a/C_08/git/ex01/main.sh b/C_08/git/ex01/main.sh index 6cef7f3..9db2b06 100755 --- a/C_08/git/ex01/main.sh +++ b/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 "$@" diff --git a/C_08/git/ex02/ft_abs.h b/C_08/git/ex02/ft_abs.h index e7adcfe..e9e3113 100644 --- a/C_08/git/ex02/ft_abs.h +++ b/C_08/git/ex02/ft_abs.h @@ -6,7 +6,7 @@ /* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/C_08/git/ex02/main.sh b/C_08/git/ex02/main.sh index 8a278eb..9db2b06 100755 --- a/C_08/git/ex02/main.sh +++ b/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 "$@" diff --git a/C_08/git/ex03/main.sh b/C_08/git/ex03/main.sh index 6cef7f3..9db2b06 100755 --- a/C_08/git/ex03/main.sh +++ b/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 "$@" diff --git a/C_08/git/ex04/ft_stock_str.h b/C_08/git/ex04/ft_stock_str.h new file mode 100644 index 0000000..c35e1b9 --- /dev/null +++ b/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 diff --git a/C_08/git/ex04/ft_strs_to_tab.c b/C_08/git/ex04/ft_strs_to_tab.c new file mode 100644 index 0000000..4ebbbc1 --- /dev/null +++ b/C_08/git/ex04/ft_strs_to_tab.c @@ -0,0 +1,22 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_point.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* 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 diff --git a/C_08/git/ex04/main.c b/C_08/git/ex04/main.c new file mode 100644 index 0000000..8f46011 --- /dev/null +++ b/C_08/git/ex04/main.c @@ -0,0 +1,25 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* main.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* 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); +} diff --git a/C_08/git/ex04/main.sh b/C_08/git/ex04/main.sh new file mode 100755 index 0000000..9db2b06 --- /dev/null +++ b/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 diff --git a/C_09/c-09.tar b/C_09/c-09.tar new file mode 100644 index 0000000000000000000000000000000000000000..f882ff45013d0c25977a4e35b2319a334a2969f0 GIT binary patch literal 22528 zcmeGk{cqDaw7)igg=rb<(zUho(Li7b9SCvKopd_xgv2(XG<9i2msUx73?csad$!{= z-Lf`qv%yve*7)PS7sqy<-}8IV^b+IVg%^Zfzjj*}#<*`;sAgi@?h{nQ1QW-GySPl; zw-K=j!B*e43=3gmW7Di5d|M65)1AkO7eP}#4?KSwhC#kApEj^TK25xN?1drCSEOn2 zF7l;N0mLs^)YFk(*@g6;1_Ud-b|UDyu4oD*_ysvhP)zxaTI#kXIgt=~NpK@l47lyK z`JY5&d3H&HzkPF&oRsK=Oue!UISIS|_@zV!a!o*&G}5f7l>`^CB~n06{sU-EJj0R% zUq{qS=+H&%+vwq^J;Q+S*tKofG|}MOqV*XjkYwrfmK95a|IUWj2|6x$=2}k+2{xOI z9{lpFJBm`0l3@0PT@!*}WgiNBbUjUL2BANh4=H*PC&OUc9ly*K&BFjnm&>4F5)7`E zMM3zPm1+M?gJFG?e45P@f9ypq_JjPR=UGMk)tj|~FhRO^jQD+!s|B<;NwIWDK^4H% z8AZrVXebC?uktTuvWgrd{!~3S0G;ErFRjIzcBFmR>WrfIoZrzPy+;69pTTP+qgG?l zeiyaq<&63;#n8v2v#;c}%!4N(%wS;>vQ?fFf1kimFe4EVVaM6gCOk1V=bl$>QHSI zghSLto#fk$q7mwZ-UUU6dUt#XwU^XKXIeOoE`pFI2}Pa1(d#kwzr3MY2k_DE6`0@zBTZ>P~97!GOpemakQ`i^=-8l}&m{&=dzV+89V@Hd}HBGae~uMu6K z&IswHpPE^&)Efs{gZ@zM)d6^#3c`^>zIp zzGLhX$HmVI)pe=(Z>axUK(ly50n~nIQ>y+q@0tGJ3`XIQj?mkGKE2bL2$D>M;<-#? z|8-RPCJl$d=za@3MGSDy%lP^qNB(Weeyn@T%YP1-1{{$8EC+-Br{urepPY;F2Q@0? zHdUK~*2sUP?>MRaZy9W(0IWlXX(;*c_D8=~+h6%_G22VZflB^cEB|r(k40QuY_8c# z{dX)`M=>}qmW&1%m0C(RY>q*^M9C~(yk8H zc(wvC+j?D}F?&3>nX?2Kg?YCAbsS76YKdy}=mZ^};lm@XzF0RnV!NGRJeK%B&;cXx zUGsm~|CRPX%QV0i0Q?_Y%KoSL|H2unERSA-1D`LEPu;&*PI?AqP7z&y31>w{@&B}Q zWFKDN{}uAT>4FijGXF1-|4kR%M~evFZ~o7Gp|W`>Iep%PDr5OR^J3!6-v`GgND|=s zjJ>mBW06jm09Jj1d;^$2EE)n@k4d`?-~t}}vqUZ!p_Txbt3`bP#`G@;K!0fUh$izW zRs52#EHVG2xQIbURP#y*V$2@=`sNiHCjtyp_ zQ`0zy4MyQ@A`tRLIy?U-1^~7@Sr51yVtRDX?;!*bq4x0Kfqfh096ccmwM8$=bQ%Tr}#YQQ28CaXr#u*0S<=efOZgbiUB9eu%Mrzhq#|j&Xooi z+Tpff-Ibs$*8iU;|C@xQ_CLqMrXl2i<^NyF_^u;zP5u|>r-+kHngu7l6d%e0AC=zq ni%y0qgfDac3Zr+!=`HC|EDz@tmUW|~>QxV@9#B0{eGmK(?iJVL literal 0 HcmV?d00001 diff --git a/C_09/git/ex02/ft_split.c b/C_09/git/ex02/ft_split.c index d31dc8b..bc28908 100644 --- a/C_09/git/ex02/ft_split.c +++ b/C_09/git/ex02/ft_split.c @@ -6,23 +6,13 @@ /* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 #include -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); } diff --git a/C_09/git/ex02/main.c b/C_09/git/ex02/main.c index 7299fa0..97abb88 100644 --- a/C_09/git/ex02/main.c +++ b/C_09/git/ex02/main.c @@ -6,7 +6,7 @@ /* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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); }