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

Merge branch 'main' of github.com:mdev9/minishell

Browse Source
This commit is contained in:
tomoron
2024-02-16 16:14:00 +01:00
parent 91f1edf136 42149a2a0d
commit 60cc42b316
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
exec.c
View File

@ -6,14 +6,17 @@
/* 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/16 15:10:43 by marde-vr ### ########.fr */ /* Updated: 2024/02/16 16:11:50 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "libft/libft.h"
#include "minishell.h" #include "minishell.h"
#include <readline/readline.h>
int exec_builtin(t_cmd *parsed_cmd, t_env *env) int exec_builtin(t_cmd *parsed_cmd, t_env *env)
{ {
if (!ft_strcmp(parsed_cmd->token, "echo")) if (!ft_strcmp(parsed_cmd->token, "echo"))
g_return_code = echo(parsed_cmd->next); g_return_code = echo(parsed_cmd->next);
else if (!ft_strcmp(parsed_cmd->token, "ret")) else if (!ft_strcmp(parsed_cmd->token, "ret"))
@ -112,7 +115,7 @@ void get_cmd_path(t_cmd *cmd, t_env *env)
int found; int found;
found = 0; found = 0;
if (access(cmd->token, X_OK) != -1) if (ft_strchr(cmd->token, '/') && access(cmd->token, X_OK) != -1)
found = 1; found = 1;
else else
{ {
@ -151,5 +154,19 @@ void exec_command(t_cmd *parsed_cmd, t_env *env)
i++; i++;
} }
get_cmd_path(parsed_cmd, env); get_cmd_path(parsed_cmd, env);
pid_t pid;
pid = fork();
if (pid == -1)
{
perror("fork");
ft_exit(parsed_cmd, env, 1);
}
if (pid == 0)
execve(parsed_cmd->token, cmd_args, env_to_char_tab(env)); execve(parsed_cmd->token, cmd_args, env_to_char_tab(env));
else
rl_redisplay();
if (waitpid(pid, 0, 0) < 0)
ft_exit(parsed_cmd, env, 1);
} }

3
minishell.h
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */ /* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */
/* Updated: 2024/02/16 14:36:19 by marde-vr ### ########.fr */ /* Updated: 2024/02/16 16:11:48 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -16,6 +16,7 @@
# include <readline/history.h> # include <readline/history.h>
# include <limits.h> # include <limits.h>
# include <stdio.h>//debug # include <stdio.h>//debug
# include <sys/wait.h>
# include "libft/libft.h" # include "libft/libft.h"
typedef enum e_token_type typedef enum e_token_type