From 487a66394061f2d14a2fa421302966b5442d643f Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Mon, 27 Jul 2020 18:55:07 +0200 Subject: I couldn't see shit --- src/e_externs.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 src/e_externs.c (limited to 'src/e_externs.c') diff --git a/src/e_externs.c b/src/e_externs.c new file mode 100644 index 0000000..d7c4854 --- /dev/null +++ b/src/e_externs.c @@ -0,0 +1,79 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* e_externs.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 "e_externs_next.h" +#include "m_redirs.h" +#include "s_destroy.h" +#include "s_lcom.h" +#include "s_struct.h" + +static void + e_extern_child(const char *fullpath, + t_lcom *ptr, + t_msh *msh) +{ + dup_redirs(ptr, msh); + execve(fullpath, ptr->argv, msh->envp); + /* TODO: handle execve failed */ +} + +static void + exec_path(const char fullpath[], + t_lcom *ptr, + t_msh *msh) +{ + pid_t pid; + int32_t status; + + if ((pid = fork()) == 0) + { + e_extern_child(fullpath, ptr, msh); + } + else if (pid < 0) + { + /* TODO: handle fork failed */ + } + else + { + while (wait(&status) != pid) + ; + msh->ret = WEXITSTATUS(status); + } +} + +void + e_extern(t_lcom *ptr, + t_msh *msh) +{ + char **envpath; + char *fullpath; + + if (ft_ischarset("/.", ptr->com[0])) + { + exec_path(ptr->com, ptr, msh); + return ; + } + else if ((envpath = get_env_path(msh)) != NULL) + { + fullpath = search_in_path(ptr->com, envpath, msh); + ft_delwords(envpath); + } + /* TODO: deal if not found etc */ + exec_path(fullpath, ptr, msh); + ft_memdel((void*)&fullpath); +} -- cgit v1.2.3 From c19bd35afdb45e49cebdfd96e7adb1e6fe477f0c Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Thu, 30 Jul 2020 20:30:58 +0200 Subject: Double exit no more --- src/e_externs.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/e_externs.c') diff --git a/src/e_externs.c b/src/e_externs.c index d7c4854..3d55fa9 100644 --- a/src/e_externs.c +++ b/src/e_externs.c @@ -17,6 +17,7 @@ #include #include "e_externs_next.h" +#include "f_fail.h" #include "m_redirs.h" #include "s_destroy.h" #include "s_lcom.h" @@ -72,8 +73,15 @@ void { fullpath = search_in_path(ptr->com, envpath, msh); ft_delwords(envpath); + if (fullpath == NULL) + { + f_fail_command_not_found(ptr->com); + /* TODO: deal if not found etc */ + } + else + { + exec_path(fullpath, ptr, msh); + ft_memdel((void*)&fullpath); + } } - /* TODO: deal if not found etc */ - exec_path(fullpath, ptr, msh); - ft_memdel((void*)&fullpath); } -- cgit v1.2.3 From db381c5a5d8755937663a5ea61e655186f7606e7 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Thu, 30 Jul 2020 22:14:06 +0200 Subject: Not too bad --- src/e_externs.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/e_externs.c') diff --git a/src/e_externs.c b/src/e_externs.c index 3d55fa9..93d989f 100644 --- a/src/e_externs.c +++ b/src/e_externs.c @@ -76,7 +76,6 @@ void if (fullpath == NULL) { f_fail_command_not_found(ptr->com); - /* TODO: deal if not found etc */ } else { -- cgit v1.2.3