From 83263bb269df01b86eceab4b29ed8e30dec93ddb Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 17 Oct 2025 08:54:38 +0200 Subject: [PATCH] fix: updated gnl include path and function names that caused compilation errors --- Makefile | 2 +- src/commands/parse.c | 2 +- src/features/builtins/export.c | 2 +- src/minishell.c | 8 +------- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 99f47c4..8b4a21f 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,7 @@ ft_printf: GNL = get_next_line GNL_REPO = https://github.com/sdevsantiago/get_next_line.git GNL_PATH = $(LIB_PATH)/$(GNL) -GNL_INCLUDE_PATH = $(GNL_PATH) +GNL_INCLUDE_PATH = $(GNL_PATH)/include GNL_BIN = $(GNL_PATH)/get_next_line.a get_next_line: diff --git a/src/commands/parse.c b/src/commands/parse.c index c6c6a26..abd7fb5 100644 --- a/src/commands/parse.c +++ b/src/commands/parse.c @@ -69,7 +69,7 @@ static char *resolve_cmd_path(char const *cmd, char const *path) i = 0; while (path_splitted[i]) { - abs_path = ft_strjoin_mul( + abs_path = ft_strnjoin( 3, (char *)path_splitted[i], "/", (char *)cmd); if (access(abs_path, X_OK) != -1) break ; diff --git a/src/features/builtins/export.c b/src/features/builtins/export.c index 372fdb2..354caa6 100644 --- a/src/features/builtins/export.c +++ b/src/features/builtins/export.c @@ -26,7 +26,7 @@ int export_builtin(int argc, char const *argv[], char **envp) { if (ft_strncmp(envp[i], env[0], ft_strlen(env[0])) == 0) { - char *line = ft_strjoin_mul(3, env[0], "=", env[1]); + char *line = ft_strnjoin(3, env[0], "=", env[1]); envp[i] = line; break ; } diff --git a/src/minishell.c b/src/minishell.c index 9a600f7..3b36bed 100644 --- a/src/minishell.c +++ b/src/minishell.c @@ -74,7 +74,6 @@ static t_minishell init_minishell( minishell.envp = (char **)malloc(n_env * sizeof(char *)); if (!minishell.envp && errno == ENOMEM) return (clear_minishell(&minishell), minishell); - minishell.history_file = ft_strjoin(getenv("HOME"), "/"HISTORY_FILE); return (minishell); } @@ -117,15 +116,10 @@ static int minishell(t_minishell *minishell) { if (line) free(line); - char *prompt; + char *prompt = NULL; char *hostname = get_hostname(); if (hostname) { - prompt = ft_strjoin_mul(12, - BOLD, BLUE_TEXT, getenv("USERNAME"), "@", hostname, - RESET, ":", - BOLD, GREEN_TEXT, getenv("PWD"), - RESET, "> "); free(hostname); } if (prompt)