starnakin/42_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Camille Chauvet
2023-03-13 14:23:27 +01:00
parent c43331dca3
commit 4d3c25547e
12 changed files with 174 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
parse/parse.c
View File

@ -1,26 +1,5 @@
#include "./parse_private.h"
static int ft_redirection_parse(t_data *data, char *cmd_str, t_cmd *cmd)
{
int fd_in;
int fd_out;
fd_in = ft_infile(data, cmd_str);
if (fd_in == -2)
return (1);
fd_out = ft_outfile(data, cmd_str);
if (fd_out == -2)
{
close(fd_in);
return (1);
}
cmd->fd_in[0] = fd_in;
cmd->fd_in[1] = -1;
cmd->fd_out[0] = fd_out;
cmd->fd_out[1] = -1;
return (0);
}
int ft_args_parse(t_data *data, char *cmd_str, t_cmd *cmd)
{
char **tab;
@ -39,6 +18,7 @@ int ft_args_parse(t_data *data, char *cmd_str, t_cmd *cmd)
ft_freer_tab_ultimate(1, tab);
return (1);
}
ft_quote_remover(str);
free(tab[i]);
tab[i] = str;
i++;
@ -54,7 +34,12 @@ int ft_executable_parse(t_data *data, t_cmd *cmd)
path = cmd->args[0];
own = 0;
if (ft_strcmp(cmd->args[0], "env") == 0)
if (cmd->args[0] == NULL)
{
ft_closer(cmd->fd_in);
ft_closer(cmd->fd_out);
}
else if (ft_strcmp(cmd->args[0], "env") == 0)
own = 1;
else if (ft_strcmp(cmd->args[0], "export") == 0)
own = 1;
@ -68,7 +53,7 @@ int ft_executable_parse(t_data *data, t_cmd *cmd)
own = 1;
else if (ft_strcmp(cmd->args[0], "cd") == 0)
own = 1;
if (own == 0)
else
path = ft_get_executable(data->env, cmd->args[0]);
cmd->own_cmd = own;
cmd->executable = path;
@ -86,8 +71,11 @@ int ft_cmd_parser(t_data *data, char *cmd_str)
ft_eprintf("minishell: malloc failed\n");
return (1);
}
if (ft_redirection_parse(data, cmd_str, cmd))
if (ft_redirection(data, cmd, cmd_str))
{
ft_cmddel(cmd);
return (1);
}
if (ft_args_parse(data, cmd_str, cmd))
{
ft_cmddel(cmd);
@ -118,11 +106,17 @@ int ft_cmds_parser(t_data *data, const char *line)
i = 0;
while (tab[i] != NULL)
{
ft_cmd_parser(data, tab[i]);
if (ft_cmd_parser(data, tab[i]))
{
ft_freer_tab_ultimate(1, tab);
return (1);
}
i++;
}
ft_add_fd(((t_cmd *) (*data->cmds)->content)->fd_in, 0);
ft_add_fd(((t_cmd *) ((ft_lstlast(*data->cmds))->content))->fd_out, 1);
if (((t_cmd *) (*data->cmds)->content)->fd_in[0] == -1)
((t_cmd *) (*data->cmds)->content)->fd_in[0] = 0;
if (((t_cmd *) (ft_lstlast(*data->cmds))->content)->fd_out[0] == -1)
(((t_cmd *) (ft_lstlast(*data->cmds))->content)->fd_out[0] = 1);
ft_freer_tab_ultimate(1, tab);
return (0);
}