From 830b04208e38f8e3d35b6415af0c9836243a4e01 Mon Sep 17 00:00:00 2001 From: "ariard@student.42.fr" Date: Sun, 22 Jan 2017 23:32:57 +0100 Subject: [PATCH] shell tokenize newline debut --- 42sh/includes/lexer.h | 2 +- 42sh/includes/minishell.h | 4 +- 42sh/includes/readscript.h | 2 +- 42sh/script.sh | 3 +- .../.ft_post_tokenize.c.swo} | Bin 12288 -> 12288 bytes .../.ft_tokenize.c.swo} | Bin 12288 -> 12288 bytes .../lexer/.reduce_bquotes.c.swo} | Bin 12288 -> 12288 bytes 42sh/src/lexer/ft_post_tokenize.c | 2 +- 42sh/src/lexer/ft_tokenize.c | 2 +- 42sh/src/lexer/reduce_bquotes.c | 2 +- 42sh/src/line-editing/ft_readline.c | 2 +- 42sh/src/main/.main.c.swo | Bin 12288 -> 12288 bytes 42sh/src/main/.shell_script.c.swp | Bin 0 -> 12288 bytes 42sh/src/main/main.c | 8 +++- 42sh/src/main/shell_script.c | 42 ++++++++++++++++++ 42sh/src/read-script/ft_read_script.c | 2 +- 42sh/src/read-script/rs_shebang.c | 4 +- 17 files changed, 62 insertions(+), 13 deletions(-) rename 42sh/src/{read-script/.rs_shebang.c.swp => lexer/.ft_post_tokenize.c.swo} (71%) rename 42sh/src/{read-script/.ft_read_script.c.swp => lexer/.ft_tokenize.c.swo} (81%) rename 42sh/{includes/.readscript.h.swp => src/lexer/.reduce_bquotes.c.swo} (86%) create mode 100644 42sh/src/main/.shell_script.c.swp create mode 100644 42sh/src/main/shell_script.c diff --git a/42sh/includes/lexer.h b/42sh/includes/lexer.h index ec98c235..75cfab31 100644 --- a/42sh/includes/lexer.h +++ b/42sh/includes/lexer.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/01 12:15:50 by jhalford #+# #+# */ -/* Updated: 2017/01/22 00:37:19 by ariard ### ########.fr */ +/* Updated: 2017/01/22 23:30:39 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/minishell.h b/42sh/includes/minishell.h index e0a4a1f4..0e5c6b2b 100644 --- a/42sh/includes/minishell.h +++ b/42sh/includes/minishell.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/10 13:07:44 by jhalford #+# #+# */ -/* Updated: 2017/01/22 22:50:22 by ariard ### ########.fr */ +/* Updated: 2017/01/22 23:21:39 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -73,6 +73,8 @@ void data_exit(void); int shell_single_command(char *command); +int shell_script(void); + void ft_expand_dollar(char **av, char **env); char *ft_findexec(char *path, char *file); diff --git a/42sh/includes/readscript.h b/42sh/includes/readscript.h index d12f2cc3..29c91132 100644 --- a/42sh/includes/readscript.h +++ b/42sh/includes/readscript.h @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/21 22:50:22 by ariard #+# #+# */ -/* Updated: 2017/01/22 22:19:32 by ariard ### ########.fr */ +/* Updated: 2017/01/22 23:02:55 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/script.sh b/42sh/script.sh index 4065c7cb..35caedf2 100755 --- a/42sh/script.sh +++ b/42sh/script.sh @@ -1,4 +1,5 @@ -#!/bin/yolosh +#!/bin/minishell + while [ 1 ]; do sleep 1 echo "a" diff --git a/42sh/src/read-script/.rs_shebang.c.swp b/42sh/src/lexer/.ft_post_tokenize.c.swo similarity index 71% rename from 42sh/src/read-script/.rs_shebang.c.swp rename to 42sh/src/lexer/.ft_post_tokenize.c.swo index 7e751dc17c105905aa9072af6a2f21ece24025a8..f9f7efee1f6eda2a16b206f538686718b4d5c878 100644 GIT binary patch delta 566 zcmbV}zfaph6vtmgQ8A?aS^z~zuR(x`5)&sXsRBe9DxgBFh^fYL&cwtyhx1uLt3nv~ z1CTd129|DB#!mbdh>-<0h8C%7UmWPb$mu@Py{C5{eRbE`Zfz$j+0D-zSkUr7YZ%~8 zKi%5+Jps8vI7`&WU3S34ye*BU=SxF+b;g~qOtXGotoQT=($0KrKlCKyu|#`h_|MS0 z>wW-ZpleEmBUmWy#Q~Z`nJ5u?B1iNQe`)fb_(l96&IwMKM91=FpdEX2(|`OO6v1R5 zII7vXMNmGis!7iF(efG%lULCeUIQz8fhU=5K7Ud!pC=QpAZV|pgbbk5D zsx(~3mpGM5MLE!_nF3RtEC5pux7?u0Fd2PO*h*i$%@=cp;)iUwmRT9ob<`J%x=tG_ yhqzlaUE34Y@G^5W`CQ=Au4&cFmN2=md19x8w8FA>GWs%#W`(!u_w7e59{UFYaiG}% literal 12288 zcmeI2Pi)&%9LIl!vEe}h!GS-g*Hl`aq=^%!sK}$yMpwi{+f6E+CZ-a(&dcJ}b%O0| ztJ)0-Q7%Z_nUD}j960TS;D7{25GN2qf&(Y6oW?lweR+1`wpr;$BsBCqeQNvp_rCtU zuYd1VQ{QUo-01~2U91p}Cy0K_ZlC|=k7vn#dW7u2wS&5Nu>Zj;!3%A(T%0nCjbNY9 z>r&7-8?-KQCkl-zGi(}R;1~h7>xIw>+;(IHVJ&R(RolN#R@ z)k!&^98eA@2b2TK0p);lKslfsP!1>ulmp6v`_KU!f8RfHi0HyYNFIOxPyYXZ^Kqg# zz$p0YF`_l_9QbaO=qi{1KR-&e4c-CkzylRf20EAkN5Nl@5Zwa5g0I1s;B)XP_yl|m zeBgm1VBq(o&<7uY_rMu&5Ix?}BYG531nSVWOMheQ*Li1HOk>-+~)p9b5t{KzR5%uz)(01ImH_ zjRV(63wYECeAd6xOWEV3HKJO(6NOQr*X_uzg|2_m<5A1kukDV+y|ybRTd20$QOLGt z*wQO=^YgWZGpFWibLZz~p?s&{V>9e}Dth7M(yNHxB#nC^XKsV($O#Gg&U#yS{fGx` z+_oHV~jhs8m`C1_=oe- zG4WDu;9E0cQ)C;zP7E(KCXwyp^87s8+G0rfvhBHbWZN5aI<_~o)N?i?y2bm=YHd3R z#bEp0<({-c_010N@Iuw+SEEAJX(7Uo#ORZ%khLI^8%Q7O(Y1)C7 zOTGCxZ4z!Z`5okbxSG@C&YCV_Sxy)-$?&1OyXIIBY0luVDyx2p(Kz zdxJ%N6ub2SFIPK_1`i;bRG=N{vQ2)$bk%jgXgq_u)tZXUFnscI`eA#cCzNt2t(R)f zik|YlNGi^SU(w4Ya|(|VyOV4;DU9sMb=c*WTOUyO((si2B3F<2$TH{^MRx?l zn~-t=(*IdCa^#%pE(6^ezG|Z-J-PoAt>I<0Haw|4UWtZ#vZ`xxx+F6@ZSU2YnAihX zt38z_ste0vQeI-I6SXaVmAHihuKFv`v3M1`kk7j-B1jXJmo&O7VyT=kCa|<`l6Iwu zjX%)pGl;o^m*e5;h&WzT#d7T4hMb33{0~C7>dEy5U)r#eVZA7acOs1N z1^r0w_O7P-BqDh$QA%khL*5yGfIFeqS45t%dLq~_z@l>iIT2#zEg2bK$WtPCK#`qc amX%22N*s9nuLO6>%R4DJw26XAXVBjbAVJaq diff --git a/42sh/src/read-script/.ft_read_script.c.swp b/42sh/src/lexer/.ft_tokenize.c.swo similarity index 81% rename from 42sh/src/read-script/.ft_read_script.c.swp rename to 42sh/src/lexer/.ft_tokenize.c.swo index 48f63c7ad8edd66f56957b07b7e6718865e5f452..c523a7884ea4a4303ff526dbeb2ae48a1988f264 100644 GIT binary patch literal 12288 zcmeI2OKa3n7>196i>OtxDB9I&2W;lzWRfYiq*h8r(S;yLi{NF*WX^QbrkQDyY3m)l z`~??+OI^5eCAe^@f`35z3;Y3sd*7T%CUL;hYBz=N49}d~m-n3WCRq&g)hi2Eukp!p zm7yGC?2Y!~=ETp_Y~&DQmhV`8BbwN{h^jx;G4%3;QEvKMgg)*GYS;btlCZ--n=pcw z7WlU2iVfjw&9D}>mxbrt7iD`39hxEs$blU?&<&esr-oS7&@0iExv^0`e0+X~A{0&z zkOSlZIY17O1LOcXKn{=td)a}ovyVN&0rtm-FyeaOKpl6fA_vF;a)2Bl2gm_(fE*wP z$N_SI93ThCfj#Jeh5z?2DU9V0V)OX_Kl%Ot{wQO2!4UX#gt28X0=^9~wgJY$_rr|6 z0MEfH=zuve3pBvNFgO5yA)nv}*aTm}2k;iW1kb=45TFh$a0Ofjr@%>Y0&HTB-@zB~ z8GHoqz-#adJOvBj1}K8)Oe&y44v+)n069PokOSlZIq(k-JYtG3!mjUeRV^&mWX9&L zAhbepC$Cy=5SDll`uY4cQxK{Yq9H!Rk<*EWC)QP&+KC`!cea~qL3U-hBAbYnbp0BFvV$dbyP~_p_!~-iDr9K(UOcQapI`bQ=MiHnB#?tl1V64u@473DoC{ww_BFa z3%I<*F(WqQNpJ$32ZEWy+I(h)kK^<3A@8+shuMxdj@_i|IYF%ev{Se2<-oOqRyx#J?Y2Xa_6NGI2m;G%r1Oiuu);q^qL6|4wCiLRm)^|qf83q&Ukm50i9n^xBiOUcR8M*>g7->lB_86+M$p6zxUf{#g0%B?Z{SSaAW z>{j6gEfU2!{A2M)Td0n%Io)dFTFXla4wfa58tvNIXa$8 z1TRLnD;7Mb>AI#@xL!4@lcugmf=eySZQ`D!lDT4}$m6O%o(T2_w$ms=CH^2Bt;|J< z;M_ek-NpG8%U^T6S()d3ArswiN|BS3*fWGYZ1b6E_Dd45k*l#@qiFE(~ literal 12288 zcmeI2&2QX97{;fZaA^vH1C%dKc2V$dcGtU3q$W;SA*h6kLW_`spi)_R?Qz!BvA6at zZMs@M1eG{);9ua3DmWnyT)A>U964~|Qcj3#pRqm7CL5v!aw&Qz`ekg-%=5nQfwX#2Ts4s7+BL~O< za)2Bl2gm_(fE*wP$N_SI93ThCfd|k57ysXX=3&O3G>|<0|F6IQfBh(9?|}vI{aMDY zfv3Tb3yj?aFM^-XFm@Y!26jONHo!WtKnpPN+arv93+{j~!4FcOVYwZ=DjyY_eMq9hsqgXtM;8k$9FGs10^w#sKw z#Yf0u9#UWOUFr6+Fy4uTOk%Uv>=t7ij2W^#vT4-yvoQ-}X&A=ABb}xA4#^e_rNa zV>8KlQIZKW@RdPGTosnd)EAMtr1LIbvzm|(N12SpjWV|01Pxv+j6{5Bq*lvUVi*gt z!Tf#U>mxA|4Q7m)abtk@!p$8ad$G8QxnZobYVgBZ@NT|k0v|pmLqsb!)aBk=7cO7g zdRN8LdFS$&hS0lW*NvjYGfU%CfJ~~)ur1UJ4g6UT^9{KFW*htnJF8*rMI&GE%5E5k z*y>T#8dUIQq0Z|k)_C1gf+yIt;Pw#PU-%BU+nw`PyJOilw{54h?yTCpzsHN?%~OG^ z)hh1rJ8w7~U5;tNSMfLGpkPM{uC6;Pog)Q#by+Fuu9V~duHUlDnh>RJ%{^}uoQIV7EBr4NpLoV7Cf;J3O;ley9b;50|fv8 diff --git a/42sh/includes/.readscript.h.swp b/42sh/src/lexer/.reduce_bquotes.c.swo similarity index 86% rename from 42sh/includes/.readscript.h.swp rename to 42sh/src/lexer/.reduce_bquotes.c.swo index 747c167aa887573d7bd2381b8b4521531f6f0ddd..20161d543623c465c8f79d471064b961fe7abdb8 100644 GIT binary patch literal 12288 zcmeHNL2nyH6rLg>b%8VpPSDFVmdbkVc)gn_skTj^g(9JX04YJ0im=wZv-QT#+8K|P zgo?Bhl)r*FapM9%03^8P#2Inn0tdv6Z+2%lc7xJZjVe`oV}0J4_uhQ(%{SwN?di5Z zdG7EZPHtjJUK;scYuRrl@`TWXg3$d)4!1<4 z#_qB|?zv+bxdX8$q$@={iA1NnGZ`u|Zbc_hk&6@{1s+F%iAokP&9NolYwKyXg$w-E zS2iDqfnrGkQh*d71xNu>fD|AFNC8sd8CO7!&ak^!!*gaG`R@SepE2X|X@>M51xNu> zfD|AFNC8rS6d(mi0aAbzAO%Q)XHbC<|L-51Wh}8!JpTVLzyE(X&)8?c9PlIV0`!5` zfuH9X+XLPJ4qsyIKJXQ=1B`&Hz?*;za9|#I9{Be~#{L9;1AYa50e%3!1nvP_z^A}X z;0kaam?pszQ0k1 zz!8gq3CQC+i4-DtJ7XpJnx1C(FxJ6%a&mBK`7IuP@__}UuZxY4=x@#cpc*Xuescj_g~)~zSs0d{-oKyX{H2_uuy)NB$W zOlQGXU<<$mZL!OpB+X*mDNe#g)o=1byl8vW(UsKeAXI(CSM^+G%!+!Uw46d%)KCp` z^2&hit@_1rNi&7D^kFqSVL5re+%QPT%5wAqr-p{{4$G&`-rU7@>N(so_3JV)&<7D0 z57R6fOk%+o@=L$1-U7ZXIB=g<r4jE^X54b8~Sqq3KT zmElo34X~IO!qJ500w1vK2=Cw;~y4OyQ4*fk=fuH>&Sn1r DkQu~@ literal 12288 zcmeI2Pfrs;7{&)~RZ*iSO-u$i{$Y#Vc8dWPV^kF7U?gY_UTn6zvv#3u%kHd#L`_sa zh@Zft(f9>Cc=cpVOuYCJycnO^KTsM%K)Dd#X`aqZ=Y5}f_t$RHrqd|jpT5mUOI3z; zl(8R!Yjg8IPq0(J7_&p)4qdgdeG}DitYcP6BWB49w+Vfo8X7ZUdtNv)GDgg(Y50ND zid_*Ip|IV^3H^>NHMeo0B_cosc1<9b-i5INRy8YSm8+c||X-1)5l(*{Qm3`^sMje>9Z+yM1Tko0U|&IhyW2F0z`la5CI}U1c<;s zBw*wJ{dWb%Ru7txptH~!s2}Qsexs)E&^PES^Z|Mgy@FmsNzMC^ zIh9NVhyW2F0z`la5P|=cfF=Uh_Zag7Stu03s2(*%!ww$Rou+UW&O1#znYluAF(>m)zu#1c7MtSYP;7Cc-B zpS^MQ`rXOd>6v@=TTJu4K*8ShBHjkB?^)wO3&TBZxnZs2DmE53%au{1Tro_Oo2FG6 zx2h&@tnl=BbJxb2reTKXq~UOMww4=C;-kCSu%ZkvmMu7MWyrOna?HETj{n^y7h#q? zV1&`S-G +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/11 16:11:11 by jhalford #+# #+# */ -/* Updated: 2017/01/20 16:37:25 by ariard ### ########.fr */ +/* Updated: 2017/01/22 23:27:50 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/ft_tokenize.c b/42sh/src/lexer/ft_tokenize.c index a75170dc..1e5af252 100644 --- a/42sh/src/lexer/ft_tokenize.c +++ b/42sh/src/lexer/ft_tokenize.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/10 13:37:11 by jhalford #+# #+# */ -/* Updated: 2017/01/21 20:49:42 by ariard ### ########.fr */ +/* Updated: 2017/01/22 23:18:13 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/reduce_bquotes.c b/42sh/src/lexer/reduce_bquotes.c index 6057e8c0..cb70ee1c 100644 --- a/42sh/src/lexer/reduce_bquotes.c +++ b/42sh/src/lexer/reduce_bquotes.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/11 16:46:27 by jhalford #+# #+# */ -/* Updated: 2017/01/20 01:14:32 by ariard ### ########.fr */ +/* Updated: 2017/01/22 23:26:06 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/ft_readline.c b/42sh/src/line-editing/ft_readline.c index 90f36e9e..2570d0f3 100644 --- a/42sh/src/line-editing/ft_readline.c +++ b/42sh/src/line-editing/ft_readline.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 18:03:48 by sbenning #+# #+# */ -/* Updated: 2017/01/22 21:43:48 by ariard ### ########.fr */ +/* Updated: 2017/01/22 23:15:27 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/.main.c.swo b/42sh/src/main/.main.c.swo index 2ec104e90ca9acf3f0e70c01db2d7441b7d38cf5..5c8f87b25381102a358216a0fb7d91735868ed10 100644 GIT binary patch delta 630 zcmZwD&r8B!90u_3%AAWzg-k*P4}n|$Xka8ds6&}aNs$qO2c;Mkh={Y}%8D-0A=oXD zhz_12Vgwzc{)2?>T|)?>h)x~qu`W#;eAu4v9^Sq0D!EF|wJI(rQ{G4@Ot@@Bwc!5B z?du>lwwO!Thn0!zcH6tPS2Yuzv%i(NX7`?LJGzN1V1_Pea70f~gbakh4__9dH+X>u zs6!PFU=QYC93&7S08X&LJ-&DcH*f*X9h^Xwr3@Y6VHXOJfGD_ug=cK{5w4&H$8ZQa zNW(NlU<`cV1P3rcW}Pu9ChgPLKdX{TTuCl(mI_{86eQwWvf7&e)(!8lUO+HRBttR; z32nZwZRB^yFf4VM);Ie1g$-{7yYE?C4~}F)yB^2d5xU_ delta 222 zcmZojXh@JwG6?hZRWR2xW&i>K28NZItr1J#N-}KP%&<}VD?g*-W7#M!D zLzFm97F1ZA#>vINzz)Q0K>U)Ef#Eq27Xon%5bFc64iGZ{@h1)jhW9{x8Hg_c@hl+j z0pd;|t^?vKAWjA1Fd&uzVqPHT0^+|w+kUfeW@LHDHknaPWU_%e=j2*7{>eAhOD8jG oicWs1F3V`W`J9G3g7nkXN@ zc=crBSwDbZz{IP@c=zVXiw7@0vwv!72mvJ~B=3-?v+vG3&pY$m_CR)4ic8mT@QFg1 zp`B*zm$|+C>c=4aew;BoaP6R`2KH{E98CIVsW5I9>cJkVk7GmQR?xa992pwpX1HpE zfnzjn*E7OZ(P&gdCvbgPaQ5(_AtFEo4oILa>tmAxtZbHwYGyVw#Lu3o9MFW)i2xBG z0z`la5CI}U1c(3;ILZX1-^ZR{1ILn0@ueI_gkT?M)%!EA_F(W*ttx^$wGIe>T!ip?zEas+pDQk9U2iE zHESrY$TX19WYg!DI6lXwJ+Us;Haas((XNt0>2f+XqB%~>lfsjHl+Rw9yHZ(LR3$f= z_Hfm02(BYX?KY}Wv!z`PUGHu~$d;$)#-@|Qw)fkjEl?O3v6P#Yg#`prxlV|<+Hgau z<>949tI;#j@|Y8a$)Msp#Woq9l%{o`=+$#Lbm)3cqg@j`({w#I8ZE457&G!be`t;8 z4P|(UEj6t8ASh}UH;bhSqgXOblbdC$Y+B|7U)kXC@#e0=*=!aOKBI=i(aBh9cr_5a z85S>C+VIQuZ<+#0dsyyPP8Qp0^&^d?zWYKbe=knm52 Ry#-Vp8y?yZ1wT52{RSf%de{H} literal 0 HcmV?d00001 diff --git a/42sh/src/main/main.c b/42sh/src/main/main.c index e64ce801..6aceeb75 100644 --- a/42sh/src/main/main.c +++ b/42sh/src/main/main.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/06 18:40:58 by jhalford #+# #+# */ -/* Updated: 2017/01/22 22:52:41 by ariard ### ########.fr */ +/* Updated: 2017/01/22 23:09:43 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,6 +37,7 @@ int shell_single_command(char *command) /* /1* btree_apply_infix(ast, &ft_putast2); *1/ */ if (ft_exec(&ast)) return (1); + return (0); } @@ -51,7 +52,10 @@ int main(int ac, char **av) } if (ft_read_script(av[1])) { - shell_single_command(data_singleton()->line.input); + if (data_singleton()->opts & SHELL_MODE_SCRIPT) + shell_script(); + else + shell_single_command(data_singleton()->line.input); return (0); } while (1) diff --git a/42sh/src/main/shell_script.c b/42sh/src/main/shell_script.c new file mode 100644 index 00000000..6b680e90 --- /dev/null +++ b/42sh/src/main/shell_script.c @@ -0,0 +1,42 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* shell_script.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: ariard +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2017/01/22 23:06:34 by ariard #+# #+# */ +/* Updated: 2017/01/22 23:32:27 by ariard ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "minishell.h" + +int shell_script() +{ + t_list *token; + t_btree *ast; + t_list *tmp; + + token = NULL; + ast = NULL; + tmp = data_singleton()->script.queue; + while (tmp) + { + if (ft_tokenize(&token, tmp->content , DEFAULT)) + return (1); + tmp = tmp->next; + } + if (!token) + return (0); +// if (ft_post_tokenize(&token, command)) +// return (1); + DG("after post_tokenize"); + token_print(token); + if (ft_parse(&ast, &token)) + return (1); + btree_print(STDBUG, ast, &ft_putast); + if (ft_exec(&ast)) + return (1); + return (0); +} diff --git a/42sh/src/read-script/ft_read_script.c b/42sh/src/read-script/ft_read_script.c index 92a11f9d..6e1a9e8f 100644 --- a/42sh/src/read-script/ft_read_script.c +++ b/42sh/src/read-script/ft_read_script.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/21 22:49:31 by ariard #+# #+# */ -/* Updated: 2017/01/22 22:19:42 by ariard ### ########.fr */ +/* Updated: 2017/01/22 23:11:59 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/read-script/rs_shebang.c b/42sh/src/read-script/rs_shebang.c index 090cb834..bc1550f8 100644 --- a/42sh/src/read-script/rs_shebang.c +++ b/42sh/src/read-script/rs_shebang.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/22 21:42:27 by ariard #+# #+# */ -/* Updated: 2017/01/22 22:53:34 by ariard ### ########.fr */ +/* Updated: 2017/01/22 23:11:57 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -72,7 +72,7 @@ int rs_shebang_check(char *file, t_script *script) else if (ft_strncmp(interpreter, "minishell", ft_strlen("minishell")) == 0) { data_singleton()->opts &= ~SHELL_MODE_MASK; - data_singleton()->opts |= SHELL_MODE_EXEC; + data_singleton()->opts |= SHELL_MODE_SCRIPT; } return (0); }