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

merge

Browse Source 
+ readline() replace gnl() in here_doc
+ "int error" in struct "t_cmd"
This commit is contained in:
LuckyLaszlo
2021-11-16 22:30:20 +01:00
parent 140549db00 f70ee4bae0
commit 965cf99ca5
17 changed files with 378 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
srcs/shell_loop.c
View File

@@ -6,18 +6,14 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/04 05:59:26 by lperrey #+# #+# */
/* Updated: 2021/11/16 03:52:37 by lperrey ### ########.fr */
/* Updated: 2021/11/16 21:22:32 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
//static char **tokens_list_to_argv(t_token *t); // temp test
void sigint_handler(int signum); //tmp
void sigquit_aka_eof_handler(int signum); //tmp
void close_fd(t_cmd *cmd);
void execute_cmd(char **envp, t_cmd **cmd_arr);
void execute_cmd(char **envp, t_cmd **cmd_arr, t_all *c);
void shell_loop(t_all *c)
{
@@ -45,11 +41,79 @@ void shell_loop(t_all *c)
exec_cmd_line(c);
}
else if (!line_input)
write(1, "\n", 1);
{
write(1, "exit\n", 5);
exit(0);
}
}
}
void test_signal(t_all *c)
// WIP HUGO
void close_fd(t_cmd *cmd)
{
if (cmd->fd_in != 0)
close(cmd->fd_in);
if (cmd->fd_out != 1)
close(cmd->fd_out);
}
// WIP HUGO
void execute_cmd(char **envp, t_cmd **cmd_arr, t_all *c)
{
pid_t pid;
pid_t wpid;
int wstatus;
int i;
int argc;
// put signal handling for SIGINT to ignore so parent process will not activate signal_handling_executiv while childs are in process
c->signal_behaviour.sa_handler = SIG_IGN;
sigaction(SIGINT, &c->signal_behaviour, NULL);
i = 0;
while(cmd_arr[i])
{
pid = fork();
if (pid == 0)
{
// activate singal handling for execution mode
c->signal_behaviour.sa_handler = sigint_handler_execution;
sigaction(SIGINT, &c->signal_behaviour, NULL);
if (cmd_arr[i]->fd_in != 0)
dup2(cmd_arr[i]->fd_in, STDIN_FILENO);
if (cmd_arr[i]->fd_out != 1)
dup2(cmd_arr[i]->fd_out, STDOUT_FILENO);
close_fd(cmd_arr[i]);
if (cmd_arr[i]->builtin_func)
{
argc = 0;
while (cmd_arr[i]->argv[argc])
argc++;
cmd_arr[i]->builtin_func(argc, cmd_arr[i]->argv, c);
exit(0);
}
else
{
write(1, "1", 1);
execve(cmd_arr[i]->argv[0], cmd_arr[i]->argv, envp);
}
}
else
close_fd(cmd_arr[i]);
i++;
}
// waitpid pour la derniere commande (pour '$?')
wpid = 1;
while (wpid > 0)
wpid = wait(&wstatus);
// to print a \n after execve was terminated by a signal
if (WIFSIGNALED(wstatus))
write(1, "\n", 1);
// put signal handling for sigint back to the signal handler for interactiv mode
c->signal_behaviour.sa_handler = sigint_handler_interactiv;
sigaction(SIGINT, &c->signal_behaviour, NULL);
}
/* void test_signal(t_all *c)
{
// TEMP
// A faire aprés être sortie du mode interactif
@@ -80,4 +144,4 @@ void test_signal(t_all *c)
sigaction(SIGQUIT, &c->signal_behaviour, NULL);
tcsetattr(STDIN_FILENO, TCSANOW, &c->interactive_termios);
}
}
} */