starnakin/42_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: starnakin:96a5856592c9eb3427bdc2a41c139627e2b3718f
Branches Tags
starnakin:master
starnakin:camille
...
compare: starnakin:147af02c6e1cafd396f1498f0f42b04b3b0a73cc
Branches Tags
starnakin:master
starnakin:camille

3 Commits
96a5856592 ... 147af02c6e

Author SHA1 Message Date
Camille Chauvet
147af02c6e Merge branch 'master' of git.chauvet.pro:starnakin/42_minishell 2023-03-28 15:28:37 +02:00
Camille Chauvet
67e8a60423 fix: signal set exit code 2023-03-28 14:38:10 +02:00
Camille Chauvet
db51c3c85b change: subject 2023-03-27 16:35:34 +02:00
1 changed files with 7 additions and 4 deletions
Show Stats Expand all files Collapse all files

11
main.c
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */ /* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/16 15:16:14 by cchauvet #+# #+# */ /* Created: 2023/02/16 15:16:14 by cchauvet #+# #+# */
/* Updated: 2023/02/24 11:04:40 by cchauvet ### ########.fr */ /* Updated: 2023/03/28 14:35:13 by cchauvet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -99,6 +99,10 @@ void ft_ctrlc(int num)
{ {
t_data *data; t_data *data;
if (num == SIGQUIT)
return ;
data = ft_get_data();
data->exit_code = 130;
if (*ft_get_heredoc() != -1) if (*ft_get_heredoc() != -1)
{ {
close(*ft_get_heredoc()); close(*ft_get_heredoc());
@ -106,10 +110,8 @@ void ft_ctrlc(int num)
} }
else else
{ {
data = ft_get_data();
if (data->child_pid > 1) if (data->child_pid > 1)
{ {
kill(data->child_pid, num);
data->child_pid = 0; data->child_pid = 0;
ft_putchar_fd('\n', 1); ft_putchar_fd('\n', 1);
} }
@ -127,10 +129,11 @@ void ft_quit(int num)
{ {
t_data *data; t_data *data;
(void) num;
data = ft_get_data(); data = ft_get_data();
data->exit_code = 131;
if (data->child_pid > 1) if (data->child_pid > 1)
{ {
kill(data->child_pid, num);
ft_printf("Quit (core dumped)\n"); ft_printf("Quit (core dumped)\n");
data->child_pid = 0; data->child_pid = 0;
} }