From d21d9e44a5bd0582145e167a62cb6eeccc4d818d Mon Sep 17 00:00:00 2001 From: tomoron Date: Sun, 18 Feb 2024 17:06:00 +0100 Subject: [PATCH] addr env --- srcs/main.c | 7 +++---- srcs/minishellrc.c | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/srcs/main.c b/srcs/main.c index 6a6b145..d1f1a06 100755 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ -/* Updated: 2024/02/18 16:19:12 by tomoron ### ########.fr */ +/* Updated: 2024/02/18 16:57:18 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -81,8 +81,7 @@ int main(int argc, char **argv, char **envp) env = get_env(envp); aliases = 0; aliases = alias_add_back(0, ft_strdup("test"), ft_strdup("echo test")); // debug - if (env) - handle_minishellrc(env, aliases); + handle_minishellrc(&env, aliases); while (env && command) { prompt = get_prompt(); @@ -96,7 +95,7 @@ int main(int argc, char **argv, char **envp) parsed_cmd = handle_alias(parsed_cmd, env, aliases); free(command); //print_parsed_cmd(parsed_cmd);//debug - exec_command(parsed_cmd, env, &aliases); + exec_command(parsed_cmd, &env, &aliases); free_cmd(parsed_cmd); } rl_clear_history(); diff --git a/srcs/minishellrc.c b/srcs/minishellrc.c index 867a224..ef93200 100644 --- a/srcs/minishellrc.c +++ b/srcs/minishellrc.c @@ -6,13 +6,13 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/16 17:40:16 by marde-vr #+# #+# */ -/* Updated: 2024/02/17 04:30:14 by tomoron ### ########.fr */ +/* Updated: 2024/02/18 16:58:41 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -void handle_minishellrc(t_env *env, t_alias *aliases) +void handle_minishellrc(t_env &env, t_alias *aliases) { char *home; char *rc_path; @@ -20,7 +20,7 @@ void handle_minishellrc(t_env *env, t_alias *aliases) char *line; t_cmd *parsed_cmd; - home = ft_get_env(env, "HOME"); + home = ft_get_env(*env, "HOME"); rc_path = ft_strjoin(home, "/.minishellrc"); if (access(rc_path, R_OK) != -1) {