From c75c6838d6df63931016f0b7cc76df08cb82729d Mon Sep 17 00:00:00 2001
From: Camille Chauvet <cchauvet@1D2.42angouleme.fr>
Date: Fri, 17 Feb 2023 19:05:33 +0100
Subject: [PATCH] clean

---
 .outfile.c.swp | Bin 12288 -> 0 bytes
 main.c         |  23 +++++++++--------------
 minishell.h    |   4 ++--
 outfile.c      |  11 ++++-------
 t              |   1 -
 5 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 .outfile.c.swp
 delete mode 100644 t

diff --git a/.outfile.c.swp b/.outfile.c.swp
deleted file mode 100644
index 9ab161ddae7f2c1e6a765122e5a48da5b3355c47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2Ux*t;9LJ|Et#0+S>We7IG(nR~?vmZKrN^E<r2c`HtF%Y22=xq`WVW}s*~Hz+
zUE|Rf{~Ur;Dfljk&^IduQIMi9zEr6CBtEIs2OmTPLGi%{zcahDNn`Ge-l-I3%jb5I
znf=ahzQ5nhadd0ui9<)|RLLT^b`f&;qo3;Et)4eNyIv&q`l8cWVqA2scUg~BN_#6#
zaH`euS(BCAaQNu6O0c}QQf_*I7cDa1FSk0}^?X*U4}VI3s~yk|Y}f&8vdO72vZrF1
zLMxluP4BsTe#5d_Ks%rv&<<z^v;*1!?SOVbJD?r7c^u&FE#w@+-I|1~{&e4xd{+0H
zXGJ<v?SOVbJD?rV4rm9o1KI)YfObGTpdHW-Xa@!za2kYsv5k=Twxb9C|F8c3fA>y8
zo&jUv${mC}3+@9~#|SwMa^TC`30Va%0}srBV}ODOz+GSm*bc7WhIzm>@D_LjTmUPe
z2^cs84uT@cgKu{d@-es!E`is<3*a0$3+BL4@Hm(TB`^tgg5L~6egRj(hu{Nn30wrP
zf>%HbRKZa&34Xp6<H32b3SI;?a2(8mV;~P60{4SmU>n#9zPSZ!1D}F7!3FRdSOsSQ
z12u3MJOO^)f%(7>;Ct{D_#9jY?|_ToZSWFU0vtr(DR2TD0ka?n?ghUie?Nk+!6)E-
zAagpHaQ#_3pdI+%95_Raknv6!(7f9ipC*ROtAF>qVdF#AY%Q^B@-9{0_W~x=)5#_)
z;-lw^Y3YFj6rV9SniK(?Vtk}0(@|9~sxCRc*N7()g624Ze!w9*O;(6(rQ`E>lPshK
z85PdMo(E=Pfg3UwR=HEFc6{zN9nSLB1jT33kMV|AEQ;lbrqM;zU0M{8M?CadkjKE2
z-hx~(y5pg8v0b`bhGrNmc#`=MQzG%h(W2*axd`ZWC+MU_3$SQV_|KE!8*5=4KP%&M
zS|KmojUzc}E(lL@GdZ}7uH{9%;HEl7NKeks&Z0}K#KgM1<Sv${%EOYn2!*vnxasCI
z=__+KZ92Z+s#Dj2ZsX}7BgSH$BmyyaG6Uj?a~!pOk5`}Tv^a~iHbHYVhv$ePl4BGK
z7z&lhd!ALf(d{)ok<W-b+^f?htpnAzR(8`0A2q#cMT!>!MUgq}HVYa~&1WJhGWu#f
zc^F$A=RsN}vP)%!%k<To?R;itCL_y8R7X;!C?Hk$YL?~D!{SGoV^DsWx>5IA5#p8G
zJFW^$h@@M{xJnTMTCYgtvib@|6^M-7LT>siCEnZOB>8VkMHGYF?y6{pR7(HRQf~zj
zr)w39taq&8FKb0@5P5cpRj>QRTDCkGVHb4}PmNKxh26Bw8no7>PJkj8g@Ij_mJSSG
zNq5&^>XNgme~+(~z8g2UIxphGBH6J0iA`7duje({^+@0ir@`R9Pkz1hj{hMk&3ZxI
z?=%?gomZvB4C#ICdo`DzF2^^~Mal(Q*tCll%0h4xFC{qNZr~SF!=@FpvZriT%GQ2r
zP1*ZQ+pLJvQLi_rQ)jbTwDD73crQBXQG$<#Y(Q|I5Hu~@+&@&1W{W~m-4Z$a&z4+-
zSn>}-Xr*#J!Gm49x2%WN0w0Mu5*+Zpx4z?NrAX0MN`0DY$$fK-))Z<zMZ}q?E5Y>b
t@zLbOD7$FKgOf&lQ-Y)G^o_J_C5e`}(6=GMKJBy_3vSv*!KN#dKLAS*2q6Ff

diff --git a/main.c b/main.c
index d9e673c..ccabf31 100644
--- a/main.c
+++ b/main.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/16 15:16:14 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 18:22:52 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/17 18:59:50 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -33,6 +33,7 @@ static char	*ft_get_user_input(t_list **env)
 static int	ft_minishell(t_list **env, char *line)
 {
 	t_list	**cmds;
+	int		code;
 	char	*line_clean;
 	int		infile;
 	int		outfile;
@@ -68,16 +69,11 @@ static int	ft_minishell(t_list **env, char *line)
 		free(line_clean);
 		return (1);
 	}
-	if (ft_cmds_executor(cmds, env) == 1)
-	{
-		close(outfile);
-		close(infile);
-		ft_lstclear(cmds, ft_cmddel);
-		free(cmds);
-		free(line_clean);
-		return (1);
-	}
-	return (0);
+	code = ft_cmds_executor(cmds, env);
+	ft_lstclear(cmds, ft_cmddel);
+	free(cmds);
+	free(line_clean);
+	return (code);
 }
 
 #if DEBUG
@@ -104,8 +100,6 @@ int	main(int ac, char **av, char **env)
 
 #else
 
-
-
 int	main(int ac, char **av, char **env)
 {
 	t_data	data;
@@ -123,7 +117,8 @@ int	main(int ac, char **av, char **env)
 	}
 	while (line != NULL)
 	{
-		ft_minishell(data.env, line);
+		if (ft_minishell(data.env, line) == 2)
+			break ;
 		free(line);
 		line = ft_get_user_input(data.env);
 		if (line == NULL)
diff --git a/minishell.h b/minishell.h
index fb32104..10978de 100644
--- a/minishell.h
+++ b/minishell.h
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 18:24:08 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/17 18:51:58 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,7 +21,7 @@
 # include <stdio.h>
 # include <readline/readline.h>
 # include <readline/history.h>
-# define DEBUG 1
+# define DEBUG 0
 
 int			ft_syntatic_verif(const char *str);
 int			ft_file_is_readable(const char *path);
diff --git a/outfile.c b/outfile.c
index 5b0a782..5b3e141 100644
--- a/outfile.c
+++ b/outfile.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/15 18:01:07 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 18:50:02 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/17 19:03:00 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -86,14 +86,11 @@ static int	ft_remove_outfile(char *line)
 	{
 		if (tab[i][0] == '>')
 		{
-			ft_strshift(line + y, -1 * (ft_strlen(tab[i]) + ft_strlen(tab[i + 1]) + 2));
+			ft_strshift(line + y,
+				-1 * (ft_strlen(tab[i]) + ft_strlen(tab[i + 1]) + 2));
 		}
 		else
-		{
-			if (y != 0)
-				y++;
-			y = y + ft_strlen(tab[i]);
-		}
+			y = y + ft_strlen(tab[i]) + (y != 0);
 		i++;
 	}
 	ft_freer_tab_ultimate(1, tab);
diff --git a/t b/t
deleted file mode 100644
index 9b47f86..0000000
--- a/t
+++ /dev/null
@@ -1 +0,0 @@
-bozo