tom/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

addr env

Browse Source
This commit is contained in:
tomoron
2024-02-18 17:06:00 +01:00
parent 1396ee52af
commit d21d9e44a5
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
srcs/main.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ /* 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); env = get_env(envp);
aliases = 0; aliases = 0;
aliases = alias_add_back(0, ft_strdup("test"), ft_strdup("echo test")); // debug 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) while (env && command)
{ {
prompt = get_prompt(); prompt = get_prompt();
@ -96,7 +95,7 @@ int main(int argc, char **argv, char **envp)
parsed_cmd = handle_alias(parsed_cmd, env, aliases); parsed_cmd = handle_alias(parsed_cmd, env, aliases);
free(command); free(command);
//print_parsed_cmd(parsed_cmd);//debug //print_parsed_cmd(parsed_cmd);//debug
exec_command(parsed_cmd, env, &aliases); exec_command(parsed_cmd, &env, &aliases);
free_cmd(parsed_cmd); free_cmd(parsed_cmd);
} }
rl_clear_history(); rl_clear_history();

6
srcs/minishellrc.c
View File

@ -6,13 +6,13 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/16 17:40:16 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" #include "minishell.h"
void handle_minishellrc(t_env *env, t_alias *aliases) void handle_minishellrc(t_env &env, t_alias *aliases)
{ {
char *home; char *home;
char *rc_path; char *rc_path;
@ -20,7 +20,7 @@ void handle_minishellrc(t_env *env, t_alias *aliases)
char *line; char *line;
t_cmd *parsed_cmd; t_cmd *parsed_cmd;
home = ft_get_env(env, "HOME"); home = ft_get_env(*env, "HOME");
rc_path = ft_strjoin(home, "/.minishellrc"); rc_path = ft_strjoin(home, "/.minishellrc");
if (access(rc_path, R_OK) != -1) if (access(rc_path, R_OK) != -1)
{ {