willem/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'quinten'

Browse Source
This commit is contained in:
Quinten Mennen 2025-02-11 16:35:38 +01:00
commit 21b3245ebf
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/typedef.h
View File

@ -59,5 +59,6 @@ typedef struct s_minishell
char *line; char *line;
t_lexer *lexer; t_lexer *lexer;
t_list *tokens; t_list *tokens;
t_list *commands;
} t_minishell; } t_minishell;
#endif // TYPEDEF_H #endif // TYPEDEF_H

6
src/main.c
View File

@ -15,7 +15,6 @@
int main(int argc, char **argv, char **envp) int main(int argc, char **argv, char **envp)
{ {
t_minishell *minishell; t_minishell *minishell;
t_list *commands;
(void)argc; (void)argc;
(void)argv; (void)argv;
@ -28,11 +27,10 @@ int main(int argc, char **argv, char **envp)
minishell->line = ft_prompt(minishell); minishell->line = ft_prompt(minishell);
minishell->lexer = ft_lexer_new(minishell->line); minishell->lexer = ft_lexer_new(minishell->line);
minishell->tokens = ft_parse_input(minishell->lexer); minishell->tokens = ft_parse_input(minishell->lexer);
commands = parser_get_commands(minishell->tokens); minishell->commands = parser_get_commands(minishell->tokens);
simple_builtins(minishell);
//ft_lstiter(minishell->tokens, print_list); //ft_lstiter(minishell->tokens, print_list);
free_minishell_line(minishell); free_minishell_line(minishell);
ft_lstclear(&commands, free_command_list); ft_lstclear(&minishell->commands, free_command_list);
} }
free_minishell(minishell); free_minishell(minishell);
return (EXIT_SUCCESS); return (EXIT_SUCCESS);

2
src/utils/free_minishell_line.c
View File

@ -20,4 +20,6 @@ void free_minishell_line(t_minishell *minishell)
ft_lexer_free(minishell->lexer); ft_lexer_free(minishell->lexer);
if (minishell->tokens) if (minishell->tokens)
ft_lstclear(&minishell->tokens, ft_clear_tokenlist); ft_lstclear(&minishell->tokens, ft_clear_tokenlist);
if (minishell->commands)
ft_lstclear(&minishell->commands, free_command_list);
} }

1
src/utils/init_minishell.c
View File

@ -26,5 +26,6 @@ t_minishell *init_minishell(void)
minishell->line = NULL; minishell->line = NULL;
minishell->lexer = NULL; minishell->lexer = NULL;
minishell->tokens = NULL; minishell->tokens = NULL;
minishell->commands = NULL;
return (minishell); return (minishell);
} }