From 390937d195ce2fddb4bd60444a81187528bb2f40 Mon Sep 17 00:00:00 2001 From: tomoron Date: Fri, 26 Apr 2024 10:36:57 +0200 Subject: [PATCH] stop quand here_doc fail --- srcs/.nfs000000000c6b84180000000b | Bin 0 -> 20480 bytes srcs/.nfs000000000c6b841e0000000c | Bin 0 -> 12288 bytes srcs/env.c | 4 ++-- srcs/exec_bonus.c | 6 +++--- srcs/export.c | 3 ++- srcs/main.c | 3 ++- 6 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 srcs/.nfs000000000c6b84180000000b create mode 100644 srcs/.nfs000000000c6b841e0000000c diff --git a/srcs/.nfs000000000c6b84180000000b b/srcs/.nfs000000000c6b84180000000b new file mode 100644 index 0000000000000000000000000000000000000000..01942e67b31ac7f7d77846529cbecb104626f565 GIT binary patch literal 20480 zcmeI3ZHOJ!8OKjd)lOctm`^4}&hBEodtdgxY!b~iS+q&i1z$;`ViJeR%(;8Vy?5q1 zGk3FbjW1w{g+fGQ5Ul+owh$3NSrshQFM@t46dGb%C_*U|O8e2KDWU)8oHKXs>|SEf z6+zC#-<>-%=RD^*|K~YpcIFF6#?4P34ntow^!?7KVC1E#=!ho(^ zc5Cd}F}1DX1ao1(Bf4U$6^$-ljpsr?Xhou$?jICU99DHZ)x9E~Pr_cc>j!?^7M)Ht zj@-B^7KLjc4TF9><&HLN&Kd=b0+&~ypR_8sZDiApx*X~g<70f&4F@k@$6PfE7zK<1 zMggOMQNSo*6fg=H1-@4bB)zrlS@h^C-781$*DTxrKpz+N-dlEktv%U<=p))_^b8Gxk1s2b={z1IIuI z_~0S12iyVHgD=;i4){Iz2)qtn11CTmw15DU;1;k2YzAw%ywT%4JvYfL zpYP_C`t8iJT8S+d{iJ|;WnQ1eDZj-FW715|_hSC^(_9_3ycjjJ3%fb$x=yDPx`lxY zWgh!aiLh1h;ZAXq?8zFaj3!4^;3ZzqS5mbG7Ex_ZprN#rQhca;2qY`NCR7RhE2+gy%=XP5dy3m0&qvtT~h*R}c+P z!0#H`UK$oO3Fk!+Q%uJE*zP%z2$HsleQ8a1Y7!BKc$SaKv>$Z*cDBS8Lf^CGN*y=s zcAdbB3yBRUco83{2|23O7_JJp9lA-UP@^uz{#@X63j1g8e(2!r0aBZe?KbLnL}a5C z5jp7Ag2ZJ zINemjp*kyykO8Y7bo^jmMSWz6B^89xtxzWPB8XrsU4&PN6DR3Q=V&lIGJ6-KyZ_F6 z_w7xuP@Uz`eq`UHvj_Gcxbwil{b?~cCr1+%wOX=~7Or_BipqREZ=lI<_6`T*Wu7}N z`*+Oo6R4#+NU|OBOQj=azE$~I<}%89PRPv&@Kcr1*+}CaS*bEhT_GP;x~1tAc$gA| z+owDqO0P0Uxoomg*%pazxFC@5G8^qy6m}^e$<;KrGGEnjNe8kM&8dWd&GL{*3ML7r zdYX+E88~%VnOSf;eKAS%(q+aF26x(6&q)UUWHUi#e2hjIOdaj}ox~56rz2XFGsep4 zQbkynN17kwJ+PZegC(#D;Ij`V;i=hbD?1VmPf~TQKgD)3A zx9vo{SWI0~p&T7inK39B+il@cm+2lP=U|*vNjA8e3PC4OlEzCQ7ICXpgPCsXGU6(m zb#5w)>Xgb%eI|cbf*)jFmD3H-Zg5VIKO~G3#h5_I7x}(}UMRn*8fHNGg#zC2tAoB_x3SJo$lS;qe(LPtu8$EV(<3uD z;RkM~kH0{&!7!S6g)Zm^-3>%!THg4nf>E`xYv%YPlK|WC;i|J0A<6p1K zB^cBHUzBzZ+GNZd(R9iN+YFaYH7%3+T}sfEB!*&GK=t2 zTTczj(XCg9U!l!rsi{ipFKU+>yh0=SV$Ei165nXU6x(ESLQlK`#@B-)pXXH!ff8ef4jH^!zXITRZ(;PtX5F-Gy^_)~7W9uYx5& zYXJ^{o!~}r5o-bd1O5)qflt7D;6?BlxEt&Pd%?|M0&D{7!8-6ctsej%gEzoQ@FaK) z>;d>+mDzT19XJo)eg$3xeL(9B%0T+OI+7bJMggOMQNSo*6fg=H1&jhl0i(dM0<@UK zEbheO2YRqtwwA*z?lg-#m#q*TTCgKmKCN8+nXUMdi(bE_#huxzU##uLdQn;mI=ou+ E|J5I@)Bpeg literal 0 HcmV?d00001 diff --git a/srcs/.nfs000000000c6b841e0000000c b/srcs/.nfs000000000c6b841e0000000c new file mode 100644 index 0000000000000000000000000000000000000000..03a1cdda932b5952052f9434e15fc5d9e32d980f GIT binary patch literal 12288 zcmeI2ONbmr7{@D;sBN+u45D~R?JUX6&dg5FjM;TFaTZCuD2TaaBWN6Zr>isV&U6nw zJ)6x-iEKdeCWv_O;=uXt6+$7&|@1bk=GcAk*#sTAialklW954qnPyxHZ z7V!HWjJ*$D0SCcOz`*ynGxj++4?Y90fmgw4a0>Ln)8G)80|l@P>;Me>y#;ZAAHjL> zDR>9G0oK6F;0)*h4;%)IU_Y1#yTAkBKJX{j_#*fjd*bIf}h^SVNWW8JUTe=JVr5L8t_xTl`cIAhjY z{Rk0}eJxkCyG|sOjWjPz8M@jZzI!*HOr;>6L{=r2puuIqh(#*Y5s%7To5{&cdc!EZ zNJEXeC)b>+nq1ojujLA(u*?IeC(2wdahW^)z6e~Jsw_YkEY2W~++n}qL`QjvcSRsq zA_-ed`T;ulZp(K?5c{4lB5JSHr>O(QJxOEnQ>PGlN3@q|*;-UopxZQ6pwBZH;RtUw zdA^jV6vHboVZ|{vNsd)(-Lc|ko`lvnCBJnu2-Va8%{(QGiW#Af$&~UCm-AH~43}Vo zim6&oUBKi@B{bB#B2~ynJHjUs3MRF_NJfVa7+B_kG@KTn0&a5T0i}VZr zu?>Rxw;b1PEjjJw!umZSlb526dwnbm?&ioxpRYV!(r(Vn?<8EjbYZSe- zCYdkg<1ogyrF_ig8$1Y+0JJ2&%d>;(*&tWu(z~$^*g_i>k0!NB!Ulg{3#h-&u6!b@ z%#^}elH#zQ@`HAF=!%gYQ|aUwvx~fV(=J}LN$@6KiQu8W>%_us@Orhr$FAvOzT zZPfQRs zM2g9emgD~|Cy48y%*AsQl!*Kltwg@kkh8u`#@@$ zBIc>p6G4@QmG<@OpH=VNHCMmo|NEC+bGy{Hv0$q Cpi#pB literal 0 HcmV?d00001 diff --git a/srcs/env.c b/srcs/env.c index a9b669f..1726e7c 100644 --- a/srcs/env.c +++ b/srcs/env.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/24 10:58:36 by marde-vr #+# #+# */ -/* Updated: 2024/04/25 18:55:17 by marde-vr ### ########.fr */ +/* Updated: 2024/04/26 10:26:03 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -75,7 +75,7 @@ void print_env_declare(t_msh *msh, t_env *env_orig) } env = env->next; } - free_env_cpy(env); + free_env_cpy(start); } void delete_from_env(t_msh *msh, char *name) diff --git a/srcs/exec_bonus.c b/srcs/exec_bonus.c index fa8f4cd..953ca24 100755 --- a/srcs/exec_bonus.c +++ b/srcs/exec_bonus.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */ -/* Updated: 2024/04/25 19:20:22 by tomoron ### ########.fr */ +/* Updated: 2024/04/26 10:34:15 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -72,7 +72,8 @@ int exec(t_msh *msh, char **cmd_args, int i, int cmd_count) void exec_command(t_msh *msh, int i, int cmd_count) { - if(msh->out_fd != -1 || msh->in_fd != -1) + g_return_code = 0; + if(msh->out_fd != -1 && msh->in_fd != -1) { msh->fds[i] = ft_calloc(2, sizeof(int *)); if (!msh->fds[i]) @@ -82,7 +83,6 @@ void exec_command(t_msh *msh, int i, int cmd_count) if ((msh->tokens && msh->tokens->value) || is_parenthesis(msh->cmds)) exec(msh, get_cmd_args(msh), i, cmd_count); } - g_return_code = 0; remove_command_from_msh(msh); } diff --git a/srcs/export.c b/srcs/export.c index 00baa79..ce17e72 100755 --- a/srcs/export.c +++ b/srcs/export.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/18 18:29:20 by marde-vr #+# #+# */ -/* Updated: 2024/04/25 18:59:15 by marde-vr ### ########.fr */ +/* Updated: 2024/04/26 10:29:05 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -88,6 +88,7 @@ int ft_export(t_msh *msh, t_token *cmd, t_env *env) { int error; + error = 0; if (cmd && !cmd->next) { print_env_declare(msh, env); diff --git a/srcs/main.c b/srcs/main.c index a4af8c8..78b8235 100755 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ -/* Updated: 2024/04/25 18:38:02 by tomoron ### ########.fr */ +/* Updated: 2024/04/26 10:24:46 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -98,6 +98,7 @@ int init_minishell(t_msh **msh, int argc, char **argv, char **envp) (*msh)->env = get_env(envp); (*msh)->env = add_shlvl((*msh)->env); rl_catch_signals = 0; + g_return_code = 0; signal(SIGINT, signal_handler_interactive); signal(SIGQUIT, signal_handler_interactive); return (0);