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

fixed argv open().

Browse Source 
previously wrongly dup2() to STDIN.
This commit is contained in:
lperrey
2021-12-20 22:52:41 +01:00
parent 6a9b7bae1b
commit 8ed97346f7
11 changed files with 78 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
srcs/shell_script.c
View File

@@ -6,16 +6,16 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/26 23:47:44 by lperrey #+# #+# */
/* Updated: 2021/12/18 15:15:30 by lperrey ### ########.fr */
/* Updated: 2021/12/20 22:26:57 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
static char *read_input_script(t_all *c);
static char *read_input_script(t_all *c, int script_fd);
static void exit_signal(t_all *c);
void shell_script(t_all *c)
void shell_script(t_all *c, int script_fd)
{
char *line_input;
@@ -23,7 +23,7 @@ void shell_script(t_all *c)
while (1)
{
free(line_input);
line_input = read_input_script(c);
line_input = read_input_script(c, script_fd);
if (!line_input)
break ;
if (line_input && *line_input)
@@ -44,7 +44,7 @@ void shell_script(t_all *c)
exit_free(c, get_last_exit_status());
}
static char *read_input_script(t_all *c)
static char *read_input_script(t_all *c, int script_fd)
{
char *line_input;
struct sigaction signal_behaviour;
@@ -54,7 +54,7 @@ static char *read_input_script(t_all *c)
signal_behaviour.sa_handler = SIG_IGN;
sigaction(SIGINT, &signal_behaviour, NULL);
line_input = NULL;
ret = gnl(STDIN_FILENO, &line_input, 0);
ret = gnl(script_fd, &line_input, 0);
if (ret == -1)
{
free(line_input);