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

handle fd

Browse Source
This commit is contained in:
hugogogo
2021-10-30 15:27:41 +02:00
parent 0292425bc1
commit 118e2e5bef
2 changed files with 117 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
srcs/parsing/fill_cmd.c
View File

@@ -50,58 +50,56 @@ int nbr_argv(t_token *token)
// *token = (*token)->next; // *token = (*token)->next;
//} //}
/* //void handle_fd(t_token *token, t_cmd **cmd)
void handle_fd(t_token *token, t_cmd **cmd)
{
int *pipes_fd;
(*cmd)->fd_out = 1;
while (token && token->id != T_PIPE)
{
// T_LESS : '<',
if (token->id == T_LESS)
{
if ((*cmd)->fd_in != 0)
close((*cmd)->fd_in);
(*cmd)->fd_in = open(token->next->content, O_RDONLY | O_CREAT);
token->id = T_TOKEN;
token->next->id = T_TOKEN;
}
// T_GREAT : '>',
if (token->id == T_GREAT)
{
(*cmd)->fd_out = open(token->next->content, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU);
token->id = T_TOKEN;
token->next->id = T_TOKEN;
}
// T_DGREAT : '>>'
if (token->id == T_DGREAT)
{
(*cmd)->fd_out = open(token->next->content, O_WRONLY | O_CREAT | O_APPEND, S_IRWXU);
token->id = T_TOKEN;
token->next->id = T_TOKEN;
}
// T_DLESS : '<<' (heredoc)
// if (token->id == T_DGREAT)
//{ //{
// cmd->fd_out = open(token->next->content, O_WRONLY | O_TMPFILE | O_APPEND, S_IRWXU); // int *pipes_fd;
// token->out = T_TOKEN; //
// (*cmd)->fd_out = 1;
// while (token && token->id != T_PIPE)
// {
// // T_LESS : '<',
// if (token->id == T_LESS)
// {
// if ((*cmd)->fd_in != 0)
// close((*cmd)->fd_in);
// (*cmd)->fd_in = open(token->next->content, O_RDONLY | O_CREAT);
// token->id = T_TOKEN;
// token->next->id = T_TOKEN; // token->next->id = T_TOKEN;
// } // }
token = token->next; // // T_GREAT : '>',
} // if (token->id == T_GREAT)
if (token && token->id == T_PIPE) // {
{ // (*cmd)->fd_out = open(token->next->content, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU);
pipes_fd = calloc(2, sizeof(int)); // token->id = T_TOKEN;
pipe(pipes_fd); // token->next->id = T_TOKEN;
if ((*cmd)->fd_out == 1) // }
(*cmd)->fd_out = pipes_fd[1]; // // T_DGREAT : '>>'
else // if (token->id == T_DGREAT)
close(pipes_fd[1]); // {
cmd[1]->fd_in = pipes_fd[0]; // (*cmd)->fd_out = open(token->next->content, O_WRONLY | O_CREAT | O_APPEND, S_IRWXU);
} // token->id = T_TOKEN;
} // token->next->id = T_TOKEN;
*/ // }
// // T_DLESS : '<<' (heredoc)
// // if (token->id == T_DGREAT)
// // {
// // cmd->fd_out = open(token->next->content, O_WRONLY | O_TMPFILE | O_APPEND, S_IRWXU);
// // token->out = T_TOKEN;
// // token->next->id = T_TOKEN;
// // }
// token = token->next;
// }
// if (token && token->id == T_PIPE)
// {
// pipes_fd = calloc(2, sizeof(int));
// pipe(pipes_fd);
// if ((*cmd)->fd_out == 1)
// (*cmd)->fd_out = pipes_fd[1];
// else
// close(pipes_fd[1]);
// cmd[1]->fd_in = pipes_fd[0];
// }
//}
//int handle_builtin(t_token *token, t_cmd *cmd) //int handle_builtin(t_token *token, t_cmd *cmd)
//{ //{

94
srcs/parsing/parsing.c
View File

