From df07d7f9f7209fffa48f06d4bd7ee4a378db5d25 Mon Sep 17 00:00:00 2001 From: Guy Baconniere Date: Wed, 18 Aug 2021 13:05:29 +0200 Subject: [PATCH] sync --- C_Piscine_C_03/git/ex01/ft_strncmp.c | 2 +- C_Piscine_C_03/git/ex01/ft_strncmp.copy.c | 27 ++++++++++++++ C_Piscine_C_03/git/ex01/main.sh | 4 +- C_Piscine_C_03/git/ex01/t.c | 37 +++++++++++++++++++ C_Piscine_C_03/git/ex01/t.sh | 7 ++++ .../git/ex00/ft_iterative_factorial.c | 11 ++++-- C_Piscine_C_05/git/ex00/main.c | 6 +-- .../git/ex01/ft_recursive_factorial.c | 6 +-- C_Piscine_C_05/git/ex01/main.c | 6 +-- C_Piscine_C_05/git/ex02/ft_iterative_power.c | 12 ++++++ C_Piscine_C_05/git/ex02/main.c | 6 +-- C_Piscine_C_05/git/ex03/ft_recursive_power.c | 6 +-- C_Piscine_C_05/git/ex03/main.c | 6 +-- C_Piscine_C_05/git/ex04/ft_fibonacci.c | 6 +-- C_Piscine_C_05/git/ex04/main.c | 6 +-- C_Piscine_C_05/git/ex05/ft_sqrt.c | 14 ++++--- C_Piscine_C_05/git/ex05/main.c | 6 +-- C_Piscine_C_05/git/ex06/ft_is_prime.c | 8 ++-- C_Piscine_C_05/git/ex06/main.c | 6 +-- C_Piscine_C_05/git/ex07/ft_find_next_prime.c | 6 +-- C_Piscine_C_05/git/ex07/main.c | 6 +-- 21 files changed, 141 insertions(+), 53 deletions(-) create mode 100644 C_Piscine_C_03/git/ex01/ft_strncmp.copy.c create mode 100644 C_Piscine_C_03/git/ex01/t.c create mode 100755 C_Piscine_C_03/git/ex01/t.sh diff --git a/C_Piscine_C_03/git/ex01/ft_strncmp.c b/C_Piscine_C_03/git/ex01/ft_strncmp.c index 0eb12f9..3db6cd0 100644 --- a/C_Piscine_C_03/git/ex01/ft_strncmp.c +++ b/C_Piscine_C_03/git/ex01/ft_strncmp.c @@ -6,7 +6,7 @@ /* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2021/08/12 15:16:07 by gbaconni #+# #+# */ -/* Updated: 2021/08/12 15:16:11 by gbaconni ### ########.fr */ +/* Updated: 2021/08/18 11:35:55 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_03/git/ex01/ft_strncmp.copy.c b/C_Piscine_C_03/git/ex01/ft_strncmp.copy.c new file mode 100644 index 0000000..7d1f7ba --- /dev/null +++ b/C_Piscine_C_03/git/ex01/ft_strncmp.copy.c @@ -0,0 +1,27 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strncmp.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: dgloriod +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/09 11:32:49 by dgloriod #+# #+# */ +/* Updated: 2021/08/18 11:44:44 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +int ft_strncmp(char *s1, char *s2, unsigned int n) +{ + unsigned int i; + + i = 0; + while (i < n) + { + if (s1[i] > s2[i]) + return (1); + else if (s1[i] < s2[i]) + return (-1); + i++; + } + return (0); +} diff --git a/C_Piscine_C_03/git/ex01/main.sh b/C_Piscine_C_03/git/ex01/main.sh index 292faee..e4256a4 100755 --- a/C_Piscine_C_03/git/ex01/main.sh +++ b/C_Piscine_C_03/git/ex01/main.sh @@ -1,8 +1,8 @@ #!/bin/sh set -e #norminette -R CheckForbiddenSourceHeader ft_*.c -norminette -R CheckForbiddenSourceHeader -gcc -Wall -Wextra -Werror -o a.out *.c +norminette -R CheckForbiddenSourceHeader ft_strncmp.c +gcc -Wall -Wextra -Werror -o a.out ft_strncmp.c main.c echo $(basename $PWD): ./a.out rm -f a.out diff --git a/C_Piscine_C_03/git/ex01/t.c b/C_Piscine_C_03/git/ex01/t.c new file mode 100644 index 0000000..0930299 --- /dev/null +++ b/C_Piscine_C_03/git/ex01/t.c @@ -0,0 +1,37 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* main.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/12 15:16:20 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 12:00:04 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include +#include +#include + +int ft_strncmp(char *s1, char *s2, unsigned int n); + +int main(void) +{ + char *s1 = "a"; + char *s2 = "a"; + unsigned int n = 65536; + int result; + + while (n < 80000) + { + printf("[%d]:\n", n); + result = strncmp(s1, s2, n); + printf("s1=%s s2=%s n=%d result=%d (strncmp)\n", s1, s2, n, result); + result = ft_strncmp(s1, s2, n); + printf("s1=%s s2=%s n=%d result=%d (ft_strncmp)\n", s1, s2, n, result); + n++; + } + return (0); +} diff --git a/C_Piscine_C_03/git/ex01/t.sh b/C_Piscine_C_03/git/ex01/t.sh new file mode 100755 index 0000000..2913b5e --- /dev/null +++ b/C_Piscine_C_03/git/ex01/t.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +norminette -R CheckForbiddenSourceHeader ft_strncmp.copy.c +gcc -Wall -Wextra -Werror -o a.out ft_strncmp.copy.c t.c +echo $(basename $PWD): +./a.out +rm -f a.out diff --git a/C_Piscine_C_05/git/ex00/ft_iterative_factorial.c b/C_Piscine_C_05/git/ex00/ft_iterative_factorial.c index e06ea34..4fd5ae8 100644 --- a/C_Piscine_C_05/git/ex00/ft_iterative_factorial.c +++ b/C_Piscine_C_05/git/ex00/ft_iterative_factorial.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* ft_iterative_factorial.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 15:50:19 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 15:50:21 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:38:07 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:51:54 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,10 @@ int ft_iterative_factorial(int nb) int n; int i; - n = 1; + if (nb < 0) + n = 0; + else + n = 1; i = 1; while (i <= nb) n *= i++; diff --git a/C_Piscine_C_05/git/ex00/main.c b/C_Piscine_C_05/git/ex00/main.c index 0a6d1f1..76c0291 100644 --- a/C_Piscine_C_05/git/ex00/main.c +++ b/C_Piscine_C_05/git/ex00/main.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 15:19:55 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 15:25:37 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:40:58 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:51:51 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex01/ft_recursive_factorial.c b/C_Piscine_C_05/git/ex01/ft_recursive_factorial.c index 3428264..54f5f55 100644 --- a/C_Piscine_C_05/git/ex01/ft_recursive_factorial.c +++ b/C_Piscine_C_05/git/ex01/ft_recursive_factorial.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* ft_recursive_factorial.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 15:34:34 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 15:50:00 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:41:12 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:51:33 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex01/main.c b/C_Piscine_C_05/git/ex01/main.c index 2c9634b..8dc592e 100644 --- a/C_Piscine_C_05/git/ex01/main.c +++ b/C_Piscine_C_05/git/ex01/main.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 15:34:45 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 15:35:27 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:51:40 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:51:42 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex02/ft_iterative_power.c b/C_Piscine_C_05/git/ex02/ft_iterative_power.c index 89f349d..009c9f6 100644 --- a/C_Piscine_C_05/git/ex02/ft_iterative_power.c +++ b/C_Piscine_C_05/git/ex02/ft_iterative_power.c @@ -1,3 +1,15 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_iterative_power.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/18 10:51:08 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:51:14 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + int ft_iterative_power(int nb, int power) { int n; diff --git a/C_Piscine_C_05/git/ex02/main.c b/C_Piscine_C_05/git/ex02/main.c index b359261..56fb8cc 100644 --- a/C_Piscine_C_05/git/ex02/main.c +++ b/C_Piscine_C_05/git/ex02/main.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 16:29:14 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 16:29:34 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:51:24 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:51:25 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex03/ft_recursive_power.c b/C_Piscine_C_05/git/ex03/ft_recursive_power.c index 352679e..b7ab33a 100644 --- a/C_Piscine_C_05/git/ex03/ft_recursive_power.c +++ b/C_Piscine_C_05/git/ex03/ft_recursive_power.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* ft_recursive_power.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 16:50:55 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 17:05:03 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:50:39 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:50:43 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex03/main.c b/C_Piscine_C_05/git/ex03/main.c index bb4713b..32189ed 100644 --- a/C_Piscine_C_05/git/ex03/main.c +++ b/C_Piscine_C_05/git/ex03/main.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 16:49:41 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 16:59:46 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:50:59 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:51:00 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex04/ft_fibonacci.c b/C_Piscine_C_05/git/ex04/ft_fibonacci.c index 0e7e541..04d71c0 100644 --- a/C_Piscine_C_05/git/ex04/ft_fibonacci.c +++ b/C_Piscine_C_05/git/ex04/ft_fibonacci.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* ft_fibonacci.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 17:09:01 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 18:28:10 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:50:16 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:52:23 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex04/main.c b/C_Piscine_C_05/git/ex04/main.c index 180fa94..a1737d7 100644 --- a/C_Piscine_C_05/git/ex04/main.c +++ b/C_Piscine_C_05/git/ex04/main.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 17:06:57 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 17:12:01 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:50:25 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:52:28 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex05/ft_sqrt.c b/C_Piscine_C_05/git/ex05/ft_sqrt.c index d7b8cf7..c2fb307 100644 --- a/C_Piscine_C_05/git/ex05/ft_sqrt.c +++ b/C_Piscine_C_05/git/ex05/ft_sqrt.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* ft_sqrt.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 17:09:01 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 18:28:10 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:53:01 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 12:08:49 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,10 +14,12 @@ int ft_sqrt(int nb) { int i; - i = 0; - while (i * i < nb) + if (nb == 2147483647) + return (0); + i = 1; + while (nb > 0 && i < 46341 && i * i < nb) i++; - if (nb % i == 0) + if (nb / i == i && nb % i == 0) return (i); else return (0); diff --git a/C_Piscine_C_05/git/ex05/main.c b/C_Piscine_C_05/git/ex05/main.c index 9535736..0b94ece 100644 --- a/C_Piscine_C_05/git/ex05/main.c +++ b/C_Piscine_C_05/git/ex05/main.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 17:06:57 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 17:12:01 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:53:10 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:53:12 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex06/ft_is_prime.c b/C_Piscine_C_05/git/ex06/ft_is_prime.c index be4cdc0..6e2c55d 100644 --- a/C_Piscine_C_05/git/ex06/ft_is_prime.c +++ b/C_Piscine_C_05/git/ex06/ft_is_prime.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* ft_is_prime.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 17:09:01 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 18:28:10 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:53:28 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 12:10:23 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ int ft_is_prime(int nb) int r; int i; - if (nb == 0 || nb == 1) + if (nb <= 0 || nb == 1) r = 0; else r = 1; diff --git a/C_Piscine_C_05/git/ex06/main.c b/C_Piscine_C_05/git/ex06/main.c index a0be4e8..373ec67 100644 --- a/C_Piscine_C_05/git/ex06/main.c +++ b/C_Piscine_C_05/git/ex06/main.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 17:06:57 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 17:12:01 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:53:37 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:53:38 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex07/ft_find_next_prime.c b/C_Piscine_C_05/git/ex07/ft_find_next_prime.c index d9e7985..7ec19a6 100644 --- a/C_Piscine_C_05/git/ex07/ft_find_next_prime.c +++ b/C_Piscine_C_05/git/ex07/ft_find_next_prime.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* ft_find_next_prime.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 17:09:01 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 18:28:10 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:53:52 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 12:12:03 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/C_Piscine_C_05/git/ex07/main.c b/C_Piscine_C_05/git/ex07/main.c index e699b92..d8dbe36 100644 --- a/C_Piscine_C_05/git/ex07/main.c +++ b/C_Piscine_C_05/git/ex07/main.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: gbaconni +#+ +:+ +#+ */ +/* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2021/08/17 17:06:57 by gbaconni #+# #+# */ -/* Updated: 2021/08/17 17:12:01 by gbaconni ### ########.fr */ +/* Created: 2021/08/18 10:54:05 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 10:54:07 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */