]> git.dkaiser.de - 42/minishell.git/commitdiff
Merge branch 'main' into memleakfix
authorDominik Kaiser <dkaiser@student.42heilbronn.de>
Sat, 25 Jan 2025 14:57:16 +0000 (15:57 +0100)
committerGitHub <noreply@github.com>
Sat, 25 Jan 2025 14:57:16 +0000 (15:57 +0100)
1  2 
include/debug_tools.h
include/minishell.h
include/token.h
src/builtins_part_two.c
src/debug_tools.c
src/main.c
src/new_token.c
src/repl.c

index 9a2487586c2bca55bfa4d77aa352192198c8c72a,a014ff163f9b063727b913b5290c3b31c869a9d1..a6f44f581adaa461fcfeaaa5eab23d477ac799cf
@@@ -23,6 -22,7 +23,8 @@@
  
  void  dbg(char *str);
  void  panic(char *msg);
 -void  dbg2(const char *format, ...);
 +void  print_token_list(t_token *token_list);
 +
  #endif
index 354d5b94b06902dea6f0ee7be096bc12856bb03a,356df7a6fd207abe8f9add53a1387b9110ed9f4b..6961815f92d98f36e84606aec98881ac2a059ef1
  int                           init(void);
  int                           init_signal_handling(void);
  
- void                  repl(const char *prompt, t_env **env);
+ void                  repl(const char *prompt, t_env **env, int *promptflag);
  
 -t_list                        *parse(t_token *tokens, t_env **env);
 +t_node                        *parse(t_token *tokens, t_env **env);
  t_node                        *parse_cmd(t_token *tokens, t_env **env);
 -t_redirection *collect_redirs(t_token **tokens, t_env *env, t_list **cf);
 +t_redirection *collect_redirs(t_token **tokens, t_env *env,
 +                                      t_list **create_files);
  
  void                  print_ast(t_node *ast);
  
diff --cc include/token.h
index fb9633df60c387367e28fd494dfcf26411573dae,2e8da3501424eb093070eb2ded8bc8d297c727be..226c9acbdada2507460af72722c4176459bcd047
@@@ -49,8 -49,5 +49,7 @@@ void                                          free_token_and_connect(t_toke
  void                                          tokenizer(char *s, t_token **token_list,
                                                                char quote_check);
  void                                          print_token(t_token *token);
 +void                                          free_token2(t_token *token);
 +void                                          free_token_and_connect2(t_token *token);
  
  #endif
Simple merge
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/new_token.c
Simple merge
diff --cc src/repl.c
index 3f4435d8547dd0b5208e859d19fa740d4d4f67cd,16c8e95c583f2e171746bcb3b1817d045ac61438..a0b786410b845bbb0a0e7e3615b486102f6b20b4
@@@ -24,8 -17,9 +24,9 @@@ void  repl(const char *prompt, t_env **e
  {
        char    *input;
        t_token *token_list;
 -      t_list  *lines;
 +      t_node  *ast;
  
+       (*promptflag)++;
        while (1)
        {
                input = readline(prompt);