@@ -1,16 +1,6 @@
#include "minishell.h" #include "minishell.h"
// A quoi bon un arbre binaire ? Je ne vois plus l'utilité.
/* typedef struct s_binary_tree
{
char *content;
struct s_binary_tree *sub;
struct s_binary_tree *sibling;
enum e_token_id id;
} t_binary_tree; */
size_t count_pipes(t_token *token) size_t count_pipes(t_token *token)
{ {
size_t nb; size_t nb;
@@ -167,9 +157,73 @@ void handle_path(t_cmd **cmd_arr, char **envp)
find_path(cmd_arr[i]->argv, envp); find_path(cmd_arr[i]->argv, envp);
i++; i++;
} }
}
// if (!handle_builtin(token, cmd[i])) void fd_redirection(t_token *token, t_cmd *cmd)
// handle_cmd(cmd[i]->argv, envp); {
int flag;
if (token->id == T_LESS) // '<'
{
flag = O_RDONLY | O_CREAT;
if (cmd->fd_in != 0)
close(cmd->fd_in);
cmd->fd_in = open(token->next->content, flag);
}
else if (token->id == T_GREAT) // '>'
{
flag = O_WRONLY | O_CREAT | O_TRUNC;
cmd->fd_out = open(token->next->content, flag, S_IRWXU);
}
else if (token->id == T_DGREAT) // '>>'
{
flag = O_WRONLY | O_CREAT | O_APPEND;
cmd->fd_out = open(token->next->content, flag, S_IRWXU);
}
}
void fd_heredoc(t_token *token, t_cmd *cmd)
{
(void)token;
(void)cmd;
// if (token->id == T_DGREAT) // <<
// {
// cmd->fd_out = open(token->next->content, O_WRONLY | O_TMPFILE | O_APPEND, S_IRWXU);
// token->out = T_TOKEN;
// token->next->id = T_TOKEN;
// }
}
void handle_fd(t_token *token, t_cmd **cmd_arr)
{
int *pipes_fd;
int i;
i = 0;
while (cmd_arr[i])
{
cmd_arr[i]->fd_out = 1;
while (token && token->id != T_PIPE)
{
if (token->id == T_DGREAT) // '<<'
fd_heredoc(token, cmd_arr[i]);
else
fd_redirection(token, cmd_arr[i]);
token = token->next;
}
if (token && token->id == T_PIPE)
{
token = token->next;
pipes_fd = calloc(2, sizeof(int));
pipe(pipes_fd);
if (cmd_arr[i]->fd_out == 1)
cmd_arr[i]->fd_out = pipes_fd[1];
else
close(pipes_fd[1]);
cmd_arr[i + 1]->fd_in = pipes_fd[0];
}
i++;
}
} }
t_cmd **parsing(t_token *token_list, char **envp) t_cmd **parsing(t_token *token_list, char **envp)
@@ -177,28 +231,14 @@ t_cmd **parsing(t_token *token_list, char **envp)
t_cmd **cmd_arr; t_cmd **cmd_arr;
size_t cmd_nbr; size_t cmd_nbr;
/* t_binary_tree *syntax_tree;
syntax_tree = ft_calloc(1, sizeof *syntax_tree);
if (!syntax_tree)
return (0); //WIP ERROR */
if (!valid_syntax(token_list)) if (!valid_syntax(token_list))
return (NULL); return (NULL);
// Pipes count (determine cmd_nbr)
cmd_nbr = count_pipes(token_list); cmd_nbr = count_pipes(token_list);
// Struct CMD alloc/fill
cmd_arr = create_cmd(token_list, cmd_nbr); cmd_arr = create_cmd(token_list, cmd_nbr);
// cmd_arr = fill_cmd(token_list, envp);
// 2.9.1 - 2) Expansion
// cmd_expansion(cmd_arr, envp); // cmd_expansion(cmd_arr, envp);
handle_argv(token_list, cmd_arr, cmd_nbr); handle_argv(token_list, cmd_arr, cmd_nbr);
handle_path(cmd_arr, envp); handle_path(cmd_arr, envp);
handle_fd(token_list, cmd_arr);
// 2.9.1 - 3) Redirection
// handle_fd(token, cmd + i);
//int j; //int j;
//j = 0; //j = 0;