From ea2627bf382dcc2ea835c8cd098829bdf0215b76 Mon Sep 17 00:00:00 2001 From: Guy Baconniere Date: Fri, 20 Aug 2021 13:26:21 +0200 Subject: [PATCH] sync --- C_07/Makefile | 2 +- C_07/git/ex00/ft_strdup.c | 8 +-- C_07/git/ex01/ft_range.c | 4 +- C_07/git/ex02/ft_ultimate_range.c | 4 +- C_07/git/ex03/ft_strjoin.c | 14 +++-- C_07/git_old/ex00/ft_strdup.c | 36 ++++++++++++ C_07/git_old/ex00/main.c | 34 +++++++++++ C_07/git_old/ex00/main.sh | 8 +++ C_07/git_old/ex01/ft_range.c | 41 +++++++++++++ C_07/git_old/ex01/main.c | 52 ++++++++++++++++ C_07/git_old/ex01/main.sh | 8 +++ C_07/git_old/ex02/ft_ultimate_range.c | 61 +++++++++++++++++++ C_07/git_old/ex02/main.c | 44 ++++++++++++++ C_07/git_old/ex02/main.sh | 8 +++ C_07/git_old/ex03/ft_strjoin.c | 85 +++++++++++++++++++++++++++ C_07/git_old/ex03/main.c | 42 +++++++++++++ C_07/git_old/ex03/main.sh | 9 +++ C_08/git/ex00/ft.h | 21 +++++++ C_08/git/ex00/main.c | 19 ++++++ C_08/git/ex00/main.sh | 8 +++ 20 files changed, 495 insertions(+), 13 deletions(-) create mode 100644 C_07/git_old/ex00/ft_strdup.c create mode 100644 C_07/git_old/ex00/main.c create mode 100755 C_07/git_old/ex00/main.sh create mode 100644 C_07/git_old/ex01/ft_range.c create mode 100644 C_07/git_old/ex01/main.c create mode 100755 C_07/git_old/ex01/main.sh create mode 100644 C_07/git_old/ex02/ft_ultimate_range.c create mode 100644 C_07/git_old/ex02/main.c create mode 100755 C_07/git_old/ex02/main.sh create mode 100644 C_07/git_old/ex03/ft_strjoin.c create mode 100644 C_07/git_old/ex03/main.c create mode 100755 C_07/git_old/ex03/main.sh create mode 100644 C_08/git/ex00/ft.h create mode 100644 C_08/git/ex00/main.c create mode 100755 C_08/git/ex00/main.sh diff --git a/C_07/Makefile b/C_07/Makefile index f285651..16b3cd2 100644 --- a/C_07/Makefile +++ b/C_07/Makefile @@ -11,7 +11,7 @@ # clone: - @git clone git@vogsphere.42lausanne.ch:vogsphere/intra-uuid-e21d9203-b7f1-4e41-bc8e-18d34fc85e5d-3728040 git + @git clone git@vogsphere.42lausanne.ch:vogsphere/intra-uuid-62428700-374d-44dc-96a4-05f15b99ad17-3735923 git cc: @norminette -R CheckForbiddenSourceHeader diff --git a/C_07/git/ex00/ft_strdup.c b/C_07/git/ex00/ft_strdup.c index 269fda9..1bc2b09 100644 --- a/C_07/git/ex00/ft_strdup.c +++ b/C_07/git/ex00/ft_strdup.c @@ -6,7 +6,7 @@ /* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2021/08/13 09:03:26 by gbaconni #+# #+# */ -/* Updated: 2021/08/19 15:21:48 by gbaconni ### ########.fr */ +/* Updated: 2021/08/20 11:29:47 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,9 +20,9 @@ char *ft_strdup(char *src) int size; size = 0; - while (src[size++] != '\0') - continue ; - str = (char *) malloc(size * sizeof(char)); + while (src[size] != '\0') + size++; + str = (char *) malloc((size + 1) * sizeof(char)); if (str == NULL) return (NULL); _str = str; diff --git a/C_07/git/ex01/ft_range.c b/C_07/git/ex01/ft_range.c index 916ee8b..114b29a 100644 --- a/C_07/git/ex01/ft_range.c +++ b/C_07/git/ex01/ft_range.c @@ -6,7 +6,7 @@ /* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2021/08/18 18:13:35 by gbaconni #+# #+# */ -/* Updated: 2021/08/19 16:10:59 by gbaconni ### ########.fr */ +/* Updated: 2021/08/20 10:49:02 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,7 +34,7 @@ int *ft_range(int min, int max) i = 0; while (i < size) { - range[i] = 1 + min + i; + range[i] = min + i; i++; } return (range); diff --git a/C_07/git/ex02/ft_ultimate_range.c b/C_07/git/ex02/ft_ultimate_range.c index c23973f..0ecabb9 100644 --- a/C_07/git/ex02/ft_ultimate_range.c +++ b/C_07/git/ex02/ft_ultimate_range.c @@ -6,7 +6,7 @@ /* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2021/08/18 18:13:35 by gbaconni #+# #+# */ -/* Updated: 2021/08/19 16:14:34 by gbaconni ### ########.fr */ +/* Updated: 2021/08/20 10:49:32 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,7 +34,7 @@ int *ft_range(int min, int max) i = 0; while (i < size) { - range[i] = 1 + min + i; + range[i] = min + i; i++; } return (range); diff --git a/C_07/git/ex03/ft_strjoin.c b/C_07/git/ex03/ft_strjoin.c index 7efd106..11efb73 100644 --- a/C_07/git/ex03/ft_strjoin.c +++ b/C_07/git/ex03/ft_strjoin.c @@ -6,7 +6,7 @@ /* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2021/08/19 11:25:51 by gbaconni #+# #+# */ -/* Updated: 2021/08/20 09:52:49 by gbaconni ### ########.fr */ +/* Updated: 2021/08/20 11:41:49 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -62,10 +62,17 @@ char *ft_strjoin(int size, char **strs, char *sep) int len; int i; - if (strs == NULL) - return (NULL); + if (size == 0) + { + str = (char *) malloc(sizeof(char)); + *str = '\0'; + return (str); + } len = ft_strslen(size, strs, sep); str = (char *) malloc(len * sizeof(char)); + if (str == NULL) + return (NULL); + *str = '\0'; i = 0; while (i < size) { @@ -74,6 +81,5 @@ char *ft_strjoin(int size, char **strs, char *sep) ft_strcat(str, sep); i++; } - strs[i] = "\0"; return (str); } diff --git a/C_07/git_old/ex00/ft_strdup.c b/C_07/git_old/ex00/ft_strdup.c new file mode 100644 index 0000000..1bc2b09 --- /dev/null +++ b/C_07/git_old/ex00/ft_strdup.c @@ -0,0 +1,36 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strdup.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/13 09:03:26 by gbaconni #+# #+# */ +/* Updated: 2021/08/20 11:29:47 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include + +char *ft_strdup(char *src) +{ + char *str; + char *_str; + char *_src; + int size; + + size = 0; + while (src[size] != '\0') + size++; + str = (char *) malloc((size + 1) * sizeof(char)); + if (str == NULL) + return (NULL); + _str = str; + _src = src; + while (*src != '\0') + *str++ = *src++; + *str = '\0'; + str = _str; + src = _src; + return (str); +} diff --git a/C_07/git_old/ex00/main.c b/C_07/git_old/ex00/main.c new file mode 100644 index 0000000..9edc3e9 --- /dev/null +++ b/C_07/git_old/ex00/main.c @@ -0,0 +1,34 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* main.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/13 09:02:59 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 18:07:36 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include +#include +#include + +char *ft_strdup(char *src); + +int main(void) +{ + char *src; + char *result; + + src = (char *) malloc(32 * sizeof(char)); + printf("Input String [max 31]: "); + scanf("%s", src); + result = ft_strdup(src); + printf("src=%s result=%s (ft_strdup)\n", src, result); + result = strdup(src); + printf("src=%s result=%s (strdup)\n", src, result); + free(src); + return (0); +} diff --git a/C_07/git_old/ex00/main.sh b/C_07/git_old/ex00/main.sh new file mode 100755 index 0000000..292faee --- /dev/null +++ b/C_07/git_old/ex00/main.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e +#norminette -R CheckForbiddenSourceHeader ft_*.c +norminette -R CheckForbiddenSourceHeader +gcc -Wall -Wextra -Werror -o a.out *.c +echo $(basename $PWD): +./a.out +rm -f a.out diff --git a/C_07/git_old/ex01/ft_range.c b/C_07/git_old/ex01/ft_range.c new file mode 100644 index 0000000..114b29a --- /dev/null +++ b/C_07/git_old/ex01/ft_range.c @@ -0,0 +1,41 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_range.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/18 18:13:35 by gbaconni #+# #+# */ +/* Updated: 2021/08/20 10:49:02 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include + +static int ft_abs(int n) +{ + if (n < 0) + n = -n; + return (n); +} + +int *ft_range(int min, int max) +{ + int *range; + int size; + int i; + + range = NULL; + if (min >= max) + return (range); + else + size = ft_abs(max - min); + range = (int *) malloc(size * sizeof(int)); + i = 0; + while (i < size) + { + range[i] = min + i; + i++; + } + return (range); +} diff --git a/C_07/git_old/ex01/main.c b/C_07/git_old/ex01/main.c new file mode 100644 index 0000000..3e9f989 --- /dev/null +++ b/C_07/git_old/ex01/main.c @@ -0,0 +1,52 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* main.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/18 18:11:09 by gbaconni #+# #+# */ +/* Updated: 2021/08/19 16:11:21 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include +#include +#include + +int *ft_range(int min, int max); + +static int ft_abs(int n) +{ + if (n < 0) + n = -n; + return (n); +} + +int main(void) +{ + int i; + int min; + int max; + int size; + int *result; + + min = 0; + max = 0; + printf("Input Min: "); + scanf("%d", &min); + printf("Input Max: "); + scanf("%d", &max); + result = ft_range(min, max); + printf("min=%d max=%d (ft_range)\nresult:\n", min, max); + size = ft_abs(max - min); + printf("size=%d\n", size); + i = 0; + while (i < size) + { + printf("result[%d] = %d\n", i, result[i]); + i++; + } + return (0); +} diff --git a/C_07/git_old/ex01/main.sh b/C_07/git_old/ex01/main.sh new file mode 100755 index 0000000..292faee --- /dev/null +++ b/C_07/git_old/ex01/main.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e +#norminette -R CheckForbiddenSourceHeader ft_*.c +norminette -R CheckForbiddenSourceHeader +gcc -Wall -Wextra -Werror -o a.out *.c +echo $(basename $PWD): +./a.out +rm -f a.out diff --git a/C_07/git_old/ex02/ft_ultimate_range.c b/C_07/git_old/ex02/ft_ultimate_range.c new file mode 100644 index 0000000..0ecabb9 --- /dev/null +++ b/C_07/git_old/ex02/ft_ultimate_range.c @@ -0,0 +1,61 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_ultimate_range.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/18 18:13:35 by gbaconni #+# #+# */ +/* Updated: 2021/08/20 10:49:32 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include + +static int ft_abs(int n) +{ + if (n < 0) + n = -n; + return (n); +} + +int *ft_range(int min, int max) +{ + int *range; + int size; + int i; + + range = NULL; + if (min >= max) + return (range); + else + size = ft_abs(max - min); + range = (int *) malloc(size * sizeof(int)); + i = 0; + while (i < size) + { + range[i] = min + i; + i++; + } + return (range); +} + +int ft_ultimate_range(int **range, int min, int max) +{ + int *r; + int size; + + (void) range; + r = NULL; + size = 0; + if (min >= max) + { + *range = r; + return (size); + } + else + size = ft_abs(max - min); + r = ft_range(min, max); + *range = r; + return (size); +} diff --git a/C_07/git_old/ex02/main.c b/C_07/git_old/ex02/main.c new file mode 100644 index 0000000..582dc59 --- /dev/null +++ b/C_07/git_old/ex02/main.c @@ -0,0 +1,44 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* main.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/18 18:11:09 by gbaconni #+# #+# */ +/* Updated: 2021/08/18 18:31:33 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include +#include +#include + +int ft_ultimate_range(int **range, int min, int max); + +int main(void) +{ + int i; + int min; + int max; + int size; + int *range; + + min = 0; + max = 0; + size = 0; + printf("Input Min: "); + scanf("%d", &min); + printf("Input Max: "); + scanf("%d", &max); + size = ft_ultimate_range(&range, min, max); + printf("size=%d min=%d max=%d (ft_ultimate_range)\nrange:\n", size, min, max); + i = 0; + while (i < size) + { + printf("range[%d] = %d\n", i, range[i]); + i++; + } + return (0); +} diff --git a/C_07/git_old/ex02/main.sh b/C_07/git_old/ex02/main.sh new file mode 100755 index 0000000..292faee --- /dev/null +++ b/C_07/git_old/ex02/main.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e +#norminette -R CheckForbiddenSourceHeader ft_*.c +norminette -R CheckForbiddenSourceHeader +gcc -Wall -Wextra -Werror -o a.out *.c +echo $(basename $PWD): +./a.out +rm -f a.out diff --git a/C_07/git_old/ex03/ft_strjoin.c b/C_07/git_old/ex03/ft_strjoin.c new file mode 100644 index 0000000..11efb73 --- /dev/null +++ b/C_07/git_old/ex03/ft_strjoin.c @@ -0,0 +1,85 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strjoin.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/19 11:25:51 by gbaconni #+# #+# */ +/* Updated: 2021/08/20 11:41:49 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include +#include + +static int ft_strlen(char *str) +{ + int len; + + len = 0; + while (str[len] != '\0') + len++; + return (len); +} + +char *ft_strcat(char *dest, char *src) +{ + char *s1; + char *s2; + + s1 = dest; + s2 = src; + while (*s1 != '\0') + s1++; + while (*s2 != '\0') + *s1++ = *s2++; + *s1 = '\0'; + return (dest); +} + +int ft_strslen(int size, char **strs, char *sep) +{ + int len; + int i; + + len = 1; + i = 0; + while (i < size) + { + len += ft_strlen(strs[i]); + if (i < size - 1) + len += ft_strlen(sep); + i++; + } + return (len); +} + +char *ft_strjoin(int size, char **strs, char *sep) +{ + char *str; + int len; + int i; + + if (size == 0) + { + str = (char *) malloc(sizeof(char)); + *str = '\0'; + return (str); + } + len = ft_strslen(size, strs, sep); + str = (char *) malloc(len * sizeof(char)); + if (str == NULL) + return (NULL); + *str = '\0'; + i = 0; + while (i < size) + { + ft_strcat(str, strs[i]); + if (i < size - 1) + ft_strcat(str, sep); + i++; + } + return (str); +} diff --git a/C_07/git_old/ex03/main.c b/C_07/git_old/ex03/main.c new file mode 100644 index 0000000..dd29822 --- /dev/null +++ b/C_07/git_old/ex03/main.c @@ -0,0 +1,42 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* main.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/20 09:34:53 by gbaconni #+# #+# */ +/* Updated: 2021/08/20 09:36:09 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include +#include +#include + +char *ft_strjoin(int size, char **strs, char *sep); + +int main(void) +{ + int i; + char *sep; + char **strs; + char *result; + + sep = ""; + strs = malloc(3 * sizeof(*strs)); + sep = (char *) malloc(32 * sizeof(char)); + i = 0; + while (i < 3) + { + strs[i] = (char *) malloc(32 * sizeof(char)); + printf("Input String #%d [Max 31]: ", i + 1); + scanf("%s", strs[i++]); + } + printf("Input Separator: "); + scanf("%s", sep); + result = ft_strjoin(i, strs, sep); + printf("size=%d sep=%s result=%s (ft_strjoin)\n", i, sep, result); + return (0); +} diff --git a/C_07/git_old/ex03/main.sh b/C_07/git_old/ex03/main.sh new file mode 100755 index 0000000..5481183 --- /dev/null +++ b/C_07/git_old/ex03/main.sh @@ -0,0 +1,9 @@ +#!/bin/sh +set -e +rm -f a.out +#norminette -R CheckForbiddenSourceHeader +norminette -R CheckForbiddenSourceHeader ft_*.c +gcc -Wall -Wextra -Werror -o a.out ft_*.c main.c +echo $(basename $PWD): +./a.out +rm -f a.out diff --git a/C_08/git/ex00/ft.h b/C_08/git/ex00/ft.h new file mode 100644 index 0000000..ed4dc9f --- /dev/null +++ b/C_08/git/ex00/ft.h @@ -0,0 +1,21 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/20 10:17:09 by gbaconni #+# #+# */ +/* Updated: 2021/08/20 12:05:50 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ +#ifndef FT_H +# define FT_H + +void ft_putchar(char c); +void ft_swap(int *a, int *b); +void ft_putstr(char *str); +int ft_strlen(char *str); +int ft_strcmp(char *s1, char *s2); + +#endif diff --git a/C_08/git/ex00/main.c b/C_08/git/ex00/main.c new file mode 100644 index 0000000..6cbfca3 --- /dev/null +++ b/C_08/git/ex00/main.c @@ -0,0 +1,19 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* main.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/20 10:26:50 by gbaconni #+# #+# */ +/* Updated: 2021/08/20 10:34:14 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft.h" + +int main(int argc, char *argv[]) +{ + (void) argc; + (void) argv; +} diff --git a/C_08/git/ex00/main.sh b/C_08/git/ex00/main.sh new file mode 100755 index 0000000..eb5bd76 --- /dev/null +++ b/C_08/git/ex00/main.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e +#norminette -R CheckForbiddenSourceHeader ft_*.c +norminette -R CheckDefine -R CheckForbiddenSourceHeader *.c +gcc -Wall -Wextra -Werror -o a.out *.c +echo $(basename $PWD): +./a.out +rm -f a.out