From a140be4c3e46a80e26798344d8e57cc8c6e7eec0 Mon Sep 17 00:00:00 2001 From: tomoron Date: Mon, 25 Mar 2024 13:30:55 +0100 Subject: [PATCH] fix env vide --- srcs/main.c | 11 +++++++---- srcs/path.c | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/srcs/main.c b/srcs/main.c index 5de3550..df2702a 100755 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ -/* Updated: 2024/03/25 13:01:29 by marde-vr ### ########.fr */ +/* Updated: 2024/03/25 13:19:26 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,8 +22,11 @@ char *get_prompt(t_env *env) res = ft_strjoin_free("\001", ft_get_color(10, 255, 80), 2); res = ft_strjoin_free(res, "\033[1m\002", 1); - res = ft_strjoin_free(res, getenv("USER"), 1); - res = ft_strjoin_free(res, "@", 1); + if(getenv("USER")) + { + res = ft_strjoin_free(res, getenv("USER"), 1); + res = ft_strjoin_free(res, "@", 1); + } res = ft_strjoin_free(res, "minishell\001\033[0m\002:\001", 1); res = ft_strjoin_free(res, ft_get_color(80, 80, 255), 3); res = ft_strjoin_free(res, "\033[1m\002", 1); @@ -89,7 +92,7 @@ int main(int argc, char **argv, char **envp) commands = (char *)1; init_minishell(&msh, argc, argv, envp); - while (msh->env && commands) + while (commands) { prompt = get_prompt(msh->env); if (!prompt) diff --git a/srcs/path.c b/srcs/path.c index 98e6cfa..4c1e4aa 100644 --- a/srcs/path.c +++ b/srcs/path.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/21 21:47:15 by marde-vr #+# #+# */ -/* Updated: 2024/03/23 19:24:52 by marde-vr ### ########.fr */ +/* Updated: 2024/03/25 13:26:18 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,7 @@ char **split_paths_from_env(t_env *env) path_in_envp = 0; cur_env_var = env; - while (cur_env_var->next != 0) + while (cur_env_var && cur_env_var->next != 0) { if (!ft_strcmp(cur_env_var->name, "PATH")) {