mirror of
https://github.com/KeyZox71/ft_minipowershell.git
synced 2025-03-15 03:16:51 +01:00
「🔨」 fix(exec): fds for non-forked cmds
This commit is contained in:
@ -6,7 +6,7 @@
|
||||
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/06/22 13:05:18 by adjoly #+# #+# */
|
||||
/* Updated: 2024/07/17 01:30:12 by mmoussou ### ########.fr */
|
||||
/* Updated: 2024/07/18 14:31:31 by mmoussou ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -21,7 +21,7 @@ void ft_pwd(void);
|
||||
|
||||
void ft_cd(t_env *env, char *args);
|
||||
|
||||
void ft_echo(char **args);
|
||||
void ft_echo(char **args, int fd);
|
||||
|
||||
char *ret_cwd(void);
|
||||
|
||||
@ -37,6 +37,6 @@ char **env_get_list(t_env *env);
|
||||
void add_to_env(char *name, char *content, t_env *env);
|
||||
int check_export_input(char *input);
|
||||
unsigned int ft_arraylen(char **s);
|
||||
void ft_export(char **args, t_env *env);
|
||||
void ft_export(char **args, t_env *env, int fd);
|
||||
|
||||
#endif
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/04/29 13:20:22 by mmoussou #+# #+# */
|
||||
/* Updated: 2024/07/18 14:25:25 by mmoussou ### ########.fr */
|
||||
/* Updated: 2024/07/18 14:34:25 by mmoussou ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -41,7 +41,7 @@ void __close(void *content);
|
||||
int check_file(char *cmd, char *input);
|
||||
void free_exec(t_env *env, char **env_array);
|
||||
|
||||
void exec_cmd(char *cmd, char **argv, char **env, t_env *env_t);
|
||||
void exec_cmd(t_cmd *cmd, char **env, t_env *env_t);
|
||||
void __fork_single_cmd(t_cmd *cmd, char **env, t_env *env_t, t_exec exec);
|
||||
|
||||
/**
|
||||
|
@ -3,10 +3,10 @@
|
||||
/* ::: :::::::: */
|
||||
/* ft_echo.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/06/29 19:19:57 by adjoly #+# #+# */
|
||||
/* Updated: 2024/07/18 14:28:05 by adjoly ### ########.fr */
|
||||
/* Updated: 2024/07/18 14:37:39 by mmoussou ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -42,6 +42,7 @@ void ft_echo(char **args, int fd)
|
||||
char **tmp;
|
||||
bool new_line;
|
||||
|
||||
fd = STDOUT_FILENO;
|
||||
tmp = args;
|
||||
if (__nl_option(args) > 0)
|
||||
new_line = false;
|
||||
|
@ -6,14 +6,14 @@
|
||||
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/06/26 08:42:36 by mmoussou #+# #+# */
|
||||
/* Updated: 2024/07/17 02:17:05 by mmoussou ### ########.fr */
|
||||
/* Updated: 2024/07/18 14:40:56 by mmoussou ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "minishell.h"
|
||||
#include "builtins.h"
|
||||
|
||||
void env_print_in_order(t_env *env_l)
|
||||
void env_print_in_order(t_env *env_l, int fd)
|
||||
{
|
||||
char **env;
|
||||
int i;
|
||||
@ -25,7 +25,7 @@ void env_print_in_order(t_env *env_l)
|
||||
i = 0;
|
||||
while (env[i])
|
||||
{
|
||||
printf("declare -x %s\n", env[i]);
|
||||
ft_printf_fd(fd, "declare -x %s\n", env[i]);
|
||||
i++;
|
||||
}
|
||||
ft_free("a", &env);
|
||||
@ -95,13 +95,13 @@ int export_append_value(char *arg, t_env *env)
|
||||
return (0);
|
||||
}
|
||||
|
||||
void ft_export(char **args, t_env *env)
|
||||
void ft_export(char **args, t_env *env, int fd)
|
||||
{
|
||||
int status;
|
||||
|
||||
if (!args || !args[0])
|
||||
{
|
||||
env_print_in_order(env);
|
||||
env_print_in_order(env, fd);
|
||||
return ;
|
||||
}
|
||||
while (*args)
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/07/15 21:03:31 by mmoussou #+# #+# */
|
||||
/* Updated: 2024/07/18 14:27:01 by mmoussou ### ########.fr */
|
||||
/* Updated: 2024/07/18 14:41:32 by mmoussou ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -14,32 +14,32 @@
|
||||
#include "builtins.h"
|
||||
#include "error_msg.h"
|
||||
|
||||
void exec_cmd(char *cmd, char **argv, char **env, t_env *env_t)
|
||||
void exec_cmd(t_cmd *cmd, char **env, t_env *env_t)
|
||||
{
|
||||
int i;
|
||||
|
||||
i = is_in_builtins(cmd);
|
||||
i = is_in_builtins(cmd->cmd);
|
||||
if (i)
|
||||
{
|
||||
if (i == 5)
|
||||
ft_echo(argv + 1);
|
||||
ft_echo(cmd->argv + 1, cmd->outfile);
|
||||
if (i == 2)
|
||||
ft_cd(env_t, argv[1]);
|
||||
ft_cd(env_t, (cmd->argv)[1]);
|
||||
if (i == 6)
|
||||
ft_pwd();
|
||||
if (i == 4)
|
||||
ft_export(argv + 1, env_t);
|
||||
ft_export(cmd->argv + 1, env_t, cmd->outfile);
|
||||
if (i == 3)
|
||||
ft_unset(&argv[1], env_t);
|
||||
ft_unset(&(cmd->argv)[1], env_t);
|
||||
if (i == 7)
|
||||
ft_env(env_t);
|
||||
if (i == 1)
|
||||
ft_exit(argv, ft_arrlen(argv), env, env_t);
|
||||
ft_exit(cmd->argv, ft_arrlen(cmd->argv), env, env_t);
|
||||
}
|
||||
else
|
||||
{
|
||||
ft_envclear(&env_t, free);
|
||||
execve(cmd, argv, env);
|
||||
execve(cmd->cmd, cmd->argv, env);
|
||||
}
|
||||
}
|
||||
|
||||
@ -58,7 +58,7 @@ void __fork_single_cmd(t_cmd *cmd, char **env, t_env *env_t, t_exec exec)
|
||||
if (exec.pipe_fd[0] != -1)
|
||||
close(exec.pipe_fd[1]);
|
||||
if (exec.status != -1)
|
||||
exec_cmd(cmd->cmd, cmd->argv, env, env_t);
|
||||
exec_cmd(cmd, env, env_t);
|
||||
}
|
||||
|
||||
int exec_single_cmd_execution(t_cmd *cmd, char **env, t_env *env_t, t_exec exec)
|
||||
@ -66,14 +66,14 @@ int exec_single_cmd_execution(t_cmd *cmd, char **env, t_env *env_t, t_exec exec)
|
||||
int fork_pid;
|
||||
|
||||
if (is_in_builtins(cmd->cmd) > 0 && is_in_builtins(cmd->cmd) < 5)
|
||||
__fork_single_cmd(cmd, env, env_t, exec);
|
||||
exec_cmd(cmd, env, env_t);
|
||||
if (is_in_builtins(cmd->cmd) > 0 && is_in_builtins(cmd->cmd) < 5)
|
||||
return (0);
|
||||
fork_pid = fork();
|
||||
if (!fork_pid)
|
||||
{
|
||||
__fork_single_cmd(cmd, env, env_t, exec);
|
||||
free_exec(env_t, env);
|
||||
free_exit(env_t, env);
|
||||
exit(get_exit_code(-1));
|
||||
}
|
||||
return (fork_pid);
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/06/01 14:55:06 by mmoussou #+# #+# */
|
||||
/* Updated: 2024/07/18 14:26:05 by mmoussou ### ########.fr */
|
||||
/* Updated: 2024/07/18 14:31:46 by mmoussou ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
Reference in New Issue
Block a user