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

error message on cmd segfault.

Browse Source
This commit is contained in:
LuckyLaszlo
2021-12-21 17:33:23 +01:00
parent 5a39470290
commit 54c9df31e4
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
srcs/exec/subshell_wait.c
View File

@@ -6,12 +6,13 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */ /* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/11/16 01:57:38 by lperrey #+# #+# */ /* Created: 2021/11/16 01:57:38 by lperrey #+# #+# */
/* Updated: 2021/11/27 10:43:46 by lperrey ### ########.fr */ /* Updated: 2021/12/21 17:29:39 by lperrey ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
static void handle_signal_status(int wstatus);
static int handle_wait_error(void); static int handle_wait_error(void);
void wait_subshell(pid_t last_cmd_pid) void wait_subshell(pid_t last_cmd_pid)
@@ -27,10 +28,7 @@ void wait_subshell(pid_t last_cmd_pid)
if (WIFEXITED(wstatus)) if (WIFEXITED(wstatus))
set_last_exit_status(WEXITSTATUS(wstatus)); set_last_exit_status(WEXITSTATUS(wstatus));
if (WIFSIGNALED(wstatus)) if (WIFSIGNALED(wstatus))
{ handle_signal_status(wstatus);
write(STDIN_FILENO, "\n", 1);
set_last_exit_status(EXIT_SIGNAL + WTERMSIG(wstatus));
}
} }
ret = 0; ret = 0;
while (ret != -1) while (ret != -1)
@@ -39,6 +37,18 @@ void wait_subshell(pid_t last_cmd_pid)
if (ret == -1) if (ret == -1)
ret = handle_wait_error(); ret = handle_wait_error();
} }
if (get_last_exit_status() == EXIT_SIGNAL + SIGSEGV)
ft_putstr_fd("Segmentation fault (core dumped)\n", STDERR_FILENO);
}
static void handle_signal_status(int wstatus)
{
int signum;
signum = WTERMSIG(wstatus);
set_last_exit_status(EXIT_SIGNAL + signum);
if (signum == SIGINT)
write(STDIN_FILENO, "\n", 1);
} }
static int handle_wait_error(void) static int handle_wait_error(void)

17
tests/test_segfault.c Normal file
View File

@@ -0,0 +1,17 @@
# include <stdio.h>
#include <unistd.h>
int main(int argc, char *argv[], char *envp[])
{
int i;
char *str;
str = NULL;
i = 0;
while (str[i])
{
write(1, &str[i], 1);
}
return (0);
}