From 481d6834673e6063f7e67be84e50490dd6abf5a9 Mon Sep 17 00:00:00 2001 From: Manzovince Date: Sun, 14 Apr 2019 12:15:25 +0200 Subject: [PATCH] First version with working test (read and print file) --- includes/fillit.h | 20 +++++- samples/42 | 4 ++ samples/Non_valide | 19 +++++ samples/Valide1 | 19 +++++ samples/backslash_0 | Bin 0 -> 20 bytes samples/bad_test | 4 ++ samples/difficile | 114 ++++++++++++++++++++++++++++++ samples/difficile_ou_pas | 114 ++++++++++++++++++++++++++++++ samples/empty | 0 samples/full | 19 +++++ samples/invalid_sample | 20 ++++++ samples/newline | 1 + samples/one | 4 ++ samples/square | 4 ++ samples/sujet_1 | 19 +++++ samples/sujet_2 | 39 ++++++++++ samples/test7 | 34 +++++++++ samples/test_11 | 54 ++++++++++++++ samples/test_8 | 39 ++++++++++ samples/two | 4 ++ samples/valid_sample | 19 +++++ samples/valid_sample_with_newline | 20 ++++++ srcs/get_smallest_square.c | 4 +- srcs/handle_errors.c | 10 ++- srcs/main.c | 9 ++- srcs/print_fillit.c | 13 +++- srcs/read_file.c | 36 ++++++++++ srcs/tetri_to_letters.c | 8 ++- 28 files changed, 637 insertions(+), 13 deletions(-) create mode 100644 samples/42 create mode 100644 samples/Non_valide create mode 100644 samples/Valide1 create mode 100644 samples/backslash_0 create mode 100644 samples/bad_test create mode 100644 samples/difficile create mode 100644 samples/difficile_ou_pas create mode 100644 samples/empty create mode 100644 samples/full create mode 100644 samples/invalid_sample create mode 100644 samples/newline create mode 100644 samples/one create mode 100644 samples/square create mode 100644 samples/sujet_1 create mode 100644 samples/sujet_2 create mode 100644 samples/test7 create mode 100644 samples/test_11 create mode 100644 samples/test_8 create mode 100644 samples/two create mode 100644 samples/valid_sample create mode 100644 samples/valid_sample_with_newline create mode 100644 srcs/read_file.c diff --git a/includes/fillit.h b/includes/fillit.h index fadfa52..e2c1368 100644 --- a/includes/fillit.h +++ b/includes/fillit.h @@ -6,10 +6,13 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */ -/* Updated: 2019/03/01 13:35:08 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/14 12:13:35 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ +#ifndef FILLIT_H +# define FILLIT_H + #include #include // for system call write #include // for system call open @@ -18,3 +21,18 @@ #include // to use bool type # define BUFFER_SIZE 1024 + +/* +** DELETE BEFORE EVALUATION +*/ + +void print_test(char *test); + +/* +** FUNCTIONS +*/ + +char *read_file(char *file); +void ft_display_error(char *s, int fd); + +#endif diff --git a/samples/42 b/samples/42 new file mode 100644 index 0000000..e40c936 --- /dev/null +++ b/samples/42 @@ -0,0 +1,4 @@ +4242 +4242 +4242 +4242 diff --git a/samples/Non_valide b/samples/Non_valide new file mode 100644 index 0000000..2de226b --- /dev/null +++ b/samples/Non_valide @@ -0,0 +1,19 @@ +...# +...# +...# +...# +.... +.... +.... +#### + + +.### +...E +.... +.... + +#### +#### +#### +#### diff --git a/samples/Valide1 b/samples/Valide1 new file mode 100644 index 0000000..8c28d9d --- /dev/null +++ b/samples/Valide1 @@ -0,0 +1,19 @@ +...# +...# +...# +...# + +.... +.... +.... +#### + +.### +...# +.... +.... + +.... +..## +.##. +.... diff --git a/samples/backslash_0 b/samples/backslash_0 new file mode 100644 index 0000000000000000000000000000000000000000..736267690ed29b7e508ccd127dc91e46ecf163ec GIT binary patch literal 20 WcmdPX)6?Tp1_CZ1g8@Y7aRC4wbONsc literal 0 HcmV?d00001 diff --git a/samples/bad_test b/samples/bad_test new file mode 100644 index 0000000..2f58fc2 --- /dev/null +++ b/samples/bad_test @@ -0,0 +1,4 @@ +.#.. +.#.. +###. +.... diff --git a/samples/difficile b/samples/difficile new file mode 100644 index 0000000..e9e0c68 --- /dev/null +++ b/samples/difficile @@ -0,0 +1,114 @@ +.... +.... +..## +.##. + +.... +.##. +..#. +..#. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +###. +.#.. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.### +..#. +.... + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +..#. +..#. +..#. +..#. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +..#. +..#. +..## + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +#### +.... diff --git a/samples/difficile_ou_pas b/samples/difficile_ou_pas new file mode 100644 index 0000000..aac9474 --- /dev/null +++ b/samples/difficile_ou_pas @@ -0,0 +1,114 @@ +.... +.... +..## +.##. + +.... +.##. +..#. +..#. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +###. +.#.. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.### +..#. +.... + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +..#. +..#. +..#. +..#. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +..#. +..#. +..## + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +#### +....iskjdslkfsljklfdjk diff --git a/samples/empty b/samples/empty new file mode 100644 index 0000000..e69de29 diff --git a/samples/full b/samples/full new file mode 100644 index 0000000..c6a2a04 --- /dev/null +++ b/samples/full @@ -0,0 +1,19 @@ +###. +#... +.... +.... + +.... +.... +#... +###. + +.... +.##. +.##. +.... + +...# +...# +...# +...# diff --git a/samples/invalid_sample b/samples/invalid_sample new file mode 100644 index 0000000..9748b4a --- /dev/null +++ b/samples/invalid_sample @@ -0,0 +1,20 @@ +...# +...# +...# +...# +.... +.... +.... +#### + + +.### +...# +.... +.... + +.... +..## +.##. +.... + diff --git a/samples/newline b/samples/newline new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/samples/newline @@ -0,0 +1 @@ + diff --git a/samples/one b/samples/one new file mode 100644 index 0000000..5013175 --- /dev/null +++ b/samples/one @@ -0,0 +1,4 @@ +.... +.... +.... +#### diff --git a/samples/square b/samples/square new file mode 100644 index 0000000..6621462 --- /dev/null +++ b/samples/square @@ -0,0 +1,4 @@ +##.. +##.. +.... +.... diff --git a/samples/sujet_1 b/samples/sujet_1 new file mode 100644 index 0000000..2430a47 --- /dev/null +++ b/samples/sujet_1 @@ -0,0 +1,19 @@ +.... +##.. +.#.. +.#.. + +.... +#### +.... +.... + +#... +###. +.... +.... + +.... +##.. +.##. +.... diff --git a/samples/sujet_2 b/samples/sujet_2 new file mode 100644 index 0000000..a2f91ba --- /dev/null +++ b/samples/sujet_2 @@ -0,0 +1,39 @@ +...# +...# +...# +...# + +.... +.... +.... +#### + +.### +...# +.... +.... + +.... +..## +.##. +.... + +.... +.##. +.##. +.... + +.... +.... +##.. +.##. + +##.. +.#.. +.#.. +.... + +.... +###. +.#.. +.... diff --git a/samples/test7 b/samples/test7 new file mode 100644 index 0000000..0c717b2 --- /dev/null +++ b/samples/test7 @@ -0,0 +1,34 @@ +...# +...# +...# +...# + +.... +.... +.... +#### + +.### +...# +.... +.... + +.... +..## +.##. +.... + +.... +.##. +.##. +.... + +.... +.... +##.. +.##. + +##.. +.#.. +.#.. +.... diff --git a/samples/test_11 b/samples/test_11 new file mode 100644 index 0000000..00aaef8 --- /dev/null +++ b/samples/test_11 @@ -0,0 +1,54 @@ +.... +.... +..## +.##. + +.... +.##. +..#. +..#. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +###. +.#.. + +.... +.... +..## +.##. + +.... +.... +..## +.##. diff --git a/samples/test_8 b/samples/test_8 new file mode 100644 index 0000000..5b63f79 --- /dev/null +++ b/samples/test_8 @@ -0,0 +1,39 @@ +.... +.... +..## +.##. + +.... +.##. +..#. +..#. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. + +.... +.... +..## +.##. diff --git a/samples/two b/samples/two new file mode 100644 index 0000000..3f1734a --- /dev/null +++ b/samples/two @@ -0,0 +1,4 @@ +...# +...# +...# +...# diff --git a/samples/valid_sample b/samples/valid_sample new file mode 100644 index 0000000..8c28d9d --- /dev/null +++ b/samples/valid_sample @@ -0,0 +1,19 @@ +...# +...# +...# +...# + +.... +.... +.... +#### + +.### +...# +.... +.... + +.... +..## +.##. +.... diff --git a/samples/valid_sample_with_newline b/samples/valid_sample_with_newline new file mode 100644 index 0000000..cf7ea58 --- /dev/null +++ b/samples/valid_sample_with_newline @@ -0,0 +1,20 @@ +...# +...# +...# +...# + +.... +.... +.... +#### + +.### +...# +.... +.... + +.... +..## +.##. +.... + diff --git a/srcs/get_smallest_square.c b/srcs/get_smallest_square.c index 55a3058..4554253 100644 --- a/srcs/get_smallest_square.c +++ b/srcs/get_smallest_square.c @@ -6,10 +6,12 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/12 22:29:45 by vmanzoni #+# #+# */ -/* Updated: 2019/04/12 22:30:32 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/14 12:02:22 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ +#include "../includes/fillit.h" + char *get_smallest_square(/*args*/) { /*backtracking*/ diff --git a/srcs/handle_errors.c b/srcs/handle_errors.c index 75513e0..3ba9595 100644 --- a/srcs/handle_errors.c +++ b/srcs/handle_errors.c @@ -6,16 +6,20 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */ -/* Updated: 2019/04/12 22:27:28 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/14 12:06:40 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ +#include "../includes/fillit.h" + void ft_display_error(char *s, int fd) { write(fd, s, strlen(s)); } -int ft_tetri_erros(/*args*/) +/* +int ft_tetri_erros() { - + } +*/ diff --git a/srcs/main.c b/srcs/main.c index 01f0579..6a379c7 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,10 +6,12 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */ -/* Updated: 2019/04/12 22:27:42 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/14 12:13:42 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ +#include "../includes/fillit.h" + int main(int argc, char **argv) { char *input; @@ -19,8 +21,8 @@ int main(int argc, char **argv) { if (!(input = read_file(argv[1]))) ft_display_error("Error: Could not read file.\n", 2); - else if (/*Elements in file not valid*/) - ft_display_error("Error: Invalid file.\n", 2); +// else if (/*Elements in file not valid*/) +// ft_display_error("Error: Invalid file.\n", 2); /* Transform input to tetriminos Check if every tetrimino is valid @@ -28,6 +30,7 @@ int main(int argc, char **argv) Transform tetriminos with letters Print result */ + print_test(input); } else ft_display_error("Error: Please submit a file.\n", 2); diff --git a/srcs/print_fillit.c b/srcs/print_fillit.c index acf4a58..57188d3 100644 --- a/srcs/print_fillit.c +++ b/srcs/print_fillit.c @@ -6,11 +6,20 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:35:48 by vmanzoni #+# #+# */ -/* Updated: 2019/04/12 22:26:27 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/14 12:13:16 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ -void ft_print_fillit(/*args*/) +#include "../includes/fillit.h" + +/* +void ft_print_fillit() { } +*/ + +void print_test(char *test) +{ + write(1, test, strlen(test)); +} diff --git a/srcs/read_file.c b/srcs/read_file.c new file mode 100644 index 0000000..4fc2a60 --- /dev/null +++ b/srcs/read_file.c @@ -0,0 +1,36 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* read_file.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: vmanzoni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/04/13 12:09:46 by vmanzoni #+# #+# */ +/* Updated: 2019/04/14 12:08:12 by vmanzoni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "../includes/fillit.h" + +char *read_file(char *file) +{ + char buf[BUFFER_SIZE]; + int fd; + int rv; + int i; + char *result; + + if (((fd = open(file, O_RDONLY)) < 0) \ + || ((rv = read(fd, &buf, BUFFER_SIZE)) < 0) \ + || !(result = malloc(sizeof(char)))) + return (NULL); + buf[rv] = '\0'; + i = 0; + while (rv--) + { + result[i] = buf[i]; + i++; + } + close(fd); + return (result); +} diff --git a/srcs/tetri_to_letters.c b/srcs/tetri_to_letters.c index 5f37a83..6af453a 100644 --- a/srcs/tetri_to_letters.c +++ b/srcs/tetri_to_letters.c @@ -6,11 +6,13 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/12 22:31:30 by vmanzoni #+# #+# */ -/* Updated: 2019/04/12 22:31:51 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/14 12:08:58 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ -char *tetri_to_letters(/*args*/) +#include "../includes/fillit.h" + +char *tetri_to_letters() { - + }