From 79e440d6b6b6e08220449a1671c7920afaae8be0 Mon Sep 17 00:00:00 2001 From: tomoron Date: Wed, 24 Apr 2024 14:07:14 +0200 Subject: [PATCH] AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA --- srcs/.main.c.swp | Bin 12288 -> 0 bytes srcs/exec_utils.c | 6 +++--- srcs/input_redirections.c | 11 +++++++---- srcs/main.c | 6 +++--- srcs/minishell.h | 4 ++-- 5 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 srcs/.main.c.swp diff --git a/srcs/.main.c.swp b/srcs/.main.c.swp deleted file mode 100644 index a95f211163c2025b0f587682fb76b455b64c9559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2U2GIp6vuB7)KO8;1dR{m?pE8`k9KFbMd(722*frPP@%-6Ez9ie-R_k6*v!l> zMNq1^{8e?K259*V|7ZZ#;X-tg15ix!x>I?d!CjRf8x!c`RN>O~!%rw8w zy));Yd(QvdJG+G`Yx_rc(V>2g;8;V*kKd`)b6ppe(Vi|6xVG!L4!^VHQP{Duf3ToC z({96JHtVl?i<{^CY1eeB9?Qw|3qI{n7t zF5|1Q0fOl%z31-n<&2DNVg+IaVg+IaVg+IaVg+IaVg+Ia z{wE3q^)7N8xvYrtIT@Y17M!DQe2Nu_6^Ipx6^Ipx6^Ipx6^Ipx6^Ipx6^Ipx75EP- zpjQY{@W+1NO$Z+U|1bakKYJG;2f%7@?oL7uf&0NHs|lF}z2J*G2zd^i1~#z3KCl-& z1O|Z$)`C@FB{+XOA+Law;5gU~RPZ49;Wk3v0ms2Xa3Abyp02NRMPk}M;7)S#O)`2zP_nQg14Bi88f;Ye%D1j+30v-iPunw#Mzpf(WdvF2F zffqmpYy=9pypoWM;B)X9_!P{6*TIY61PFi+Ccywmfc4-{)cI%dHTVd;3tj~cV1R>Q z7svs=CjP)b3|$6u;0$;f{QJi_Kmnbkelt_LD7If@QbkLeZ5beP(98+jweyf8JZR82(pph(!lxM>!Y z!VV9lZ!2?}-2Nz04%bYJ(fI&~g4c6`QtKrhwMRs*d(%di;&(GkF}Ti0x5cFzHQl4> zRDLtoFh=_|C5>O)2se~;ICrZnM{XuZ35u)mcYsth_ym|Hbe0Zhi#lRbLQtb{c~Dgo z8Ow#lr^`~I0vEwY!px|-Mqt4(MHJthc63YKJNoDohsH0+mZSUnc=N|>B^x)GR7 zvF7HjM|WS-Smkr4AZj=t8) zaHol(d{y{0t7)li*RM3=1%)K4tcBWi%}R8MwOYl+h7u!YOAmJaMNS=A{R&sRp(Xn^``Sw=@`; zRW-qHp*D6sG;fnOOXWOVgK#Osj*r8t#ROagQ3xeHUpR4rrg=6U3pPp*OPHrv4})B= zoW%xqbeqv*$7rIdTMdTT!l#`qIM)b)W2awf7-{D;OFW*kZXDvOW+}JK($F6tE?Qx} zexnRgRUU6WOHG=gSOGI)65(I0jZPyCcEUiJ3A2cvBB7Jigm3~!GgBgXb8(|7+S5Z@ zL#AkAnD!3$@)0wLj8{i7qsGzJgGz)6n=nxrMYWiLxhRT>Mp!A4W2?t=K_{vfhPTyD zmi(&E8jp#O7@Q)_0&fN{JC?+w8dtGUCN(WTsSONFXf~RK2WT>S94#@(I9!R0_@Y2> zLYu+_z0dX{Qr@STQ2oHOn4=<0#H}Vr_Uzi3Or>Za#q*Xw#BoFyoYq_4f2@8-@*suYce&AX&@s~{(l&8r1a#}9_QjuVC+gQvG(((}+y~jL1b9Z+)I`}OPycZqak`A}y+gh8$LQX5tLcX|R zs94Yzbx6B2+@m~2?&#l3IRj_W4;-P@ayRerkt0QF>t2QRH9fjTwzhS??Y*@%P&mmH zrKdKZGUb-(avR*+yhp?td6y2ux5Jm~P1qGP#n3)#geU3nx?D-)Vo|z8iyyf0j~q(J Q?dQ +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/24 10:46:28 by marde-vr #+# #+# */ -/* Updated: 2024/04/24 10:49:02 by marde-vr ### ########.fr */ +/* Updated: 2024/04/24 14:05:18 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,13 +18,13 @@ void get_redirections(t_msh *msh, t_cmd *cmds) msh->out_type = 0; if (first_is_in_type(cmds)) { - if (!get_in_type(msh, cmds)) + if (!get_in_type(msh, cmds, cmds, 1)) get_out_type(msh, cmds); } else { if (!get_out_type(msh, cmds)) - get_in_type(msh, cmds); + get_in_type(msh, cmds, cmds, 1); } } diff --git a/srcs/input_redirections.c b/srcs/input_redirections.c index 1aa9024..403d8e3 100755 --- a/srcs/input_redirections.c +++ b/srcs/input_redirections.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/05 18:15:27 by marde-vr #+# #+# */ -/* Updated: 2024/04/23 16:41:42 by tomoron ### ########.fr */ +/* Updated: 2024/04/24 14:04:30 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -62,7 +62,7 @@ int open_input_file(t_msh *msh, t_cmd **cur_token) return (0); } -int get_in_type(t_msh *msh, t_cmd *tokens) +int get_in_type(t_msh *msh, t_cmd *t_strt, t_cmd *tokens, int here_doc) { t_cmd *cur_token; @@ -75,7 +75,8 @@ int get_in_type(t_msh *msh, t_cmd *tokens) while (cur_token && (cur_token->cmd_type == CMD || cur_token->cmd_type == PAREN)) cur_token = cur_token->next; - if (cur_token && is_input_type(cur_token)) + if (cur_token && ((cur_token->cmd_type == HERE_DOC && here_doc) + || (cur_token->cmd_type == RED_I && !here_doc))) { msh->in_type = cur_token->cmd_type; if (open_input_file(msh, &cur_token)) @@ -83,7 +84,9 @@ int get_in_type(t_msh *msh, t_cmd *tokens) } if (cur_token && cur_token->next && !is_operand_type(cur_token->next) && cur_token->cmd_type != PIPE && cur_token->next->cmd_type != PIPE) - return (get_in_type(msh, cur_token->next)); + return (get_in_type(msh, t_strt, cur_token->next, here_doc)); + if (here_doc) + return(get_in_type(msh, t_strt, t_strt, 0)); return (0); } diff --git a/srcs/main.c b/srcs/main.c index 9822822..3aa42a1 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/24 13:07:14 by tomoron ### ########.fr */ +/* Updated: 2024/04/24 13:55:40 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -92,7 +92,7 @@ int init_minishell(t_msh **msh, int argc, char **argv, char **envp) *msh = ft_calloc(1, sizeof(t_msh)); if (!*msh) - ft_exit(*msh, 1); + exit(1); (void)argc; (void)argv; (*msh)->env = get_env(envp); @@ -118,7 +118,7 @@ int main(int argc, char **argv, char **envp) { prompt = get_prompt(msh->env); if (!prompt) - exit(1); + ft_exit(msh, 1); commands = readline(prompt); free(prompt); add_history(commands); diff --git a/srcs/minishell.h b/srcs/minishell.h index 61a8e1d..765cecf 100755 --- a/srcs/minishell.h +++ b/srcs/minishell.h @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */ -/* Updated: 2024/04/24 10:59:46 by marde-vr ### ########.fr */ +/* Updated: 2024/04/24 14:03:39 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -99,7 +99,7 @@ int is_fd_open(int fd); int get_out_type(t_msh *msh, t_cmd *cmds); void exec_commands(t_msh *msh); void handle_here_doc(t_msh *msh, char *eof); -int get_in_type(t_msh *msh, t_cmd *tokens); +int get_in_type(t_msh *msh, t_cmd *t_strt, t_cmd *tokens, int here_doc); void signal_handler_interactive(int signum); int get_token_len(char *cmd, t_env *env); void print_syntax_error_bonus(t_cmd *cmd);