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

merge conflit (j'aime pas les headers)

Browse Source
This commit is contained in:
tomoron
2024-02-16 21:26:10 +01:00
parent ab5912fe51 ad1de58fb2
commit 2a2ef1d63c
4 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main.c
View File

@ -6,13 +6,17 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */
<<<<<<< HEAD
/* Updated: 2024/02/16 16:37:13 by tomoron ### ########.fr */
=======
/* Updated: 2024/02/16 18:21:27 by marde-vr ### ########.fr */
>>>>>>> ad1de58fb2aacb8a3b1b7ef5d74fc6d87f4550b2
/* */
/* ************************************************************************** */
#include "minishell.h"
int g_return_code = 0;
int g_return_code = 0;
char *get_prompt(void)
{
@ -71,6 +75,8 @@ int main(int argc, char **argv, char **envp)
(void)argc;
(void)argv;
env = get_env(envp);
if (env)
handle_minishellrc(env);
while (env && command)
{
prompt = get_prompt();