From c496582e57d66c9a30907f182a6abfaf96107626 Mon Sep 17 00:00:00 2001 From: Elisee ADJIGUIDI Date: Wed, 15 Jun 2022 17:29:48 +0200 Subject: [PATCH] check dir --- includes/Cub3D.h | 3 ++- srcs/parsing/parse_map.c | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/includes/Cub3D.h b/includes/Cub3D.h index 6854669..dff4ecf 100644 --- a/includes/Cub3D.h +++ b/includes/Cub3D.h @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 16:30:59 by apommier #+# #+# */ -/* Updated: 2022/06/15 17:02:52 by apommier ### ########.fr */ +/* Updated: 2022/06/15 17:28:47 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ @@ -125,5 +125,6 @@ int quit_game(t_data *img); void ft_error(char *error_msg); void print_player(player player, t_data *img); void print_map(map_info map, t_data *img); +void check_dir(char *path, t_data *img); #endif diff --git a/srcs/parsing/parse_map.c b/srcs/parsing/parse_map.c index ee26ecc..3de6ef7 100644 --- a/srcs/parsing/parse_map.c +++ b/srcs/parsing/parse_map.c @@ -6,12 +6,25 @@ /* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/05/10 17:54:25 by sadjigui #+# #+# */ -/* Updated: 2022/06/15 16:46:36 by sadjigui ### ########.fr */ +/* Updated: 2022/06/15 17:24:27 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ #include "../../includes/Cub3D.h" +void check_dir(char *path, t_data *img) +{ + int fd; + + fd = open(path, O_DIRECTORY); + if (fd >= 0) + { + close(fd); + ft_exit("Error\nTexture path is a directory\n", img); + } + close(fd); +} + void ft_exit(char *str, t_data *img) { ft_putstr_fd(str, 2); @@ -286,6 +299,7 @@ char **isafile(char **av, t_data *img) char *tmp; char **split; + check_dir(av[1], img); img->err = 0; fd = open(av[1], O_RDONLY); img->to_be_free.fd = fd;