minishell 1.0

sebamiro · sebamiro · commit eef52f66e409 · 2022-12-22T18:43:54.000+01:00
diff --git a/inc/minishell.h b/inc/minishell.h
@@ -93,14 +93,13 @@ int		start_line(t_msh **msh, char *read_line, char ***lines);
 void	put_error(char *bash, char *file, char *error);
 int		export_parse(t_cmd *cmd, char *array, int j, int control);
 int		tokenize(t_msh *msh, t_cmd **cmd, char *read_line);
-void	child_wait_signal(void);
 
 ///////////pipes/////////////////
 
 t_pipe	*init_pipes(void);
 void	setfds(t_pipe *pipe, int i);
 void	setpipes(t_pipe *pipes, int i);
-void	wait_signal(void);
+void	wait_signal(int i);
 char	**ft_split_pipes(char *s);
 
 //////////redirection///////////
diff --git a/src/execute_cmd.c b/src/execute_cmd.c
@@ -38,7 +38,6 @@ static	int	cmd_type(t_cmd *cmd, char *temp_cmd)
 
 static void	cmd_process(t_cmd *cmd, char *temp_cmd)
 {
-	child_wait_signal();
 	if (dup2(cmd->pipes->in, STDIN_FILENO) == -1)
 		exit_error("Error DUP", 23);
 	if (dup2(cmd->pipes->out, STDOUT_FILENO) == -1)
@@ -62,10 +61,13 @@ static void	wait_exit(t_pipe *pipes, int i)
 		waitpid(-1, &g_error, 0);
 		if (WIFEXITED(g_error))
 			g_error = WEXITSTATUS(g_error);
-		if (g_error != 0 && g_error != 1
-			&& g_error != 127 && g_error != 2)
+		if (g_error == 2 || g_error == 3)
+			g_error = g_error + 128;
+		else if (g_error != 0 && g_error != 1
+			&& g_error != 127 && g_error != 13)
 			perror(NULL);
 	}
+	wait_signal(1);
 }
 
 void	execute_nonpipe(t_cmd *cmd, char *temp_cmd)
@@ -98,6 +100,7 @@ void	execute_cmd(t_cmd **cmd, t_pipe *pipes)
 	char		*temp_cmd;
 
 	i = 1;
+	wait_signal(0);
 	while ((*cmd) && i)
 	{
 		temp_cmd = str_noquotes((*cmd)->cmd);
diff --git a/src/minishell.c b/src/minishell.c
@@ -49,7 +49,7 @@ int	main(int ac, char **av, char **ev)
 		many_args(av);
 	g_error = 0;
 	msh = init(ev);
-	wait_signal();
+	wait_signal(1);
 	recive_arguments(msh);
 	return (0);
 }
diff --git a/src/redir_file.c b/src/redir_file.c
@@ -45,7 +45,7 @@ int	get_from_file(t_cmd *cmd, char *file)
 	fd = open(ft_strjoin(temp, file), O_RDONLY);
 	if (fd == -1)
 	{
-		put_error("bash", file, NULL);
+		put_error("bash", file, "No such file or directory");
 		pipe(pfd);
 		if (dup2(pfd[1], cmd->pipes->out) == -1)
 			exit_error("Error dup", 50);
diff --git a/src/signals.c b/src/signals.c
@@ -20,7 +20,6 @@ static void	signal_handler(int signal)
 		write(1, "\n", 1);
 		rl_on_new_line();
 		rl_redisplay();
-		// kill(0, SIGTERM);
 		g_error = 1;
 	}
 	else if (signal == SIGQUIT)
@@ -33,27 +32,26 @@ static void	signal_handler(int signal)
 
 static void	child_handler(int signal)
 {
-	if (signal == SIGQUIT)
-		return ;
+	if (signal == SIGINT)
+		g_error = 130;
+	else if (signal == SIGQUIT)
+	{
+		write(1, "Quit: 3\n", 10);
+		g_error = 131;
+	}
 	return ;
 }
 
-void	wait_signal(void)
+void	wait_signal(int i)
 {
 	struct sigaction	sa;
 
-	sa.sa_handler = &signal_handler;
+	if (i)
+		sa.sa_handler = &signal_handler;
+	else
+		sa.sa_handler = &child_handler;
 	sa.sa_flags = SA_RESTART;
 	sigaction(SIGINT, &sa, NULL);
 	sigaction(SIGQUIT, &sa, NULL);
 	sigaction(SIGTERM, &sa, NULL);
 }
-
-void	child_wait_signal(void)
-{
-	struct sigaction	sa;
-
-	sa.sa_handler = &child_handler;
-	sa.sa_flags = SA_RESTART;
-	sigaction(SIGQUIT, &sa, NULL);
-}

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ int main(int ac, char av, char ev)`
`49`	`49`	`many_args(av);`
`50`	`50`	`g_error = 0;`
`51`	`51`	`msh = init(ev);`
`52`		`- wait_signal();`
	`52`	`+ wait_signal(1);`
`53`	`53`	`recive_arguments(msh);`
`54`	`54`	`return (0);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ int get_from_file(t_cmd cmd, char file)`
`45`	`45`	`fd = open(ft_strjoin(temp, file), O_RDONLY);`
`46`	`46`	`if (fd == -1)`
`47`	`47`	`{`
`48`		`- put_error("bash", file, NULL);`
	`48`	`+ put_error("bash", file, "No such file or directory");`
`49`	`49`	`pipe(pfd);`
`50`	`50`	`if (dup2(pfd[1], cmd->pipes->out) == -1)`
`51`	`51`	`exit_error("Error dup", 50);`