From 5b206e7e9ba19e8f7028729f294ad14080454da0 Mon Sep 17 00:00:00 2001 From: kinou-p Date: Mon, 14 Feb 2022 00:55:59 +0100 Subject: [PATCH] done --- srcs/main.c | 7 ++++--- srcs/print_map.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/srcs/main.c b/srcs/main.c index fb38e1f..cf6d92e 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 16:42:55 by apommier #+# #+# */ -/* Updated: 2022/02/14 00:41:30 by apommier ### ########.fr */ +/* Updated: 2022/02/14 00:54:18 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -97,11 +97,10 @@ char **set_map(char **argv) char *swap; int fd; - swap = 0; map = 0; fd = open(argv[1], O_RDONLY); if (fd == -1) - ft_error("Error: Open call fail", 0); + ft_error("Error: Open call fail\n", 0); swap = get_next_line(fd); while (swap) { @@ -114,6 +113,8 @@ char **set_map(char **argv) close(fd); map_tab = ft_split(map, '\n'); free(map); + if (!map_tab) + ft_error("Error: Map file is empty\n", 0); return (map_tab); } diff --git a/srcs/print_map.c b/srcs/print_map.c index 3a33b27..a6f4592 100644 --- a/srcs/print_map.c +++ b/srcs/print_map.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 23:39:18 by apommier #+# #+# */ -/* Updated: 2022/02/14 00:42:06 by apommier ### ########.fr */ +/* Updated: 2022/02/14 00:55:10 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -58,7 +58,7 @@ void check_arg(int argc, char **argv) { fd = open(argv[1], O_RDONLY); if (fd == -1) - ft_error("Error: The map file doesn't exist\n", 0); + ft_error("Error: Map file doesn't exist\n", 0); close(fd); } else