A lot of edit but adding the struct (Yes, i just use parameters of the function util now, See u morrow)
This commit is contained in:
parent
9c4dfafdf7
commit
56655f5426
15 changed files with 403 additions and 30 deletions
|
|
@ -6,7 +6,7 @@
|
|||
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/03/28 14:40:38 by rparodi #+# #+# */
|
||||
/* Updated: 2024/03/31 21:02:40 by rparodi ### ########.fr */
|
||||
/* Updated: 2024/04/01 01:51:47 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ t_i32 ft_check_type_operators(t_str *operators)
|
|||
return (1);
|
||||
}
|
||||
|
||||
void ft_check(char **input)
|
||||
void ft_check(t_utils *shcat, char **input)
|
||||
{
|
||||
t_usize i;
|
||||
|
||||
|
|
@ -60,34 +60,76 @@ void ft_check(char **input)
|
|||
if (ft_check_type_operators(input) == 1)
|
||||
printf("Operateur\n");
|
||||
else
|
||||
printf("Commande ou args\n");
|
||||
{
|
||||
if (ft_strcmp(input[i], "exit") == 0)
|
||||
ft_exit(NULL, 0);
|
||||
else if (ft_strcmp(input[i], "pwd") == 0)
|
||||
ft_pwd();
|
||||
else
|
||||
ft_other_cmd(shcat, i);
|
||||
}
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
void ft_take_args(void)
|
||||
void ft_take_args(t_utils *shcat)
|
||||
{
|
||||
t_i32 i;
|
||||
t_str user_input = NULL;
|
||||
t_str *args = NULL;
|
||||
|
||||
i = 0;
|
||||
while (i < 10000000)
|
||||
while (1)
|
||||
{
|
||||
user_input = readline("shcat > ");
|
||||
if (!user_input || strcmp("exit", user_input) == 0)
|
||||
ft_exit(user_input, 0);
|
||||
args = ft_split(user_input, ' ');
|
||||
shcat->str_input = readline(shcat->name_shell);
|
||||
if (!user_input)
|
||||
ft_exit(shcat, 0);
|
||||
shcat->strs_input = ft_split(user_input, ' ');
|
||||
if (!args)
|
||||
exit(1);
|
||||
ft_check(args);
|
||||
add_history(user_input);
|
||||
free(user_input);
|
||||
ft_check(shcat, shcat->strs_input);
|
||||
add_history(shcat->str_input);
|
||||
ft_free_strs(shcat->strs_input);
|
||||
free(shcat->str_input);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
t_i32 main(void)
|
||||
void ft_init_arge(t_str arge[], t_utils *utils)
|
||||
{
|
||||
ft_take_args();
|
||||
size_t i;
|
||||
char *temp;
|
||||
|
||||
i = 0;
|
||||
temp = NULL;
|
||||
while (arge[i] != NULL)
|
||||
{
|
||||
if (arge[i][0] == 'P' && arge[i][1] == 'A' && arge[i][2] == 'T' && \
|
||||
arge[i][3] == 'H' && arge[i][4] == '=')
|
||||
{
|
||||
temp = ft_strdup(arge[i] + 5);
|
||||
if (!temp)
|
||||
ft_exit(utils, 1);
|
||||
else
|
||||
utils->path = ft_split(temp, ':');
|
||||
break ;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
if (temp != NULL)
|
||||
free(temp);
|
||||
}
|
||||
|
||||
t_i32 main(t_i32 argc, t_str argv[], t_str arge[])
|
||||
{
|
||||
t_utils *shcat;
|
||||
|
||||
shcat = (t_utils *)malloc(sizeof(t_utils));
|
||||
if (argc == 2)
|
||||
shcat->name_shell = ft_strdup(strcat(argv[1], " > "));
|
||||
else
|
||||
shcat->name_shell = ft_strdup("shcat > ");
|
||||
ft_init_arge(arge, shcat);
|
||||
shcat->envp = arge;
|
||||
ft_take_args(shcat);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue