42/42_old_fillit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

corrections + ft_file_errors added (not tested)

Browse Source
This commit is contained in:
Manzovince
2019-04-14 12:53:31 +02:00
parent 7c28480555
commit fde6674fd5
4 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/fillit.h
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */ /* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */
/* Updated: 2019/04/14 12:13:35 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 12:34:30 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -34,5 +34,6 @@ void print_test(char *test);
char *read_file(char *file); char *read_file(char *file);
void ft_display_error(char *s, int fd); void ft_display_error(char *s, int fd);
int ft_file_errors(char *file);
#endif #endif

4
samples/1tetri Normal file
View File

@@ -0,0 +1,4 @@
...#
...#
...#
...#

21
srcs/handle_errors.c
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */ /* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */
/* Updated: 2019/04/14 12:06:40 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 12:35:46 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -17,8 +17,25 @@ void ft_display_error(char *s, int fd)
write(fd, s, strlen(s)); write(fd, s, strlen(s));
} }
int ft_file_errors(char *file)
{
int line_nbr;
line_nbr = 0;
while (*file)
{
if (*file == '\n')
line_nbr++;
file++;
}
/*less than 4 lines or more than 104 (26 tetri) + 25 = 129 lines*/
if (line_nbr < 4 || line_nbr > 129)
return (1);
return (0);
}
/* /*
int ft_tetri_erros() int ft_tetri_errors()
{ {
} }

40
srcs/main.c
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */ /* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */
/* Updated: 2019/04/14 12:13:42 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 12:44:14 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -17,22 +17,28 @@ int main(int argc, char **argv)
char *input; char *input;
short i; short i;
if (argc == 2) if (argc != 2)
{ {
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);
/*
Transform input to tetriminos
Check if every tetrimino is valid
Backtracking for smallest square
Transform tetriminos with letters
Print result
*/
print_test(input);
}
else
ft_display_error("Error: Please submit a file.\n", 2); ft_display_error("Error: Please submit a file.\n", 2);
return 0; return (0);
}
else if (!(input = read_file(argv[1])))
{
ft_display_error("Error: Could not read file.\n", 2);
return (0);
}
else if (ft_file_errors(input))
{
ft_display_error("Error: Invalid file.\n", 2);
return (0);
}
/*
Check if every tetrimino is valid
Transform input to tetriminos
Backtracking for smallest square
Transform tetriminos with letters
Print result
*/
print_test(input);
return (0);
} }