diff options
Diffstat (limited to '')
| -rw-r--r-- | src/b_cd.c (renamed from src/ft_b_cd.c) | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/ft_b_cd.c b/src/b_cd.c index fbd0282..bcc8475 100644 --- a/src/ft_b_cd.c +++ b/src/b_cd.c @@ -1,7 +1,7 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* ft_b_cd.c :+: :+: :+: */ +/* b_cd.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: rbousset <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ @@ -14,55 +14,55 @@ #include <stdint.h> #include <unistd.h> -#include "ft_f_fail.h" -#include "ft_s_destroy.h" -#include "ft_s_struct.h" -#include "ft_u_utils.h" -#include "ft_u_vars.h" +#include "f_fail.h" +#include "s_destroy.h" +#include "s_struct.h" +#include "u_utils.h" +#include "u_vars.h" static void - ft_set_path(char **path, + set_path(char **path, char *args[], t_msh *msh) { if (!(*path = ft_strdup(*args))) { - ft_s_destroy(msh); - ft_fail_alloc(msh); + s_destroy(msh); + fail_alloc(msh); } if (!ft_strncmp("~/", *path, 2) || !ft_strncmp("~", *path, 2)) { if (!(*path = ft_strsubst(*path, - "~", ft_subst_var_value("$HOME", msh)))) + "~", subst_var_value("$HOME", msh)))) { - ft_s_destroy(msh); - ft_fail_alloc(msh); + s_destroy(msh); + fail_alloc(msh); } } } uint8_t - ft_b_cd(char *args[], + b_cd(char *args[], t_msh *msh) { - const uint64_t argc = ft_get_argc((const char**)args); + const uint64_t argc = get_argc((const char**)args); char *path; if (argc >= 2) { - ft_fail_too_many_args("cd", msh); + fail_too_many_args("cd", msh); return (1); } else if (argc == 0) { - if (!(path = ft_subst_var_value("$HOME", msh))) + if (!(path = subst_var_value("$HOME", msh))) return (1); } else - ft_set_path(&path, args, msh); + set_path(&path, args, msh); if (chdir(path) != 0) { - ft_fail_chd("cd", path, msh); + fail_chd("cd", path, msh); ft_memdel((void*)&path); return (1); } |