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

ça marche bien !

Browse Source
This commit is contained in:
tomoron
2024-04-23 20:07:21 +02:00
parent 7044aab736
commit 202c5e8811
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
srcs/cd.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/16 21:02:54 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 *get_new_wd(t_token *arg, t_msh *msh)
{ {
char *new_wd; char *nw_wd;
if (arg) if (arg)
{ {
new_wd = arg->value; nw_wd = arg->value;
if(ft_strcmp("-", new_wd)) if(!ft_strcmp("-", nw_wd))
{ {
new_wd = ft_get_env(msh->env, "OLDPWD"); nw_wd = ft_get_env(msh->env, "OLDPWD");
if(!new_wd) if(!nw_wd)
ft_putstr_fd("minishell: cd: OLDPWD not set\n", 2); ft_putstr_fd("minishell: cd: OLDPWD not set\n", 2);
if(!new_wd) if(!nw_wd)
return(0); return(0);
ft_printf_fd((1 * (msh->out_fd == 0)) + msh->out_fd, "%s\n", nw_wd);
} }
} }
else else
{ {
new_wd = ft_get_env(msh->env, "HOME"); nw_wd = ft_get_env(msh->env, "HOME");
if (!new_wd) if (!nw_wd)
ft_putstr_fd("minishell: cd: HOME not set\n", 2); ft_putstr_fd("minishell: cd: HOME not set\n", 2);
if (!new_wd) if (!nw_wd)
return (0); return (0);
} }
return(new_wd); return(nw_wd);
} }
int cd(t_token *args, t_msh *msh) int cd(t_token *args, t_msh *msh)