]> git.dkaiser.de - 42/minishell.git/commitdiff
Merge branch 'miau' into uwu
authorDominik Kaiser <dkaiser@student.42heilbronn.de>
Tue, 14 Jan 2025 17:32:42 +0000 (18:32 +0100)
committerGitHub <noreply@github.com>
Tue, 14 Jan 2025 17:32:42 +0000 (18:32 +0100)
1  2 
include/minishell.h
src/builtins_part_one.c
src/env_to_strlst.c
src/format_string.c
src/main.c
src/repl.c

index f0f458b6a3a33a8be18556518d0a026c67868bfe,9d586b1d486fbd1d39194d00b131d933e52fbcc4..c905ca56b83f966c2ecea442fd8648e8e6519bba
@@@ -40,6 -42,6 +42,7 @@@ int                           eval(t_node *node, t_env **env)
  char                  *get_cmd_path(char *cmd, t_env *env);
  int                           execute_cmd(t_cmd *cmd, t_env **env);
  char                  *format_string(char *str, t_env *env);
 +int set_return_code(int return_code, t_env **env);
+ int                           handle_redirections(t_redirection *redirs);
  
  #endif
Simple merge
Simple merge
Simple merge
diff --cc src/main.c
index 9e5d4eca30ff527104ecdb9ec09725aec6e1f664,8abc4c94808102173bcefc477f302371f45ced10..8cebdd1464e50174579ad7997854e1752bc1b6b9
@@@ -22,6 -24,7 +24,9 @@@ int   main(int argc, char *argv[], char *
        if (init())
                return (1);
        getenvlst(&env, envp);
-       set_return_code(0, &env);
-       repl("Minishell $ ", &env);
++
++  set_return_code(0, &env);
+       repl("Minishell $ ", &env, &promptflag);
+       free_envlst(&env);
+       return (0);
  }
diff --cc src/repl.c
index 4292197a8ae18af6fbef605863f53e972345ebba,7eb6c0d3ab214a30b5e5dcc84a838df30c5c2333..5079ee84070902270cf2e6686cae651d277b0369
@@@ -49,13 -35,9 +35,9 @@@ void repl(const char *prompt, t_env **e
                add_history(input);
                token_list = NULL;
                tokenizer(input, &token_list, '\0');
-               token_list = reverse_token_list(token_list);
                lines = parse(token_list, env);
                if (lines)
-               {
-                       print_ast(lines->content);
 -                      eval(lines->content, env);
 +                      set_return_code(eval(lines->content, env), env);
-               }
                free(input);
        }
  }