diff options
| author | Christopher Uhlig | 2024-10-25 20:44:14 +0200 |
|---|---|---|
| committer | Christopher Uhlig | 2024-10-25 20:44:14 +0200 |
| commit | eafa035f9a72961280f4b1bb8f405f40000d3212 (patch) | |
| tree | 3566b9bcfde24d59afc7591179647f393184cfaf /include | |
| parent | ca4acea03cda19c2a0f0fd168d3c8fd418d71e04 (diff) | |
| parent | 15d8385f8ecf30e1ca74025b12fed7e45349b706 (diff) | |
| download | minishell-eafa035f9a72961280f4b1bb8f405f40000d3212.tar.gz minishell-eafa035f9a72961280f4b1bb8f405f40000d3212.zip | |
resolved merge conflicts
Diffstat (limited to 'include')
| -rw-r--r-- | include/env.h | 9 | ||||
| -rw-r--r-- | include/minishell.h | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/env.h b/include/env.h index 3bf6bd6..a35bec3 100644 --- a/include/env.h +++ b/include/env.h @@ -6,7 +6,7 @@ /* By: chuhlig <chuhlig@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/08 16:53:39 by dkaiser #+# #+# */ -/* Updated: 2024/10/17 17:08:01 by chuhlig ### ########.fr */ +/* Updated: 2024/10/25 19:53:38 by chuhlig ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,6 +19,7 @@ typedef struct s_env struct s_env *next; } t_env; -void getenvlst(t_env **env, char **en); -void free_envlst(t_env **env); -char *env_get(t_env *env, char *name); +void getenvlst(t_env **env, char **en); +void free_envlst(t_env **env); +char *env_get(t_env *env, char *name); +char **env_to_strlst(t_env *env);
\ No newline at end of file diff --git a/include/minishell.h b/include/minishell.h index 7b6226e..b2a3845 100644 --- a/include/minishell.h +++ b/include/minishell.h @@ -6,7 +6,7 @@ /* By: chuhlig <chuhlig@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/22 17:14:49 by dkaiser #+# #+# */ -/* Updated: 2024/10/22 16:52:26 by chuhlig ### ########.fr */ +/* Updated: 2024/10/25 16:10:21 by chuhlig ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,5 +37,7 @@ t_redirection *collect_redirs(t_token **tokens); void print_ast(t_node *ast); -int eval(t_node *node, t_env **env); +int eval(t_node *node, t_env **env); +char *get_cmd_path(char *cmd, t_env *env); +int execute_cmd(t_cmd *cmd, t_env *env); #endif |