diff --git a/srcs/minishell.h b/srcs/minishell.h index c406424..f48585a 100755 --- a/srcs/minishell.h +++ b/srcs/minishell.h @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */ -/* Updated: 2024/04/19 10:39:52 by tomoron ### ########.fr */ +/* Updated: 2024/04/19 13:19:48 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -77,34 +77,33 @@ typedef struct s_msh extern int g_return_code; -t_token *token_add_back(t_token *res, char *token); t_cmd *cmd_add_back(t_cmd *res, char *cmd, t_cmd_type type); void *here_doc_variables(int write, int index, void *data); int add_var_to_str(char *res, char **command, t_env *env); void find_cmd_path(t_msh *msh, char **paths, int *found); t_env *env_add_back(t_env *env, char *name, char *value); +t_token *parse_cmds_to_token(t_cmd *command, t_env *env); void exec_command_bonus(t_msh *msh, char *cmd_str); +t_token *add_token_back(t_token *res, t_token *next); +t_token *expand_wildcards(t_token *res, char *value); int cmd_is_builtin(t_msh *msh, char *cmd_token); +t_token *token_add_back(t_token *res, char *token); void child(t_msh *msh, char **cmd_args, int i); t_token *parse_tokens(char *command, t_env *env); -t_token *add_token_back(t_token *res, t_token *next); -t_token *parse_cmds_to_token(t_cmd *command, t_env *env); void parent(t_msh *msh, int i, int cmd_count); char *ft_get_env(t_env *env, char *var_name); -int is_fd_open(int fd); -void get_out_type(t_msh *msh, t_cmd *cmds); -void exec_commands(t_msh *msh); void handle_here_doc(t_msh *msh, char *eof); void get_in_type(t_msh *msh, t_cmd *tokens); void signal_handler_interactive(int signum); +void get_out_type(t_msh *msh, t_cmd *cmds); int get_token_len(char *cmd, t_env *env); +void print_syntax_error_bonus(t_cmd *cmd); void signal_handler_here_doc(int signum); t_token *parsing_syntax_error(t_token *res); -t_cmd *parsing_bonus(char *cmd); int file_access(t_msh *msh, int *found); void remove_command_from_msh(t_msh *msh); -t_token *expand_wildcards(t_token *res, char *value); void ft_exit(t_msh *msh, int error_code); +void sort_wildcards_token(t_token *list); void signal_handler_command(int signum); void ft_exit(t_msh *msh, int exit_code); void redirect_output(t_msh *msh, int i); @@ -120,33 +119,33 @@ char *get_tmp_file_name(t_msh *msh); int get_args_count(t_token *cmds); char **env_to_char_tab(t_env *env); void print_parsed_cmd(t_cmd *cmd);//debug -int get_cmd_count(t_cmd *cmds); int first_is_in_type(t_cmd *cmd); +void print_msh_struct(t_msh *msh); int contains_newline(char *str); +int get_cmd_count(t_cmd *cmds); int check_var_name(char *name); char **get_cmd_args(t_msh *msh); -void print_msh_struct(t_msh *msh); char *remove_path(char *token); +t_cmd *parsing_bonus(char *cmd); +t_token *free_token(t_token *cmd); +void exec_commands(t_msh *msh); char *get_var_name(char *str); int exec_builtin(t_msh *msh); void get_cmd_path(t_msh *msh); -t_token *free_token(t_token *cmd); -int is_input_type(t_cmd *cmd); -int is_output_type(t_cmd *cmd); -int is_cmd_type(t_cmd *cmd); int is_operand_type(t_cmd *cmd); int set_echoctl(int value); -void sort_wildcards_token(t_token *list); +int is_output_type(t_cmd *cmd); int print_env(t_env *env); t_cmd *free_cmd(t_cmd *cmd); -void print_syntax_error_bonus(t_cmd *cmd); int ft_export(t_msh *msh); +int is_input_type(t_cmd *cmd); void free_env(t_env *env); int ft_unset(t_msh *msh); void free_msh(t_msh *msh); void free_msh(t_msh *msh); int echo(t_token *args); int exit_bt(t_msh *msh); +int is_cmd_type(t_cmd *cmd); int is_cmd_char(char c); int cd(t_token *args); int pwd(void);