From 2f2b0301b6ab4d910f72a00aa14d35433c42ccf5 Mon Sep 17 00:00:00 2001 From: Antoine Riard Date: Sat, 11 Mar 2017 18:50:38 +0100 Subject: [PATCH] heredoc debug en cours --- 42sh/read_on_stdin | Bin 0 -> 8480 bytes 42sh/simple_text_file | 3 +++ 42sh/src/parser/add_redir.c | 2 +- 42sh/src/parser/heredoc_parser.c | 9 ++++++++- 42sh/write_on_stdout_and_stderr | Bin 0 -> 8480 bytes 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100755 42sh/read_on_stdin create mode 100644 42sh/simple_text_file create mode 100755 42sh/write_on_stdout_and_stderr diff --git a/42sh/read_on_stdin b/42sh/read_on_stdin new file mode 100755 index 0000000000000000000000000000000000000000..facf8b6bf9e060e8db93003c1d04ca9389e5a853 GIT binary patch literal 8480 zcmeHMPiRv~82?gTEmbxth$t#Ni``WZwt}L^MDj32@lRSo7Gy};rwydBBrn(=Dnjfb zNTeWw2L%tyg0P2PcJZ`=3W}G#dhp;Lc1b~RJ%}yF-*4W$<|TE#EAx?=Z+`QA^UXKE znFlX#{{Hy>(`J#_29X;*A`(Yg+$b_H4q75RQ8Fk>olBi`e{r*C+1n|xPWVN{IIrQT z)R=p5tkXr0PjvQ)!N^U1FohmU`QD7rRv_K+7JtNIVEV(@iLsovY?K>qz<3qEny;*N zb;r95LKttW@d$A^px4CPWIBR)YSJrCdu8->$Ma3Rea4@dysyc+{KhMOxlp=d9J=G( zGx4?=J8@JxV#A6{}in*`FOJF?n3*!+-UFsSOzQu-yZ`PGWCBm zwRgiW+*K~_aO-gls{S<7sID~cviYJuw_IyU{B{~B{+GK_`_LDk-wp7Du9?Qshfro% zbCO+kw`pwEmCX2sy51n<@h2pdR<5sy}W1425KL=(_uQ zi7)&nxm)gPruKaJ(zAuu;IHUz4gQ8&w30G9 zmL56dWZhKSakJU8**^V0g6p6}HM8RT^$}65BNnzGLuP3cqhav#DhObrkd7FN%X{*6wVRA$D++ygoOja|_mG LR +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 16:39:05 by ariard #+# #+# */ -/* Updated: 2017/03/11 17:28:03 by ariard ### ########.fr */ +/* Updated: 2017/03/11 18:41:34 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/heredoc_parser.c b/42sh/src/parser/heredoc_parser.c index ae0ea276..a254efdd 100644 --- a/42sh/src/parser/heredoc_parser.c +++ b/42sh/src/parser/heredoc_parser.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/03/08 16:21:05 by ariard #+# #+# */ -/* Updated: 2017/03/11 16:20:21 by ariard ### ########.fr */ +/* Updated: 2017/03/11 18:50:14 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,10 +32,17 @@ int pop_heredoc(t_list **lst) temp2 = temp->next; free(temp); data_singleton()->heredoc_queue = temp2; + DG("type is :%s", read_state(head->type)); + DG("heredoc data after clear: %s", head->heredoc_data); } else + { + DG("type is :%s", read_state(head->type)); head->heredoc_data = ft_strjoin(head->heredoc_data, token->data); + head->heredoc_data = ft_strjoin(head->heredoc_data, "\n"); + DG("heredoc data + one: %s", head->heredoc_data); + } } ft_lstdel(lst, &token_free); return (1); diff --git a/42sh/write_on_stdout_and_stderr b/42sh/write_on_stdout_and_stderr new file mode 100755 index 0000000000000000000000000000000000000000..43af5a5edc3913df395f5b593c37af09198fa8f5 GIT binary patch literal 8480 zcmeHMQD_uL7@jk>9*LL>g%YX48cb;wOhqF;UL;3X6is7#F04Kz86ca_tp@DBRKV*h)Qrk+2R`Gu& z#(54yDMvEjkF=U7|5U3^1Tu0Hp9F;#QaaX*L(ZpoyrE;547xgkq$p!LO*$;*n*!sN z9XDHUsN(T{1RxA`G_VNe&>l$mhuGn*p*ise?vOGJPohrzZW4|+A7>4_U{vi?nXr59Q#@-h%1%Kuj#-kjK z$NZxEruiORzk1_ZX7FmbhmF`gA(IR>c_A1lV3ocH@7XuXK!_yTq#;DN>hUWBG9Hme zMLW)k{WFmH9_*q`qwPQ$LWvS>S)%iZ_LJW-gb4R)v=6U|8khUL&n?@1g?zSeVzw|5 z7=3}3dFi^d$<%D;Yk1Uk5Vr(WDX32xtT}0vZ90fJQ(g@Zk}- zZF+y23$I2uGyiaKZ*Jf8+}8_p`)!?z51?2}pfW3&*Jh=Z^xJgOn|oz?n=st1ZK1mY zvEuHU-lN)D!=>8)68tLNy=~LWJg?njAHN;V%58+RQ+_*~^5*_9y=So5Ldf-+3zG^| z6?dH>3k|nw|6TCSkSjHQQNwR}kDsP~s?~n}dadxA6V83qt1+wnqu^JSp84FbeFhoK z@8{Reg^kgl9xv5HV#;+|6_#zctAB|T^aVv*=EQI8i)dN+pGqRn|AC|MOet?_n~aho)lBgJ_e;=5 zx-_d1& F{|EeKAAJA- literal 0 HcmV?d00001