diff --git a/inc/debug.h b/inc/debug.h index fc287f5..ae99917 100644 --- a/inc/debug.h +++ b/inc/debug.h @@ -1,23 +1,24 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* debug.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: qmennen +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/02/18 20:06:53 by qmennen #+# #+# */ -/* Updated: 2025/02/18 20:10:49 by qmennen ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef DEBUG_H -# define DEBUG_H - -# include "minishell.h" - -void print_commands(void *param); -void token_print(void *param); -void print_redirects(void *param); -void print_freelist(t_minishell *msh); - -#endif +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* debug.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: qmennen +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/02/18 20:06:53 by qmennen #+# #+# */ +/* Updated: 2025/02/18 20:10:49 by qmennen ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef DEBUG_H +# define DEBUG_H + +# include "minishell.h" + +void print_commands(void *param); +void token_print(void *param); +void print_redirects(void *param); +void print_freelist(t_minishell *msh); +void token_print(void *param); + +#endif diff --git a/inc/minishell.h b/inc/minishell.h index de9dffb..37ee81a 100644 --- a/inc/minishell.h +++ b/inc/minishell.h @@ -6,7 +6,7 @@ /* By: marvin +#+ */ /* +#+ */ /* Created: 2025/02/04 16:13:13 by whaffman #+# #+# */ -/* Updated: 2025/03/01 14:13:46 by whaffman ######## odam.nl */ +/* Updated: 2025/03/02 22:12:12 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -75,6 +75,5 @@ # else # define DEBUG 0 # endif // DEBUG -void token_print(void *param); #endif diff --git a/src/builtin/builtin_export.c b/src/builtin/builtin_export.c index 82cbbd8..a7013c8 100644 --- a/src/builtin/builtin_export.c +++ b/src/builtin/builtin_export.c @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/02/20 11:32:53 by whaffman #+# #+# */ -/* Updated: 2025/03/02 21:35:02 by whaffman ######## odam.nl */ +/* Updated: 2025/03/02 22:09:36 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -25,7 +25,6 @@ int builtin_export(t_minishell *msh, t_command *cmd) if (arr[1] == NULL) { ft_free_arr_safe(msh, arr); - DBG; i++; continue ; } @@ -38,7 +37,6 @@ int builtin_export(t_minishell *msh, t_command *cmd) else environment_add(msh, arr[0], arr[1]); ft_free_arr_safe(msh, arr); - DBG } return (SUCCESS); } diff --git a/src/environment/environment_free_list.c b/src/environment/environment_free_list.c index acf45a1..61ed291 100644 --- a/src/environment/environment_free_list.c +++ b/src/environment/environment_free_list.c @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/02/04 16:13:59 by whaffman #+# #+# */ -/* Updated: 2025/03/02 22:07:17 by whaffman ######## odam.nl */ +/* Updated: 2025/03/02 22:08:50 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -27,7 +27,7 @@ void environment_free_list(t_minishell *msh) else next = NULL; environment_free(msh, (*lst)->content); - free_safe(msh, (void **)lst); + free_safe(msh, (void **) lst); *lst = next; } } diff --git a/src/main.c b/src/main.c index c0a5c36..77aced7 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/02/04 16:19:22 by whaffman #+# #+# */ -/* Updated: 2025/03/01 11:01:03 by whaffman ######## odam.nl */ +/* Updated: 2025/03/02 22:11:40 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -75,4 +75,3 @@ int main(int argc, char **argv, char **envp) rl_clear_history(); return (EXIT_SUCCESS); } - diff --git a/src/prompt/prompt.c b/src/prompt/prompt.c index cc000ec..df3585d 100644 --- a/src/prompt/prompt.c +++ b/src/prompt/prompt.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ */ /* +#+ */ /* Created: 2025/02/04 16:13:08 by whaffman #+# #+# */ -/* Updated: 2025/03/01 11:22:45 by whaffman ######## odam.nl */ +/* Updated: 2025/03/02 22:13:52 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -111,8 +111,7 @@ char *ft_prompt(t_minishell *msh) line = readline(prompt); free_safe(msh, (void **)&prompt); } - if (line == NULL) - return (NULL); - history_write(line); + if (line != NULL && *line != '\0') + history_write(line); return (line); } diff --git a/src/utils/ft_free_arr_safe.c b/src/utils/ft_free_arr_safe.c index 6cf1aa9..bd58f29 100644 --- a/src/utils/ft_free_arr_safe.c +++ b/src/utils/ft_free_arr_safe.c @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/03/01 14:20:45 by whaffman #+# #+# */ -/* Updated: 2025/03/01 14:26:58 by whaffman ######## odam.nl */ +/* Updated: 2025/03/02 22:09:58 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ void ft_free_arr_safe(t_minishell *msh, char **arr) { - int i; + int i; i = 0; while (arr[i] != NULL) diff --git a/src/utils/ft_split_safe.c b/src/utils/ft_split_safe.c index cc25520..69f55d9 100644 --- a/src/utils/ft_split_safe.c +++ b/src/utils/ft_split_safe.c @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/03/02 21:58:06 by whaffman #+# #+# */ -/* Updated: 2025/03/02 22:04:08 by whaffman ######## odam.nl */ +/* Updated: 2025/03/02 22:11:34 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -16,10 +16,9 @@ static void *free_arr_safe(t_minishell *msh, int n, char ***arr) { while (n-- > 0) { - free_safe(msh, (void**) &(*arr)[n]); - DBG; + free_safe(msh, (void **) &(*arr)[n]); } - free_safe(msh,(void**) arr); + free_safe(msh, (void **) *arr); return (NULL); }