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

ft_free_null()

Browse Source 
+ refactoring shell_loop()
This commit is contained in:
LuckyLaszlo
2021-11-30 14:12:05 +01:00
parent b265e8475a
commit ffd06c4b95
5 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
srcs/exec/find_access.c
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/11/16 01:57:38 by lperrey #+# #+# */
/* Updated: 2021/11/29 12:35:02 by lperrey ### ########.fr */
/* Updated: 2021/11/30 13:37:09 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
@@ -70,10 +70,7 @@ static int search_cmd_path(char *cmd_name, char **cmd_path, char *path[])
if (access(*cmd_path, X_OK) == 0)
break ;
else
{
free(*cmd_path);
*cmd_path = NULL; // TODO : free_null()
}
ft_free_null(cmd_path);
i++;
}
free(cmd_name);

8
srcs/generic.c
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/08 09:25:35 by lperrey #+# #+# */
/* Updated: 2021/11/27 12:58:20 by lperrey ### ########.fr */
/* Updated: 2021/11/30 13:11:48 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
@@ -211,3 +211,9 @@ int ft_reti_perror_io(int ret, char *err_str, char *io_file)
perror(io_file);
return (ret);
}
void ft_free_null(void *ptr)
{
free(*(char**)ptr);
*(char**)ptr = NULL;
}

5
srcs/parsing/expansions/new_token_for_each_field.c
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/11/07 02:01:33 by lperrey #+# #+# */
/* Updated: 2021/11/07 04:33:04 by lperrey ### ########.fr */
/* Updated: 2021/11/30 13:46:46 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
@@ -55,8 +55,7 @@ static t_token *insert_tokens(t_token *t, t_token *insert_lst)
t_token *insert_lst_last;
t->id = 0;
free(t->content);
t->content = NULL; // TODO : free_null()
ft_free_null(&t->content);
if (!insert_lst)
return (t);

37
srcs/shell_loop.c
View File

@@ -6,12 +6,14 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/04 05:59:26 by lperrey #+# #+# */
/* Updated: 2021/11/29 12:43:38 by lperrey ### ########.fr */
/* Updated: 2021/11/30 13:30:52 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
static char *read_input(char *prompt, t_all *c);
void shell_loop(t_all *c)
{
char *line_input;
@@ -21,18 +23,13 @@ void shell_loop(t_all *c)
{
if (line_input)
free(line_input);
c->signal_behaviour.sa_handler = sigint_handler_interactive;
sigaction(SIGINT, &c->signal_behaviour, NULL);
line_input = readline(c->prompt);
line_input = read_input(c->prompt, c);
if (line_input && *line_input)
{
c->signal_behaviour.sa_handler = SIG_IGN;
sigaction(SIGINT, &c->signal_behaviour, NULL);
add_history(line_input);
// Lexing
c->token_list = input_to_tokens(line_input);
free(line_input);
line_input = NULL; // TODO : free_null()
ft_free_null(&line_input);
if (!c->token_list)
continue ;
// Parsing
@@ -43,10 +40,24 @@ void shell_loop(t_all *c)
// Exec Pipeline
exec_cmd_line(c);
}
else if (!line_input)
{
write(1, "exit\n", 5);
exit_free(c, get_last_exit_status());
}
}
}
static char *read_input(char *prompt, t_all *c)
{
char *line_input;
struct sigaction signal_behaviour;
ft_bzero(&signal_behaviour, sizeof signal_behaviour);
signal_behaviour.sa_handler = sigint_handler_interactive;
sigaction(SIGINT, &signal_behaviour, NULL);
line_input = readline(prompt);
signal_behaviour.sa_handler = SIG_IGN;
sigaction(SIGINT, &signal_behaviour, NULL);
if (!line_input)
{
write(1, "exit\n", 5);
exit_free(c, get_last_exit_status());
}
return (line_input);
}