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

fixed merge confclict

Browse Source
This commit is contained in:
mdev9
2024-02-18 17:05:13 +01:00
parent e126456b49 1396ee52af
commit da8d8cbe1c
4 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srcs/main.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */
/* Updated: 2024/02/18 17:00:21 by marde-vr ### ########.fr */
/* Updated: 2024/02/18 17:04:53 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -92,11 +92,11 @@ int main(int argc, char **argv, char **envp)
free(prompt);
add_history(command);
parsed_cmd = parse_command(command, env);
print_parsed_cmd(parsed_cmd);//debug
//print_parsed_cmd(parsed_cmd);//debug
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();