Skip to content

revert to commit ce829882741ec38743832cb7aba1d94cb3637f63 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Polozone wants to merge 4 commits into
base: polo
Choose a base branch
from
Open

revert to commit ce829882741ec38743832cb7aba1d94cb3637f63 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96f6939
revert to commit ce829882741ec38743832cb7aba1d94cb3637f63
Polozone Sep 14, 2022
062fef4
resolve conflicts
Polozone Sep 14, 2022
9947d4e
old version clean
Polozone Sep 14, 2022
ff864e3
resolve conflicts
Polozone Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified minishell
View file
Open in desktop
Binary file not shown.
18 changes: 18 additions & 0 deletions srcs/execution/ft_execution.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@

#include "../../includes/minishell.h"

<<<<<<< HEAD
void is_builtin(t_prg data, t_cmd_lst *node)
=======
void is_builtin(t_prg *data, t_cmd_lst *node)
>>>>>>> 062fef404de5f7b3805a1b187272e7daca4e289b
{
if (node->is_cmd_builtin)
{
if (node->is_cmd_builtin == echo)
<<<<<<< HEAD
_echo_exe(&data, 0);
if (node->is_cmd_builtin == cd)
_ch_dir(&data);
if (node->is_cmd_builtin == pwd)
_pwd_exe();
if (node->is_cmd_builtin == export)
_export_env(&data);
if (node->is_cmd_builtin == unset)
_unset_env_parent(&data);
if (node->is_cmd_builtin == env)
_print_env(data.env_lst);
=======
_echo_exe(data, 0);
if (node->is_cmd_builtin == cd)
_ch_dir(data);
Expand All @@ -17,6 +34,7 @@ void is_builtin(t_prg *data, t_cmd_lst *node)
_unset_env_parent(data);
if (node->is_cmd_builtin == env)
_print_env(data->env_lst);
>>>>>>> 062fef404de5f7b3805a1b187272e7daca4e289b
if (node->is_cmd_builtin == quit)
exit(0);
exit(0);
Expand Down