jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🔥 exec_destroy (#196 #198)

Browse source
This commit is contained in:
Jack Halford 2017-03-25 23:55:23 +01:00
parent b52db9b55f
commit 73e48982c6
6 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
42sh/includes/exec.h
View file

@ -140,6 +140,7 @@ struct s_exec
}; };
int exec_reset(void); int exec_reset(void);
int exec_destroy(void);
int exec_pushfds(); int exec_pushfds();
int exec_popfds(); int exec_popfds();
int process_fork(t_process *p); int process_fork(t_process *p);

2
42sh/libft/src/sys/open_access.c
View file

@ -23,8 +23,6 @@ int open_access(char *file, t_flag a_flag, t_flag o_flag, t_flag o_perm)
if (access(file, F_OK) == 0 && access(file, a_flag) != 0) if (access(file, F_OK) == 0 && access(file, a_flag) != 0)
return (-ERR_SET(E_SYS_NOPERM, file)); return (-ERR_SET(E_SYS_NOPERM, file));
if ((fd = open(file, o_flag, o_perm)) < 0) if ((fd = open(file, o_flag, o_perm)) < 0)
{
exit(1); exit(1);
}
return (fd); return (fd);
} }

16
42sh/src/exec/exec_reset.c
View file

@ -62,3 +62,19 @@ int exec_reset(void)
jobc->current_id = 1; jobc->current_id = 1;
return (0); return (0);
} }
int exec_destroy(void)
{
int i;
t_jobc *jobc;
t_exec *exec;
exec = &data_singleton()->exec;
jobc = &data_singleton()->jobc;
ft_lstdel(&exec->op_stack, ft_lst_cfree);
ft_lstdel(&jobc->first_job, job_free);
i = -1;
while (++i < 10)
ft_lstdel(&exec->fd_save[i], ft_lst_cfree);
return (0);
}

1
42sh/src/exec/process_launch.c
View file

@ -26,6 +26,7 @@ int process_fork(t_process *p)
exit(1); exit(1);
process_setgroup(p, 0); process_setgroup(p, 0);
process_setsig(); process_setsig();
exec_destroy();
exec_reset(); exec_reset();
data_singleton()->opts &= ~SH_INTERACTIVE; data_singleton()->opts &= ~SH_INTERACTIVE;
data_singleton()->opts &= ~SH_OPTS_JOBC; data_singleton()->opts &= ~SH_OPTS_JOBC;

4
42sh/src/main/data_exit.c
View file

@ -19,13 +19,13 @@ void data_exit(void)
data = data_singleton(); data = data_singleton();
ft_strdel(&data->line.input); ft_strdel(&data->line.input);
ft_strdel(&data->binary); ft_strdel(&data->binary);
exec_popfds(); /* exec_popfds(); */
ft_sstrfree(data->env); ft_sstrfree(data->env);
ft_sstrfree(data->local_var); ft_sstrfree(data->local_var);
ft_sstrfree(data->argv); ft_sstrfree(data->argv);
lexer_destroy(&data->lexer); lexer_destroy(&data->lexer);
parser_destroy(&data->parser); parser_destroy(&data->parser);
ft_lstdel(&data->jobc.first_job, &job_free); exec_destroy();
ft_lstdel(&data->lst_func, &tree_func_free); ft_lstdel(&data->lst_func, &tree_func_free);
ft_save_termios(-1); ft_save_termios(-1);
ft_free_hash_table(); ft_free_hash_table();

9
42sh/src/main/shell_init.c
View file

@ -11,7 +11,9 @@
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
#define SHELL_USAGE "42sh [-c command | [<]script] [--no-jobcontrol]" #define SHELL_USAGE1 "usage: 42sh [--no-jobcontrol]"
#define SHELL_USAGE2 " or 42sh -c command"
#define SHELL_USAGE3 " or 42sh script"
static t_cliopts g_opts[] = static t_cliopts g_opts[] =
{ {
@ -87,7 +89,10 @@ int shell_init(int ac, char **av, char **env)
if (data_init(ac, av, env) < 0) if (data_init(ac, av, env) < 0)
return (-1); return (-1);
if (cliopts_get(av, g_opts, data)) if (cliopts_get(av, g_opts, data))
return (ft_perror(NULL) && SH_ERR("usage: %s", SHELL_USAGE)); return (ft_perror(NULL)
&& SH_ERR("%s", SHELL_USAGE1)
&& SH_ERR("%s", SHELL_USAGE2)
&& SH_ERR("%s", SHELL_USAGE3));
if (!isatty(STDIN) || *data->av_data) if (!isatty(STDIN) || *data->av_data)
data->opts &= ~(SH_INTERACTIVE | SH_OPTS_JOBC); data->opts &= ~(SH_INTERACTIVE | SH_OPTS_JOBC);
if ((data->fd = get_input_fd(data, NULL)) < 0) if ((data->fd = get_input_fd(data, NULL)) < 0)