From 256724e6011b6fcc400ef9eedf5d8525681cda6f Mon Sep 17 00:00:00 2001 From: Loic Deridder Date: Wed, 12 Feb 2025 13:32:12 +0100 Subject: [PATCH] compiling --- includes/exec/builtins.h | 7 +++-- includes/exec/env.h | 3 ++- includes/exec/exec.h | 3 ++- includes/exec/expander.h | 3 ++- includes/minishell.h | 43 +++++++++++++++--------------- includes/parser/ast.h | 4 +-- includes/parser/drawio.h | 5 +++- includes/parser/heredoc.h | 4 ++- includes/parser/parsing.h | 4 ++- includes/parser/tokenizer.h | 2 -- srcs/builtins/cd.c | 2 +- srcs/builtins/echo.c | 2 +- srcs/builtins/env.c | 2 +- srcs/builtins/exit.c | 2 +- srcs/builtins/export.c | 2 +- srcs/builtins/pwd.c | 2 +- srcs/builtins/unset.c | 2 +- srcs/builtins/utils.c | 2 +- srcs/execution/exec.c | 2 +- srcs/execution/exec_builtin.c | 4 +-- srcs/execution/exec_cmd.c | 4 +-- srcs/execution/exec_heredoc.c | 2 +- srcs/execution/exec_pline.c | 4 +-- srcs/execution/exec_redir.c | 4 +-- srcs/execution/exec_subsh.c | 4 +-- srcs/execution/exec_utils.c | 4 +-- srcs/expander/expand_star.c | 6 ++--- srcs/expander/expander.c | 4 +-- srcs/expander/expander_utils.c | 4 +-- srcs/expander/expander_var_utils.c | 2 +- srcs/parsing/ast/ast.c | 1 - srcs/parsing/syntax.c | 2 +- 32 files changed, 74 insertions(+), 67 deletions(-) diff --git a/includes/exec/builtins.h b/includes/exec/builtins.h index 0b6ffc3..7174b43 100644 --- a/includes/exec/builtins.h +++ b/includes/exec/builtins.h @@ -13,7 +13,6 @@ #ifndef BUILTINS_H # define BUILTINS_H -# include "../minishell.h" # include # include # include @@ -23,9 +22,13 @@ # include # include +typedef struct s_ast_n t_ast_n; +typedef struct s_node t_node; +typedef struct s_msh t_msh; + # define UNSET_ARG "not enough arguments" # define EXPRT_INV "not a valid identifier" -// void echo(char *msg, int flag); + int builtin_echo(t_ast_n *node, char **envp); int builtin_exit(char **arg, bool depth, t_ast_n *node); int builtin_pwd(char **arg); diff --git a/includes/exec/env.h b/includes/exec/env.h index 3dc6caf..f964792 100644 --- a/includes/exec/env.h +++ b/includes/exec/env.h @@ -13,11 +13,12 @@ #ifndef ENV_H # define ENV_H -# include "../minishell.h" # include # include # include +typedef struct s_msh t_msh; + //VAR int count_var(char **envp); int get_var_index(char *key, t_msh *msh); diff --git a/includes/exec/exec.h b/includes/exec/exec.h index a96cf5a..f57890a 100644 --- a/includes/exec/exec.h +++ b/includes/exec/exec.h @@ -13,7 +13,6 @@ #ifndef EXEC_H # define EXEC_H -# include "../minishell.h" # include # include # include @@ -21,6 +20,8 @@ # include # include +typedef struct s_ast_n t_ast_n; + int execute_command(t_ast_n *node); //EXEC_REDIR diff --git a/includes/exec/expander.h b/includes/exec/expander.h index 2496210..6c08e33 100644 --- a/includes/exec/expander.h +++ b/includes/exec/expander.h @@ -13,10 +13,11 @@ #ifndef EXPANDER_H # define EXPANDER_H -# include "../minishell.h" # include # include +typedef struct s_ast_n t_ast_n; + int in_dquote(char *str, char *ch); int in_squote(char *str, char *ch); int expand_var(t_ast_n *node, int j); diff --git a/includes/minishell.h b/includes/minishell.h index def3600..1765ad2 100644 --- a/includes/minishell.h +++ b/includes/minishell.h @@ -13,26 +13,6 @@ #ifndef MINISHELL_H # define MINISHELL_H -# define DEBUG 1 - -# ifndef DIO_PATH -# define DIO_PATH "ast.xml" -# endif - -typedef struct s_ast_n t_ast_n; -typedef struct s_node t_node; - -typedef struct s_msh -{ - int ex_code; - t_ast_n *head; - int here_fd; - char *input; - int hist; - char **env; -} t_msh; - - # include # include # include @@ -41,8 +21,7 @@ typedef struct s_msh # include # include # include -#include - +# include # include "../lib/libft/libft.h" # include "parser/ast.h" # include "parser/drawio.h" @@ -54,6 +33,26 @@ typedef struct s_msh # include "exec/exec.h" # include "exec/expander.h" +# define DEBUG 1 + +# ifndef DIO_PATH +# define DIO_PATH "ast.xml" +# endif + +typedef struct s_ast_n t_ast_n; +typedef struct s_node t_node; +typedef struct s_msh t_msh; + +typedef struct s_msh +{ + int ex_code; + t_ast_n *head; + int here_fd; + char *input; + int hist; + char **env; +} t_msh; + t_msh *init_msh(char **envp); void free_msh(t_msh *msh); void free_child(t_msh *msh); diff --git a/includes/parser/ast.h b/includes/parser/ast.h index 053b255..411fcb8 100644 --- a/includes/parser/ast.h +++ b/includes/parser/ast.h @@ -13,8 +13,8 @@ #ifndef AST_H # define AST_H -/*# include "../../includes/env.h"*/ -# include "../minishell.h" +typedef struct s_node t_node; +typedef struct s_msh t_msh; typedef enum e_state { diff --git a/includes/parser/drawio.h b/includes/parser/drawio.h index 5fabd35..8274286 100644 --- a/includes/parser/drawio.h +++ b/includes/parser/drawio.h @@ -13,7 +13,10 @@ #ifndef DRAWIO_H # define DRAWIO_H -# include "../minishell.h" +# include "../../lib/libft/libft.h" + +typedef struct s_ast_n t_ast_n; +typedef struct s_node t_node; typedef struct s_dio_node { diff --git a/includes/parser/heredoc.h b/includes/parser/heredoc.h index 786232c..76d26f6 100644 --- a/includes/parser/heredoc.h +++ b/includes/parser/heredoc.h @@ -13,7 +13,9 @@ #ifndef HEREDOC_H # define HEREDOC_H -# include "../minishell.h" + +typedef struct s_node t_node; +typedef struct s_msh t_msh; void read_hereinput(char *limiter, t_node *lst, t_msh *msh); void parse_heredoc(char *limiter, t_node *lst, t_msh *msh); diff --git a/includes/parser/parsing.h b/includes/parser/parsing.h index 6abf3e1..2e6f008 100644 --- a/includes/parser/parsing.h +++ b/includes/parser/parsing.h @@ -13,7 +13,9 @@ #ifndef PARSING_H # define PARSING_H -# include "../minishell.h" +typedef struct s_node t_node; +typedef struct s_ast_n t_ast_n; +typedef struct s_msh t_msh; t_ast_n *parser(char *input, t_msh *msh); diff --git a/includes/parser/tokenizer.h b/includes/parser/tokenizer.h index 5db48c8..345f8d5 100644 --- a/includes/parser/tokenizer.h +++ b/includes/parser/tokenizer.h @@ -13,8 +13,6 @@ #ifndef TOKENIZER_H # define TOKENIZER_H -# include "../minishell.h" - typedef enum e_token { UNSET, diff --git a/srcs/builtins/cd.c b/srcs/builtins/cd.c index 47f2484..27072f5 100644 --- a/srcs/builtins/cd.c +++ b/srcs/builtins/cd.c @@ -6,7 +6,7 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 14:31:49 by lderidde #+# #+# */ -/* Updated: 2025/02/03 13:12:47 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:31:38 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/builtins/echo.c b/srcs/builtins/echo.c index 56c6db9..2f607a6 100644 --- a/srcs/builtins/echo.c +++ b/srcs/builtins/echo.c @@ -6,7 +6,7 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 14:31:56 by lderidde #+# #+# */ -/* Updated: 2025/02/08 11:02:58 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:31:35 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/builtins/env.c b/srcs/builtins/env.c index d47ccca..89f91da 100644 --- a/srcs/builtins/env.c +++ b/srcs/builtins/env.c @@ -6,7 +6,7 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 14:32:04 by lderidde #+# #+# */ -/* Updated: 2025/01/28 09:54:32 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:31:32 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/builtins/exit.c b/srcs/builtins/exit.c index 4bc01d3..fc650ea 100644 --- a/srcs/builtins/exit.c +++ b/srcs/builtins/exit.c @@ -6,7 +6,7 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 14:32:13 by lderidde #+# #+# */ -/* Updated: 2025/02/11 13:01:12 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:31:27 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/builtins/export.c b/srcs/builtins/export.c index acbe360..1f9c054 100644 --- a/srcs/builtins/export.c +++ b/srcs/builtins/export.c @@ -6,7 +6,7 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 14:32:20 by lderidde #+# #+# */ -/* Updated: 2025/02/11 14:25:21 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:31:24 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/builtins/pwd.c b/srcs/builtins/pwd.c index 2e04b80..c796943 100644 --- a/srcs/builtins/pwd.c +++ b/srcs/builtins/pwd.c @@ -6,7 +6,7 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 14:32:30 by lderidde #+# #+# */ -/* Updated: 2025/01/28 10:38:07 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:31:22 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/builtins/unset.c b/srcs/builtins/unset.c index fe6746a..1dd5a59 100644 --- a/srcs/builtins/unset.c +++ b/srcs/builtins/unset.c @@ -6,7 +6,7 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 14:32:36 by lderidde #+# #+# */ -/* Updated: 2025/02/03 13:12:14 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:31:19 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/builtins/utils.c b/srcs/builtins/utils.c index 57d9b76..592429b 100644 --- a/srcs/builtins/utils.c +++ b/srcs/builtins/utils.c @@ -6,7 +6,7 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 14:32:41 by lderidde #+# #+# */ -/* Updated: 2025/01/28 10:53:44 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:31:16 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/execution/exec.c b/srcs/execution/exec.c index 4d3f190..340551a 100644 --- a/srcs/execution/exec.c +++ b/srcs/execution/exec.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "../../includes/exec/exec.h" +#include "../../includes/minishell.h" int execute_command(t_ast_n *node) { diff --git a/srcs/execution/exec_builtin.c b/srcs/execution/exec_builtin.c index 5710edd..9a41487 100644 --- a/srcs/execution/exec_builtin.c +++ b/srcs/execution/exec_builtin.c @@ -6,11 +6,11 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/12 09:48:21 by lderidde #+# #+# */ -/* Updated: 2025/02/12 09:48:21 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:31:06 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../includes/exec/exec.h" +#include "../../includes/minishell.h" int is_builtin(char *str) { diff --git a/srcs/execution/exec_cmd.c b/srcs/execution/exec_cmd.c index 5201dd3..a279352 100644 --- a/srcs/execution/exec_cmd.c +++ b/srcs/execution/exec_cmd.c @@ -6,11 +6,11 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/12 10:00:08 by lderidde #+# #+# */ -/* Updated: 2025/02/12 10:00:08 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:31:03 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../includes/exec/exec.h" +#include "../../includes/minishell.h" int count_cmds(t_ast_n **pline) { diff --git a/srcs/execution/exec_heredoc.c b/srcs/execution/exec_heredoc.c index 9cd8a62..c22e812 100644 --- a/srcs/execution/exec_heredoc.c +++ b/srcs/execution/exec_heredoc.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "../../includes/exec/exec.h" +#include "../../includes/minishell.h" void expander_here(char **str, t_ast_n *node) { diff --git a/srcs/execution/exec_pline.c b/srcs/execution/exec_pline.c index 3ad7e0b..5453769 100644 --- a/srcs/execution/exec_pline.c +++ b/srcs/execution/exec_pline.c @@ -6,11 +6,11 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/12 09:50:12 by lderidde #+# #+# */ -/* Updated: 2025/02/12 09:50:12 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:30:51 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../includes/exec/exec.h" +#include "../../includes/minishell.h" void exec_pcmd(t_ast_n *pcmd) { diff --git a/srcs/execution/exec_redir.c b/srcs/execution/exec_redir.c index d055a1d..75128ad 100644 --- a/srcs/execution/exec_redir.c +++ b/srcs/execution/exec_redir.c @@ -6,11 +6,11 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/12 09:42:31 by lderidde #+# #+# */ -/* Updated: 2025/02/12 09:42:31 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:30:49 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../includes/exec/exec.h" +#include "../../includes/minishell.h" void handle_file(t_ast_n *node, int check, int i) { diff --git a/srcs/execution/exec_subsh.c b/srcs/execution/exec_subsh.c index 38169fb..38dadec 100644 --- a/srcs/execution/exec_subsh.c +++ b/srcs/execution/exec_subsh.c @@ -6,11 +6,11 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/12 09:52:04 by lderidde #+# #+# */ -/* Updated: 2025/02/12 09:52:04 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:30:47 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../includes/exec/exec.h" +#include "../../includes/minishell.h" int exec_shcmd(t_ast_n *node) { diff --git a/srcs/execution/exec_utils.c b/srcs/execution/exec_utils.c index 67ad748..ad7dd3c 100644 --- a/srcs/execution/exec_utils.c +++ b/srcs/execution/exec_utils.c @@ -6,11 +6,11 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/12 09:57:39 by lderidde #+# #+# */ -/* Updated: 2025/02/12 09:57:39 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:30:44 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../includes/exec/exec.h" +#include "../../includes/minishell.h" int execis_validchar(char c) { diff --git a/srcs/expander/expand_star.c b/srcs/expander/expand_star.c index 667a677..7254263 100644 --- a/srcs/expander/expand_star.c +++ b/srcs/expander/expand_star.c @@ -6,13 +6,11 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/10 09:09:37 by lderidde #+# #+# */ -/* Updated: 2025/02/11 15:29:43 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:30:38 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../includes/exec/expander.h" -#include -#include +#include "../../includes/minishell.h" static char *_strfjoin(char *s1, char *s2) { diff --git a/srcs/expander/expander.c b/srcs/expander/expander.c index 452dd2c..8185fc2 100644 --- a/srcs/expander/expander.c +++ b/srcs/expander/expander.c @@ -6,11 +6,11 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/07 10:23:02 by lderidde #+# #+# */ -/* Updated: 2025/02/11 13:10:18 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:30:32 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../includes/exec/expander.h" +#include "../../includes/minishell.h" void remove_quote(t_ast_n *node, int j, char c) { diff --git a/srcs/expander/expander_utils.c b/srcs/expander/expander_utils.c index fc3febc..aa28252 100644 --- a/srcs/expander/expander_utils.c +++ b/srcs/expander/expander_utils.c @@ -6,11 +6,11 @@ /* By: lderidde +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/11 15:28:57 by lderidde #+# #+# */ -/* Updated: 2025/02/11 15:28:57 by lderidde ### ########.fr */ +/* Updated: 2025/02/12 13:30:27 by lderidde ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../includes/exec/expander.h" +#include "../../includes/minishell.h" bool ft_fnmatch(const char *str, const char *pat) { diff --git a/srcs/expander/expander_var_utils.c b/srcs/expander/expander_var_utils.c index 408612c..bc18928 100644 --- a/srcs/expander/expander_var_utils.c +++ b/srcs/expander/expander_var_utils.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "../../includes/exec/expander.h" +#include "../../includes/minishell.h" int expand_exit(t_ast_n *node, int j, int k) { diff --git a/srcs/parsing/ast/ast.c b/srcs/parsing/ast/ast.c index ffcdd6f..ffd6c77 100644 --- a/srcs/parsing/ast/ast.c +++ b/srcs/parsing/ast/ast.c @@ -11,7 +11,6 @@ /* ************************************************************************** */ #include "../../../includes/minishell.h" -#include t_ast_n *create_ast_n(t_node *lst, t_ast_n *parent, t_msh *msh, bool subsh) { diff --git a/srcs/parsing/syntax.c b/srcs/parsing/syntax.c index 0e6c96f..e6ca0c0 100644 --- a/srcs/parsing/syntax.c +++ b/srcs/parsing/syntax.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "../../includes/parser/parsing.h" +#include "../../includes/minishell.h" int syntax_err_mess(char *token_base, int selected) {