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

fixed exit issue

Browse Source
This commit is contained in:
mdev9
2024-02-23 14:12:48 +01:00
parent f4ad139821
commit 3fd1553fe4
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
srcs/exec.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/07 14:12:49 by tomoron #+# #+# */ /* Created: 2024/02/07 14:12:49 by tomoron #+# #+# */
/* Updated: 2024/02/22 17:58:49 by marde-vr ### ########.fr */ /* Updated: 2024/02/23 14:12:21 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -31,6 +31,11 @@ int cmd_is_builtin(t_msh *msh, char *cmd_token)
alias(msh); alias(msh);
return (1); return (1);
} }
else if (!ft_strcmp(cmd_token, "exit"))
{
exit_bt(msh);
return (1);
}
else if (!ft_strcmp(cmd_token, "echo") || !ft_strcmp(cmd_token, "ret") else if (!ft_strcmp(cmd_token, "echo") || !ft_strcmp(cmd_token, "ret")
|| !ft_strcmp(cmd_token, "env") || !ft_strcmp(cmd_token, "exit") || !ft_strcmp(cmd_token, "env") || !ft_strcmp(cmd_token, "exit")
|| !ft_strcmp(cmd_token, "pwd") || !ft_strcmp(cmd_token, "export")) || !ft_strcmp(cmd_token, "pwd") || !ft_strcmp(cmd_token, "export"))
@ -130,6 +135,7 @@ void pipe_child(t_msh *msh, char **cmd_args)
if (msh->cmds->token && (!ft_strcmp(msh->cmds->token, "cd") if (msh->cmds->token && (!ft_strcmp(msh->cmds->token, "cd")
|| !ft_strcmp(msh->cmds->token, "alias") || !ft_strcmp(msh->cmds->token, "alias")
|| !ft_strcmp(msh->cmds->token, "unalias") || !ft_strcmp(msh->cmds->token, "unalias")
|| !ft_strcmp(msh->cmds->token, "exit")
|| exec_builtin(msh))) || exec_builtin(msh)))
ft_exit(msh, 1); ft_exit(msh, 1);
if (msh->cmds->token) if (msh->cmds->token)
@ -143,10 +149,6 @@ void pipe_child(t_msh *msh, char **cmd_args)
void pipe_parent(t_msh *msh) void pipe_parent(t_msh *msh)
{ {
(void)msh; (void)msh;
if (msh->type_in != ARG)
close(msh->fds[0]);
if (msh->type_out != ARG)
close(msh->fds[1]);
} }
int exec(t_msh *msh, t_cmd *cmd, char **cmd_args) int exec(t_msh *msh, t_cmd *cmd, char **cmd_args)
@ -159,6 +161,7 @@ int exec(t_msh *msh, t_cmd *cmd, char **cmd_args)
if (pipe(msh->fds) == -1) if (pipe(msh->fds) == -1)
{ {
perror("pipe"); perror("pipe");
ft_printf_fd(2, "exiting\n");
ft_exit(msh, 1); ft_exit(msh, 1);
} }
} }
@ -166,6 +169,7 @@ int exec(t_msh *msh, t_cmd *cmd, char **cmd_args)
if (pid == -1) if (pid == -1)
{ {
perror("fork"); perror("fork");
ft_printf_fd(2, "exiting\n");
ft_exit(msh, 1); ft_exit(msh, 1);
} }
if (pid == 0) if (pid == 0)
@ -173,9 +177,8 @@ int exec(t_msh *msh, t_cmd *cmd, char **cmd_args)
else else
{ {
pipe_parent(msh); pipe_parent(msh);
rl_redisplay(); //rl_redisplay();
//if (waitpid(pid, 0, 0) < 0) //waitpid(pid, 0, 0);
// ft_exit(msh, 1);
i = 0; i = 0;
while (msh->pids[i]) while (msh->pids[i])
i++; i++;
@ -254,9 +257,8 @@ void remove_command_from_msh(t_msh *msh)
void exec_command(t_msh *msh) void exec_command(t_msh *msh)
{ {
int cmd_count; int cmd_count;
enum e_token_type type; int i;
int i;
i = 0; i = 0;
if (!msh->cmds) if (!msh->cmds)
@ -282,7 +284,10 @@ void exec_command(t_msh *msh)
while (i > 0) while (i > 0)
{ {
if (waitpid(msh->pids[i], 0, 0) < 0) if (waitpid(msh->pids[i], 0, 0) < 0)
{
ft_printf_fd(2, "exiting\n");
ft_exit(msh, 1); ft_exit(msh, 1);
}
i--; i--;
} }
} }

6
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/22 17:53:20 by marde-vr ### ########.fr */ /* Updated: 2024/02/23 14:06:24 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -88,7 +88,7 @@ int main(int argc, char **argv, char **envp)
command = (char *)1; command = (char *)1;
init_minishell(&msh, argc, argv, envp); init_minishell(&msh, argc, argv, envp);
handle_minishellrc(msh); //handle_minishellrc(msh);
while (msh->env && command) while (msh->env && command)
{ {
prompt = get_prompt(msh->env); prompt = get_prompt(msh->env);
@ -98,9 +98,9 @@ int main(int argc, char **argv, char **envp)
free(prompt); free(prompt);
add_history(command); add_history(command);
msh->cmds = parse_command(command, msh->env); msh->cmds = parse_command(command, msh->env);
free(command);
//print_parsed_cmd(parsed_cmd);//debug //print_parsed_cmd(parsed_cmd);//debug
msh->cmds = handle_alias(msh); msh->cmds = handle_alias(msh);
free(command);
//print_parsed_cmd(parsed_cmd);//debug //print_parsed_cmd(parsed_cmd);//debug
exec_command(msh); exec_command(msh);
free_cmd(msh->cmds); free_cmd(msh->cmds);