diff options
| author | Dominik Kaiser | 2025-01-20 18:49:21 +0100 |
|---|---|---|
| committer | GitHub | 2025-01-20 18:49:21 +0100 |
| commit | ee1ea5ebfd335580cae3f05c814887547e10ac2b (patch) | |
| tree | b257a3786ded25e3d1bd9b1071a85cd3b6fe9f60 /include | |
| parent | 4e249399780b53dad6fa1bf6db8a7c6d32ee2d13 (diff) | |
| parent | 9fa887da20e409c2f25fac44b57f999e508a30ea (diff) | |
| download | minishell-ee1ea5ebfd335580cae3f05c814887547e10ac2b.tar.gz minishell-ee1ea5ebfd335580cae3f05c814887547e10ac2b.zip | |
Merge branch 'miau' into some-fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/env.h | 5 | ||||
| -rw-r--r-- | include/minishell.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/env.h b/include/env.h index 3fc83b7..56b50b5 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: 2025/01/18 18:43:07 by chuhlig ### ########.fr */ +/* Updated: 2025/01/20 16:48:57 by chuhlig ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,7 +30,7 @@ char **env_to_strlst(t_env *env); void update_oldpwd(t_env **env); void update_pwd(t_env **env); int unset(char **av, t_env **env); -int export(char **av, t_env **env); +int export(char **av, t_env **env, int f); int echo(char **av); int pwd(t_env *env); int cd(t_env **env, char **args); @@ -38,5 +38,6 @@ int ft_env(t_env *env); int builtin_exit(char **args, t_env **env); t_env *env_new(char *name); t_env *check_existing(t_env *env, char *av); +int check_flag(int f); #endif
\ No newline at end of file diff --git a/include/minishell.h b/include/minishell.h index ba2a6ad..1139dbb 100644 --- a/include/minishell.h +++ b/include/minishell.h @@ -41,7 +41,7 @@ int eval(t_node *node, t_env **env); char *get_cmd_path(char *cmd, t_env *env, int *return_code); int execute_cmd(t_cmd *cmd, t_env **env); char *format_string(char *str, t_env *env, int is_literal); -int set_return_code(int return_code, t_env **env); +void set_return_code(int return_code, t_env **env); int handle_redirections(t_redirection *redirs); void *error(int err_code, char *err_text, int exit_code, int *ret_code); |