From 2cbb079036f7a1d81e74643c1d8cf0780a47500a Mon Sep 17 00:00:00 2001 From: tomoron Date: Wed, 24 Apr 2024 15:40:45 +0200 Subject: [PATCH] echoctl et --- srcs/.lst_token.c.swp | Bin 0 -> 12288 bytes srcs/exec_bonus.c | 3 +-- srcs/exit.c | 2 +- srcs/lst_token.c | 4 ++-- srcs/main.c | 5 +---- srcs/minishell.h | 4 +--- srcs/pipe.c | 3 +-- srcs/signal_handler.c | 21 +-------------------- srcs/utils.c | 3 +-- 9 files changed, 9 insertions(+), 36 deletions(-) create mode 100644 srcs/.lst_token.c.swp diff --git a/srcs/.lst_token.c.swp b/srcs/.lst_token.c.swp new file mode 100644 index 0000000000000000000000000000000000000000..bbfb795e564e737d36bb4bf3e39a4fb7297ff6b8 GIT binary patch literal 12288 zcmeI2KWG#|6vm&iaidX5AcfT=2l4(Sw|AF|#*GG15fucRSXg*$?&i#yz1^_87ZZb| zP&;c23wyP&6vSE-1i`}ELc~I`5Ul-ncV=@Z!30gCya~U|?97{Q-uw2h2$}iP7&qVd%ovJE5B`(Ge?WnitS$WI*x41V$soA9$uZ$2=p0#n4+a+by>hEJ(*O1HT@aP7u~YZ&A9%`sTVk%MP#uTR6}On-kLm zG+8OfU-iuBh!`52+hP+hvjgk^JHQUG1MC1hzz(nj?7;uzK)AGv)=^NODr#EwyMF1_ zBX{foJHQUG1MC1hzz(nj>;OB!4zL6406XvxI$$@5KJOv=Xdrp~|6l+8|MURSRWJZv z>?c|ThrsIrq7`r$yx&K37u*4D;DDoG3XFjvFbIC^CHf9Nf_LC8cmy7Td*BAR4z7T6 zpbUlqfp7gpU%?mf3cLi*!87mx+z0F6I%t9m;4H|4VK4}GgCD5xJNN{mT0aAB>;OB! z4zL6406V}A{I3q&BEy$q$9F}xl$#*~&qjQqQk)PaJR7)@DYNlRv>dM|0TZ*XTnTkp z9G6_hOrn$Jc+VR4wVEQC7h_{0mQw-0XfE4MNA`$nxp?KbdPxKsI4?aeM{A_6h#L8* z7M)|#i+oZVQI`>Ewe^ngOE*j_^<@xwpr(;!PXLx~EVLXcvOUu|>e>)XM;h96NJce9 z`HrYmuog_rY9r#ldqx()SW%;Y#+fYQFN?i+f s-45Tbq*btzP&G(8Ex28ko;b_Wk{Cq|tA8cfqpltj!5#ae;7e!HPf}y8ng9R* literal 0 HcmV?d00001 diff --git a/srcs/exec_bonus.c b/srcs/exec_bonus.c index ae8d398..4d83a4b 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/24 10:49:07 by marde-vr ### ########.fr */ +/* Updated: 2024/04/24 15:22:20 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -108,7 +108,6 @@ void end_execution(t_msh *msh, int cmd_count) free(msh->fds); signal(SIGINT, signal_handler_interactive); signal(SIGQUIT, signal_handler_interactive); - set_echoctl(0); } void exec_commands(t_msh *msh) diff --git a/srcs/exit.c b/srcs/exit.c index e9f6427..9dd5f3a 100755 --- a/srcs/exit.c +++ b/srcs/exit.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/07 16:04:11 by tomoron #+# #+# */ -/* Updated: 2024/04/18 20:48:53 by marde-vr ### ########.fr */ +/* Updated: 2024/04/24 15:17:53 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/lst_token.c b/srcs/lst_token.c index ceff6d0..0cbc6ff 100755 --- a/srcs/lst_token.c +++ b/srcs/lst_token.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/06 20:46:19 by tomoron #+# #+# */ -/* Updated: 2024/04/18 20:48:56 by marde-vr ### ########.fr */ +/* Updated: 2024/04/24 15:36:12 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,7 +17,7 @@ t_token *token_add_back(t_token *token, char *value) t_token *res; t_token *current; - if (value && !*value) + if (/*value && !*value*/0) { free(value); return (token); diff --git a/srcs/main.c b/srcs/main.c index 2d8e594..65393b7 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 14:07:32 by tomoron ### ########.fr */ +/* Updated: 2024/04/24 15:22:06 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -98,11 +98,8 @@ int init_minishell(t_msh **msh, int argc, char **argv, char **envp) (*msh)->env = get_env(envp); (*msh)->env = add_shlvl((*msh)->env); tcgetattr(1, &t_p); - (*msh)->echoctl = t_p.c_lflag & ECHOCTL; signal(SIGINT, signal_handler_interactive); signal(SIGQUIT, signal_handler_interactive); - if (set_echoctl(0)) - ft_exit(*msh, 1); return (0); } diff --git a/srcs/minishell.h b/srcs/minishell.h index 590e1fc..440a861 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 15:05:21 by tomoron ### ########.fr */ +/* Updated: 2024/04/24 15:17:35 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -73,7 +73,6 @@ typedef struct s_msh int in_fd; int out_fd; int locked_return_code; - int echoctl; char *here_doc_filename; } t_msh; @@ -149,7 +148,6 @@ char *get_var_name(char *str); int exec_builtin(t_msh *msh); void get_cmd_path(t_msh *msh); int is_operand_type(t_cmd *cmd); -int set_echoctl(int value); int is_output_type(t_cmd *cmd); int print_env(t_env *env); t_cmd *free_cmd(t_cmd *cmd); diff --git a/srcs/pipe.c b/srcs/pipe.c index 36682e7..08f220e 100755 --- a/srcs/pipe.c +++ b/srcs/pipe.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/05 18:17:25 by marde-vr #+# #+# */ -/* Updated: 2024/04/24 10:42:16 by marde-vr ### ########.fr */ +/* Updated: 2024/04/24 15:17:58 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -70,7 +70,6 @@ void execute_command(t_msh *msh, char **cmd_args) } if (msh->tokens->value) { - set_echoctl(msh->echoctl); env = env_to_char_tab(msh->env); if (env) { diff --git a/srcs/signal_handler.c b/srcs/signal_handler.c index 1e6c287..4a01273 100755 --- a/srcs/signal_handler.c +++ b/srcs/signal_handler.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/22 14:31:13 by tomoron #+# #+# */ -/* Updated: 2024/04/23 17:05:37 by tomoron ### ########.fr */ +/* Updated: 2024/04/24 15:17:24 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -50,25 +50,6 @@ void signal_handler_here_doc(int signum) } } -int set_echoctl(int value) -{ - struct termios t_p; - - if (!isatty(1)) - return (0); - if (tcgetattr(1, &t_p)) - return (1); - if (((t_p.c_lflag & ECHOCTL) != 0) == value) - return (0); - if (value) - t_p.c_lflag = t_p.c_lflag | ECHOCTL; - else - t_p.c_lflag = t_p.c_lflag & (~ECHOCTL); - if (tcsetattr(1, TCSANOW, &t_p)) - return (1); - return (0); -} - void signal_handler_command(int signum) { (void)signum; diff --git a/srcs/utils.c b/srcs/utils.c index d7b860b..145b55a 100755 --- a/srcs/utils.c +++ b/srcs/utils.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/05 18:19:26 by marde-vr #+# #+# */ -/* Updated: 2024/04/24 10:51:28 by marde-vr ### ########.fr */ +/* Updated: 2024/04/24 15:22:11 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,6 @@ void ft_exit(t_msh *msh, int exit_code) { - set_echoctl(msh->echoctl); free_msh(msh); exit(exit_code); }