42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-03-15 11:26:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

「🔨」 fix: fix env in exec

Browse Source
This commit is contained in:
Adam JOLY
2024-07-15 12:36:05 +02:00
parent 06abdc7b1c
commit ab31b83147
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/execution.h
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/29 13:20:22 by mmoussou #+# #+# */ /* Created: 2024/04/29 13:20:22 by mmoussou #+# #+# */
/* Updated: 2024/07/14 15:49:21 by mmoussou ### ########.fr */ /* Updated: 2024/07/14 17:39:35 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -26,7 +26,7 @@ typedef struct s_exec
int pipe_fd[2]; int pipe_fd[2];
} t_exec; } t_exec;
int format_quotes(t_list *list_cmd, t_env *env); int format_quotes(t_list *list_cmd);
char *get_path(char *path, char *cmd); char *get_path(char *path, char *cmd);
int exec_split_cmd(t_list *list_cmd, t_env *env); int exec_split_cmd(t_list *list_cmd, t_env *env);

4
src/exec/exec_split_cmd.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/01 14:55:06 by mmoussou #+# #+# */ /* Created: 2024/06/01 14:55:06 by mmoussou #+# #+# */
/* Updated: 2024/07/14 15:48:41 by mmoussou ### ########.fr */ /* Updated: 2024/07/14 20:13:30 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -86,6 +86,8 @@ int exec_single_cmd(t_cmd *cmd, char **env, t_env *env_t, int pipe_fd[2])
fork_pid = fork(); fork_pid = fork();
if (!fork_pid) if (!fork_pid)
__fork_single_cmd(cmd, env, env_t, exec); __fork_single_cmd(cmd, env, env_t, exec);
signal(SIGQUIT, SIG_IGN);
signal(SIGINT, SIG_IGN);
return (fork_pid); return (fork_pid);
} }

9
src/exec/format_quotes.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/03 10:50:52 by mmoussou #+# #+# */ /* Created: 2024/07/03 10:50:52 by mmoussou #+# #+# */
/* Updated: 2024/07/14 14:19:30 by adjoly ### ########.fr */ /* Updated: 2024/07/14 17:39:18 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,7 +21,7 @@ char *format_quotes_string(char *cmd)
return (cmd); return (cmd);
} }
int format_quotes_cmd(t_cmd *cmd, t_env *env) int format_quotes_cmd(t_cmd *cmd)
{ {
uint i; uint i;
@ -32,19 +32,18 @@ int format_quotes_cmd(t_cmd *cmd, t_env *env)
while (cmd->argv[i]) while (cmd->argv[i])
{ {
cmd->argv[i] = format_quotes_string(cmd->argv[i]); cmd->argv[i] = format_quotes_string(cmd->argv[i]);
cmd->argv[i] = env_var_replace(cmd->argv[i], env);
i++; i++;
} }
return (0); return (0);
} }
int format_quotes(t_list *list_cmd, t_env *env) int format_quotes(t_list *list_cmd)
{ {
if (!list_cmd) if (!list_cmd)
return (0); return (0);
while (list_cmd) while (list_cmd)
{ {
if (format_quotes_cmd(list_cmd->content, env)) if (format_quotes_cmd(list_cmd->content))
return (-1); return (-1);
list_cmd = list_cmd->next; list_cmd = list_cmd->next;
} }

2
src/main.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/24 11:18:04 by adjoly #+# #+# */ /* Created: 2024/04/24 11:18:04 by adjoly #+# #+# */
/* Updated: 2024/07/14 15:37:11 by adjoly ### ########.fr */ /* Updated: 2024/07/14 17:27:40 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */