From 202c5e881128a43a607ecd541e0722e8ea6e00d9 Mon Sep 17 00:00:00 2001 From: tomoron Date: Tue, 23 Apr 2024 20:07:21 +0200 Subject: [PATCH] =?UTF-8?q?=C3=A7a=20marche=20bien=20!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srcs/cd.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/srcs/cd.c b/srcs/cd.c index 0d68eea..579ab12 100755 --- a/srcs/cd.c +++ b/srcs/cd.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/16 21:02:54 by marde-vr #+# #+# */ -/* Updated: 2024/04/23 19:52:01 by tomoron ### ########.fr */ +/* Updated: 2024/04/23 20:06:06 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -35,29 +35,30 @@ void cd_update_pwd(t_msh *msh) char *get_new_wd(t_token *arg, t_msh *msh) { - char *new_wd; + char *nw_wd; if (arg) { - new_wd = arg->value; - if(ft_strcmp("-", new_wd)) + nw_wd = arg->value; + if(!ft_strcmp("-", nw_wd)) { - new_wd = ft_get_env(msh->env, "OLDPWD"); - if(!new_wd) + nw_wd = ft_get_env(msh->env, "OLDPWD"); + if(!nw_wd) ft_putstr_fd("minishell: cd: OLDPWD not set\n", 2); - if(!new_wd) + if(!nw_wd) return(0); + ft_printf_fd((1 * (msh->out_fd == 0)) + msh->out_fd, "%s\n", nw_wd); } } else { - new_wd = ft_get_env(msh->env, "HOME"); - if (!new_wd) + nw_wd = ft_get_env(msh->env, "HOME"); + if (!nw_wd) ft_putstr_fd("minishell: cd: HOME not set\n", 2); - if (!new_wd) + if (!nw_wd) return (0); } - return(new_wd); + return(nw_wd); } int cd(t_token *args, t_msh *msh)