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

correction on main.c (working for me now)

Browse Source
This commit is contained in:
Manzovince
2019-05-29 13:12:31 +02:00
parent 79a5fb188c
commit eea8110abd
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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/05/28 17:26:07 by hulamy ### ########.fr */ /* Updated: 2019/05/29 13:12:03 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -82,22 +82,14 @@ int main(int ac, char **av)
dope = create_dope(av[3], (mdp = is_mdp(ac, av))); dope = create_dope(av[3], (mdp = is_mdp(ac, av)));
if (ac == 2 || mdp) if (ac == 2 || mdp)
{ {
<<<<<<< HEAD // ft_putnbrendl(size);
if (!(input = read_file(argv[1]))) // print_final_map(list, size, 1); // DEBUG
print_error("error\n"); // print_final_map(list, size, 0); // DEBUG
if (check_file_errors(input))
print_error("error\n");
size = parse_input(input, &list);
ft_putnbrendl(size);
print_final_map(list, size, 1); // DEBUG
print_final_map(list, size, 0); // DEBUG
=======
if (!(input = read_file(av[1]))) if (!(input = read_file(av[1])))
print_error(dope[3] ? "error: Could not read file.\n" : "error\n"); print_error(dope[3] ? "error: Could not read file.\n" : "error\n");
check_file_errors(input, dope); check_file_errors(input, dope);
size = parse_input(input, &list, dope); size = parse_input(input, &list, dope);
print_final_map(list, size); print_final_map(list, size);
>>>>>>> master
} }
else else
print_error("usage: Please submit a file.\n> ./fillit file.fillit\n"); print_error("usage: Please submit a file.\n> ./fillit file.fillit\n");