From b888a5fd3ffd5b304536cee875446b60042c3cd7 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sat, 25 Apr 2020 13:38:30 +0200 Subject: strerror is nice actually --- src/ft_f_file.c | 42 ------------------------------------------ src/ft_f_file.h | 21 --------------------- src/ft_f_redir.c | 30 ++++++++++++++++++++++++++++++ src/ft_f_redir.h | 21 +++++++++++++++++++++ src/ft_m_redirs.c | 8 ++++---- 5 files changed, 55 insertions(+), 67 deletions(-) delete mode 100644 src/ft_f_file.c delete mode 100644 src/ft_f_file.h create mode 100644 src/ft_f_redir.c create mode 100644 src/ft_f_redir.h (limited to 'src') diff --git a/src/ft_f_file.c b/src/ft_f_file.c deleted file mode 100644 index 53e0c8b..0000000 --- a/src/ft_f_file.c +++ /dev/null @@ -1,42 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_f_file.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: rbousset +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/02/14 17:19:27 by rbousset #+# #+# */ -/* Updated: 2020/02/14 17:19:29 by rbousset ### ########lyon.fr */ -/* */ -/* ************************************************************************** */ - -#include -#include -#include -#include -#include "ft_s_lcom.h" -#include "ft_s_destroy.h" - -void - ft_f_file(const char path[], - t_msh *msh) -{ - if (errno == ENOENT) - { - ft_dprintf(STDERR_FILENO, - "minishell: %s: No such file or directory\n", path); - } - else if (errno == EACCES) - { - ft_dprintf(STDERR_FILENO, - "minishell: %s: Permission denied\n", path); - } - else if (errno == EISDIR) - { - ft_dprintf(STDERR_FILENO, - "minishell: %s: Is a directory\n", path); - } - ft_lcom_clear(&msh->curr); - ft_s_destroy(msh); - exit(1); -} diff --git a/src/ft_f_file.h b/src/ft_f_file.h deleted file mode 100644 index 964dcf9..0000000 --- a/src/ft_f_file.h +++ /dev/null @@ -1,21 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_f_file.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: rbousset +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/02/14 17:19:27 by rbousset #+# #+# */ -/* Updated: 2020/02/14 17:19:29 by rbousset ### ########lyon.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef FT_F_FILE_H -#define FT_F_FILE_H - -#include "ft_s_struct.h" - -void ft_f_file(const char path[], - t_msh *msh); - -#endif diff --git a/src/ft_f_redir.c b/src/ft_f_redir.c new file mode 100644 index 0000000..997401a --- /dev/null +++ b/src/ft_f_redir.c @@ -0,0 +1,30 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_f_redir.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: rbousset +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/14 17:19:27 by rbousset #+# #+# */ +/* Updated: 2020/02/14 17:19:29 by rbousset ### ########lyon.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include +#include +#include +#include + +#include "ft_s_lcom.h" +#include "ft_s_destroy.h" + +void + ft_f_redir(const char path[], + t_msh *msh) +{ + ft_dprintf(STDERR_FILENO, "minishell: %s: %s\n", path, strerror(errno)); + ft_lcom_clear(&msh->curr); + ft_s_destroy(msh); + exit(1); +} diff --git a/src/ft_f_redir.h b/src/ft_f_redir.h new file mode 100644 index 0000000..2b99da7 --- /dev/null +++ b/src/ft_f_redir.h @@ -0,0 +1,21 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_f_redir.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: rbousset +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/14 17:19:27 by rbousset #+# #+# */ +/* Updated: 2020/02/14 17:19:29 by rbousset ### ########lyon.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef FT_F_REDIR_H +#define FT_F_REDIR_H + +#include "ft_s_struct.h" + +void ft_f_redir(const char path[], + t_msh *msh); + +#endif diff --git a/src/ft_m_redirs.c b/src/ft_m_redirs.c index 91d8553..e601894 100644 --- a/src/ft_m_redirs.c +++ b/src/ft_m_redirs.c @@ -14,7 +14,7 @@ #include #include -#include "ft_f_file.h" +#include "ft_f_redir.h" #include "ft_s_destroy.h" #include "ft_s_lcom.h" #include "ft_s_struct.h" @@ -28,7 +28,7 @@ void if (ptr->redir == -1) { if ((fd = open(ptr->rdrpath, O_RDONLY)) == -1) - ft_f_file(ptr->rdrpath, msh); + ft_f_redir(ptr->rdrpath, msh); dup2(fd, STDIN_FILENO); close(fd); } @@ -36,7 +36,7 @@ void { if ((fd = open(ptr->rdrpath, O_CREAT | O_TRUNC | O_WRONLY, 0644)) == -1) - ft_f_file(ptr->rdrpath, msh); + ft_f_redir(ptr->rdrpath, msh); dup2(fd, STDOUT_FILENO); close(fd); } @@ -44,7 +44,7 @@ void { if ((fd = open(ptr->rdrpath, O_CREAT | O_APPEND | O_WRONLY, 0644)) == -1) - ft_f_file(ptr->rdrpath, msh); + ft_f_redir(ptr->rdrpath, msh); dup2(fd, STDOUT_FILENO); close(fd); } -- cgit v1.2.3