From d8e3092ea5ff811aa7dc27690305306adeea1a4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Luk=C3=A1=C5=A1=20Ji=C5=99i=C5=A1t=C4=9B?= Date: Mon, 26 Aug 2024 11:46:19 +0200 Subject: [PATCH] Create header file for builtins --- inc/builtins.h | 24 ++++++++++++++++++++++++ inc/execution.h | 10 +--------- src/builtins/cd.c | 6 +++--- src/builtins/echo.c | 16 ++++++++++++++-- src/builtins/env.c | 18 +++++++++++++++--- src/builtins/export.c | 6 +++--- src/builtins/pwd.c | 16 ++++++++++++++-- src/execution.c | 5 +++-- 8 files changed, 77 insertions(+), 24 deletions(-) create mode 100644 inc/builtins.h diff --git a/inc/builtins.h b/inc/builtins.h new file mode 100644 index 0000000..752d10a --- /dev/null +++ b/inc/builtins.h @@ -0,0 +1,24 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* builtins.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: ljiriste +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/08/26 11:39:54 by ljiriste #+# #+# */ +/* Updated: 2024/08/26 11:51:32 by ljiriste ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef BUILTINS_H +# define BUILTINS_H + +#include "minishell_structs.h" + +int cd(int argc, char **argv, t_execution_env *env); +int echo(int argc, char **argv); +int pwd(void); +int ft_env(int argc, t_execution_env *env); +int export(int argc, char **argv, t_execution_env *env); + +#endif // BUILTINS_H diff --git a/inc/execution.h b/inc/execution.h index 5e4d6a5..9aa5207 100644 --- a/inc/execution.h +++ b/inc/execution.h @@ -6,19 +6,11 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/02 17:40:19 by ljiriste #+# #+# */ -/* Updated: 2024/08/26 11:41:25 by ljiriste ### ########.fr */ +/* Updated: 2024/08/26 11:42:37 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef EXECUTION_H # define EXECUTION_H -#include "minishell.h" - -int cd(int argc, char **argv, t_execution_env *env); -int echo(int argc, char **argv); -int pwd(void); -int ft_env(int argc, t_execution_env *env); -int export(int argc, char **argv, t_execution_env *env); - #endif // EXECUTION_H diff --git a/src/builtins/cd.c b/src/builtins/cd.c index 31979b6..ba1fa71 100644 --- a/src/builtins/cd.c +++ b/src/builtins/cd.c @@ -6,12 +6,12 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/02 16:37:48 by ljiriste #+# #+# */ -/* Updated: 2024/08/23 16:54:38 by ljiriste ### ########.fr */ +/* Updated: 2024/08/26 11:45:11 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ -#include "minishell.h" -#include "execution.h" +#include "builtins.h" +#include "minishell_structs.h" #include #include diff --git a/src/builtins/echo.c b/src/builtins/echo.c index f00219b..1a21600 100644 --- a/src/builtins/echo.c +++ b/src/builtins/echo.c @@ -1,6 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* echo.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: ljiriste +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/08/26 11:43:48 by ljiriste #+# #+# */ +/* Updated: 2024/08/26 11:45:17 by ljiriste ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "builtins.h" +#include "minishell_structs.h" #include -#include "minishell.h" -#include "execution.h" #include int ft_check_n(char *str) diff --git a/src/builtins/env.c b/src/builtins/env.c index ebfc66f..5caf116 100644 --- a/src/builtins/env.c +++ b/src/builtins/env.c @@ -1,8 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* env.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: ljiriste +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/08/26 11:44:01 by ljiriste #+# #+# */ +/* Updated: 2024/08/26 11:44:23 by ljiriste ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "builtins.h" +#include "minishell_structs.h" +#include "libft.h" #include #include -#include "minishell.h" -#include "execution.h" -#include "libft.h" int env_exec(const t_execution_env *env) { diff --git a/src/builtins/export.c b/src/builtins/export.c index de808e2..c0ea1b0 100644 --- a/src/builtins/export.c +++ b/src/builtins/export.c @@ -6,12 +6,12 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/23 09:40:38 by ljiriste #+# #+# */ -/* Updated: 2024/08/23 18:06:00 by ljiriste ### ########.fr */ +/* Updated: 2024/08/26 11:44:35 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ -#include "execution.h" -#include "minishell.h" +#include "builtins.h" +#include "minishell_structs.h" #include static void unset_single(const char *name, t_execution_env *env) diff --git a/src/builtins/pwd.c b/src/builtins/pwd.c index 7176bec..71e85b1 100644 --- a/src/builtins/pwd.c +++ b/src/builtins/pwd.c @@ -1,7 +1,19 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* pwd.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: ljiriste +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/08/26 11:44:43 by ljiriste #+# #+# */ +/* Updated: 2024/08/26 11:44:47 by ljiriste ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "builtins.h" +#include "minishell_structs.h" #include #include -#include "minishell.h" -#include "execution.h" int pwd(void) { diff --git a/src/execution.c b/src/execution.c index 3a8efda..2c42b31 100644 --- a/src/execution.c +++ b/src/execution.c @@ -6,12 +6,13 @@ /* By: lnikolov -- 2.30.2