From 8178757d988f8e9e33bcf075f6b7209376ccb9bc Mon Sep 17 00:00:00 2001 From: whaffman Date: Mon, 3 Mar 2025 23:07:51 +0100 Subject: [PATCH] norm --- Makefile | 4 +--- lib/libft | 2 +- src/builtin/builtin_exit.c | 3 +-- src/builtin/builtin_export.c | 8 +++----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index f767677..7f95c49 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: qmennen +#+ # # +#+ # # Created: 2024/10/15 11:48:46 by whaffman #+# #+# # -# Updated: 2025/03/03 11:52:43 by whaffman ######## odam.nl # +# Updated: 2025/03/03 22:50:22 by whaffman ######## odam.nl # # # # **************************************************************************** # @@ -38,8 +38,6 @@ endif # Build configurations BUILD_CONFIGS = release debug asan tsan -FLAGS = -DNOCOLORS -DNOBANNER -DNOPROMPT - release_CFLAGS = -Wall -Werror -Werror -O2 debug_CFLAGS = -Wall -Werror -Werror -g3 -DDEBUG -DDBG='fprintf(stderr, RED "DEBUG: " RESET "%s:%d (%s)\n", __FILE__, __LINE__, __PRETTY_FUNCTION__);' asan_CFLAGS = -Wall -Werror -Werror -fsanitize=address,leak,undefined -g3 diff --git a/lib/libft b/lib/libft index e1a01cb..6c1aafa 160000 --- a/lib/libft +++ b/lib/libft @@ -1 +1 @@ -Subproject commit e1a01cbdfd8a18a0e1bd8dcc2c6fc3745b39cbce +Subproject commit 6c1aafa436b0ef0011e82abec2fff63e8d03767e diff --git a/src/builtin/builtin_exit.c b/src/builtin/builtin_exit.c index 1f8b908..9f32b9f 100644 --- a/src/builtin/builtin_exit.c +++ b/src/builtin/builtin_exit.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ */ /* +#+ */ /* Created: 2025/02/20 11:32:59 by whaffman #+# #+# */ -/* Updated: 2025/03/03 21:46:10 by whaffman ######## odam.nl */ +/* Updated: 2025/03/03 23:05:15 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -40,5 +40,4 @@ int builtin_exit(t_minishell *msh, t_command *cmd) ft_putendl_fd("exit", STDOUT_FILENO); rl_clear_history(); exit(exit_status); - return (FAILURE); } diff --git a/src/builtin/builtin_export.c b/src/builtin/builtin_export.c index a9f96ea..a9f7b31 100644 --- a/src/builtin/builtin_export.c +++ b/src/builtin/builtin_export.c @@ -6,15 +6,13 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/02/20 11:32:53 by whaffman #+# #+# */ -/* Updated: 2025/03/03 22:30:52 by whaffman ######## odam.nl */ +/* Updated: 2025/03/03 23:00:38 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ #include "minishell.h" - -//TO LIBFT -static int ft_isvalid_identifier(char *str) +static int ft_isvalid_identifier(char *str) { if (ft_isalpha(*str) == FALSE && *str != '_') return (FALSE); @@ -46,7 +44,7 @@ int builtin_export(t_minishell *msh, t_command *cmd) { err = ft_strjoin_safe(msh, arr[0], ": not a valid identifier"); error_msg("export", err); - return(ft_free_arr_safe(msh, arr), EXIT_FAILURE); + return (ft_free_arr_safe(msh, arr), EXIT_FAILURE); } ft_free_arr_safe(msh, arr); }