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

cmd argv fill with word and without redirections

Browse Source
This commit is contained in:
hugogogo
2021-10-30 10:20:43 +02:00
parent 15bc4d2158
commit 75987a117e
1 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
srcs/parsing/parsing.c
View File

@@ -51,65 +51,54 @@ t_cmd **create_cmd(t_token *token_list, size_t cmd_nbr)
// T_DGREAT, //'>>' // T_DGREAT, //'>>'
// T_WORD // T_WORD
// count nbr word in cmd, minus redirection and heredoc // count nbr word in cmd, minus redirection and heredoc
int next_cmd(t_token **token) int next_cmd(t_token *token)
{ {
int i; int i;
i = 0; i = 0;
while (*token && (*token)->id != T_PIPE) while (token && token->id != T_PIPE)
{ {
if ((*token)->id != T_WORD) if (token->id != T_WORD)
i--; i--;
else else
i++; i++;
*token = (*token)->next; token = token->next;
} }
if (*token && (*token)->id == T_PIPE) if (token && token->id == T_PIPE)
*token = (*token)->next; token = token->next;
return (i); return (i);
} }
void handle_argv(t_token *token, t_cmd **cmd_arr, size_t cmd_nbr) void handle_argv(t_token *token, t_cmd **cmd, size_t cmd_nbr)
{ {
int argc; int argc;
int j;
int i; int i;
(void)cmd_arr; i = 0;
(void)token;
(void)cmd_nbr;
while (cmd_nbr) while (cmd_nbr)
{ {
argc = next_cmd(&token); argc = next_cmd(token);
cmd->argv = calloc(argc + 1, sizeof(char *)); cmd[i]->argv = calloc(argc + 1, sizeof(char *));
cmd->argv[argc] = NULL; cmd[i]->argv[argc] = NULL;
// i = 0; j = 0;
// while (token && token->id != T_PIPE) while (token && token->id != T_PIPE)
// { {
// if (token->id == T_WORD) if (token->id == T_WORD)
// { {
// cmd->argv[i] = ft_strdup(token->content); cmd[i]->argv[j] = ft_strdup(token->content);
// i++; j++;
// } }
// token = token->next; else if (token->id != T_PIPE)
// } token = token->next;
// cmd_nbr--; if (token->id != T_PIPE)
token = token->next;
}
if (token && token->id == T_PIPE)
token = token->next;
cmd_nbr--;
i++;
} }
// cmd->argv = calloc(argc + 1, sizeof(char *));
// cmd->argv[argc] = NULL;
// i = 0;
// while (*token && (*token)->id != T_PIPE)
// {
// if ((*token)->id == T_WORD)
// {
// cmd->argv[i] = ft_strdup((*token)->content);
// i++;
// }
// *token = (*token)->next;
// }
// if (*token && (*token)->id == T_PIPE)
// *token = (*token)->next;
} }
t_cmd **parsing(t_token *token_list, char **envp) t_cmd **parsing(t_token *token_list, char **envp)
@@ -137,6 +126,16 @@ t_cmd **parsing(t_token *token_list, char **envp)
// 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);
int j;
j = 0;
while (cmd_arr[j])
{
printf("%i\n", j);
print_matrix(cmd_arr[j]->argv, " / ");
j++;
}
// if (!handle_builtin(token, cmd[i])) // if (!handle_builtin(token, cmd[i]))
// handle_cmd(cmd[i]->argv, envp); // handle_cmd(cmd[i]->argv, envp);