willem/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NORM

Browse Source
This commit is contained in:
whaffman 2025-03-02 22:12:31 +01:00
parent 0f2040cb9f
commit de9f3f7f8c
8 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
inc/debug.h
View File

@ -1,23 +1,24 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* debug.h :+: :+: :+: */ /* debug.h :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/18 20:06:53 by qmennen #+# #+# */ /* Created: 2025/02/18 20:06:53 by qmennen #+# #+# */
/* Updated: 2025/02/18 20:10:49 by qmennen ### ########.fr */ /* Updated: 2025/02/18 20:10:49 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#ifndef DEBUG_H #ifndef DEBUG_H
# define DEBUG_H # define DEBUG_H
# include "minishell.h" # include "minishell.h"
void print_commands(void *param); void print_commands(void *param);
void token_print(void *param); void token_print(void *param);
void print_redirects(void *param); void print_redirects(void *param);
void print_freelist(t_minishell *msh); void print_freelist(t_minishell *msh);
void token_print(void *param);
#endif
#endif

3
inc/minishell.h
View File

@ -6,7 +6,7 @@
/* By: marvin <marvin@student.42.fr> +#+ */ /* By: marvin <marvin@student.42.fr> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/04 16:13:13 by whaffman #+# #+# */ /* 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 # else
# define DEBUG 0 # define DEBUG 0
# endif // DEBUG # endif // DEBUG
void token_print(void *param);
#endif #endif

4
src/builtin/builtin_export.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/20 11:32:53 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) if (arr[1] == NULL)
{ {
ft_free_arr_safe(msh, arr); ft_free_arr_safe(msh, arr);
DBG;
i++; i++;
continue ; continue ;
} }
@ -38,7 +37,6 @@ int builtin_export(t_minishell *msh, t_command *cmd)
else else
environment_add(msh, arr[0], arr[1]); environment_add(msh, arr[0], arr[1]);
ft_free_arr_safe(msh, arr); ft_free_arr_safe(msh, arr);
DBG
} }
return (SUCCESS); return (SUCCESS);
} }

4
src/environment/environment_free_list.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/04 16:13:59 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 else
next = NULL; next = NULL;
environment_free(msh, (*lst)->content); environment_free(msh, (*lst)->content);
free_safe(msh, (void **)lst); free_safe(msh, (void **) lst);
*lst = next; *lst = next;
} }
} }

3
src/main.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/04 16:19:22 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(); rl_clear_history();
return (EXIT_SUCCESS); return (EXIT_SUCCESS);
} }

7
src/prompt/prompt.c
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/04 16:13:08 by whaffman #+# #+# */ /* 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); line = readline(prompt);
free_safe(msh, (void **)&prompt); free_safe(msh, (void **)&prompt);
} }
if (line == NULL) if (line != NULL && *line != '\0')
return (NULL); history_write(line);
history_write(line);
return (line); return (line);
} }

4
src/utils/ft_free_arr_safe.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/03/01 14:20:45 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) void ft_free_arr_safe(t_minishell *msh, char **arr)
{ {
int i; int i;
i = 0; i = 0;
while (arr[i] != NULL) while (arr[i] != NULL)

7
src/utils/ft_split_safe.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/03/02 21:58:06 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) while (n-- > 0)
{ {
free_safe(msh, (void**) &(*arr)[n]); free_safe(msh, (void **) &(*arr)[n]);
DBG;
} }
free_safe(msh,(void**) arr); free_safe(msh, (void **) *arr);
return (NULL); return (NULL);
} }