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

"cmd_arr/cmd_array" renamed to "pipeline"

Browse Source
This commit is contained in:
LuckyLaszlo
2021-11-29 12:32:03 +01:00
parent aa7efdab15
commit cb5c2dcb30
11 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
srcs/parsing/parsing.c
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/24 10:52:40 by lperrey #+# #+# */
/* Updated: 2021/11/27 11:09:48 by lperrey ### ########.fr */
/* Updated: 2021/11/29 12:28:07 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
@@ -26,25 +26,25 @@ void save_redirections_words(t_token *t)
}
}
void print_cmd_array(t_cmd **cmd_arr)
void print_pipeline(t_cmd **pipeline)
{
int i;
i = 0;
while (cmd_arr[i])
while (pipeline[i])
{
printf("CMD %i, fd_in=%i, fd_out=%i\n", i, cmd_arr[i]->fd_in, cmd_arr[i]->fd_out);
printf("CMD %i, fd_in=%i, fd_out=%i\n", i, pipeline[i]->fd_in, pipeline[i]->fd_out);
ft_putstr_fd(" |", 1);
print_matrix(cmd_arr[i]->argv, "|\n |");
print_matrix(pipeline[i]->argv, "|\n |");
i++;
if (cmd_arr[i])
if (pipeline[i])
ft_putstr_fd("----------------\n", 1);
}
}
t_cmd **parsing(t_token *token_list)
{
t_cmd **cmd_arr;
t_cmd **pipeline;
if (!valid_syntax(token_list))
return (NULL);
@@ -67,20 +67,20 @@ t_cmd **parsing(t_token *token_list)
//ft_lstprint((t_list *)token_list, 1);
// Struct CMD alloc
cmd_arr = cmd_array_alloc(1 + count_pipes(token_list));
if (!cmd_arr)
pipeline = pipeline_alloc(1 + count_pipes(token_list));
if (!pipeline)
return (NULL);
// 2.9.1 - 3) Redirection
if (!redirections(token_list, cmd_arr))
return (ft_retp_free(NULL, &cmd_arr, (t_free_f)free_pipeline));
if (!redirections(token_list, pipeline))
return (ft_retp_free(NULL, &pipeline, (t_free_f)free_pipeline));
// Struct CMD fill
if (!cmd_array_fill_argv(token_list, cmd_arr))
return (ft_retp_free(NULL, &cmd_arr, (t_free_f)free_pipeline));
print_cmd_array(cmd_arr);
if (!pipeline_fill_argv(token_list, pipeline))
return (ft_retp_free(NULL, &pipeline, (t_free_f)free_pipeline));
print_pipeline(pipeline);
return (cmd_arr);
return (pipeline);
}
/* -------------------------------------------------------