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

open_pipes() bugfix

Browse Source 
+ write "exit" to STDERR (like bash)
+ set_last_exit_status() on CTRL-C
This commit is contained in:
LuckyLaszlo
2021-12-08 00:22:06 +01:00
parent 200e043a8c
commit caa733e14a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
srcs/exec/pipeline.c
View File

@@ -45,7 +45,7 @@ static int open_pipes(t_cmd *pipeline[])
else else
if (close(pipes[STDOUT_FILENO]) == -1) if (close(pipes[STDOUT_FILENO]) == -1)
perror("close()"); perror("close()");
if (pipeline[i]->fd_in == STDIN_FILENO) if (pipeline[i + 1]->fd_in == STDIN_FILENO)
pipeline[i + 1]->fd_in = pipes[STDIN_FILENO]; pipeline[i + 1]->fd_in = pipes[STDIN_FILENO];
else else
if (close(pipes[STDIN_FILENO]) == -1) if (close(pipes[STDIN_FILENO]) == -1)

2
srcs/shell_loop.c
View File

@@ -53,7 +53,7 @@ static char *read_input(char *prompt, t_all *c)
sigaction(SIGINT, &signal_behaviour, NULL); sigaction(SIGINT, &signal_behaviour, NULL);
if (!line_input) if (!line_input)
{ {
write(1, "exit\n", 5); write(STDERR_FILENO, "exit\n", 5);
exit_free(c, get_last_exit_status()); exit_free(c, get_last_exit_status());
} }
return (line_input); return (line_input);

2
srcs/signals.c
View File

@@ -14,11 +14,11 @@
void sigint_handler_interactive(int signum) void sigint_handler_interactive(int signum)
{ {
(void)signum;
write(1, "\n", 1); write(1, "\n", 1);
rl_on_new_line(); rl_on_new_line();
rl_replace_line("", 1); rl_replace_line("", 1);
rl_redisplay(); rl_redisplay();
set_last_exit_status(EXIT_SIGNAL + signum);
} }
void sigint_handler_heredoc(int signum) void sigint_handler_heredoc(int signum)