From 7460600fa227145417409867f7524a70397f3b15 Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Tue, 25 Jun 2024 17:20:20 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20CD=20no?= =?UTF-8?q?t=20vomiting=20valgrind=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/builtins.h | 2 +- src/builtins/ft_cd.c | 8 +++----- src/builtins/ret_cwd.c | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/builtins.h b/include/builtins.h index 957c9d0..e98abed 100644 --- a/include/builtins.h +++ b/include/builtins.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/22 13:05:18 by adjoly #+# #+# */ -/* Updated: 2024/06/25 11:30:49 by adjoly ### ########.fr */ +/* Updated: 2024/06/25 17:01:43 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/builtins/ft_cd.c b/src/builtins/ft_cd.c index 5d588b1..06f94ff 100644 --- a/src/builtins/ft_cd.c +++ b/src/builtins/ft_cd.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/22 15:07:24 by adjoly #+# #+# */ -/* Updated: 2024/06/25 15:03:15 by adjoly ### ########.fr */ +/* Updated: 2024/06/25 17:13:46 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,7 +19,6 @@ char *__get_parent_directory(char *pwd) { char *tmp; char *dir; - //char *parent; tmp = pwd; while (*tmp) @@ -28,7 +27,6 @@ char *__get_parent_directory(char *pwd) dir = tmp; tmp++; } - //parent = ft_calloc(dir - pwd + 1, sizeof(char)); ft_strlcpy(pwd, pwd, dir - pwd + 1); return (pwd); } @@ -51,7 +49,8 @@ char *__relative_path(char *args, char *pwd) else if (*tmp) { ft_strlcat(new_path, "/", ft_strlen(new_path) + 2); - ft_strlcat(new_path, *tmp, ft_strlen(new_path) + ft_strlen(*tmp) + 1); + ft_strlcat(new_path, *tmp, ft_strlen(new_path) + \ + ft_strlen(*tmp) + 1); } tmp++; } @@ -66,7 +65,6 @@ void ft_cd(t_env *env, char *args) new_pwd = NULL; pwd = ret_cwd(); - ft_putendl_fd(env_get_value("OLDPWD", env), STDOUT_FILENO); if (!args) new_pwd = env_get_value("HOME", env); else if (args[0] == '/') diff --git a/src/builtins/ret_cwd.c b/src/builtins/ret_cwd.c index 7c1ef52..b003471 100644 --- a/src/builtins/ret_cwd.c +++ b/src/builtins/ret_cwd.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/25 10:41:43 by adjoly #+# #+# */ -/* Updated: 2024/06/25 15:05:04 by adjoly ### ########.fr */ +/* Updated: 2024/06/25 17:04:37 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,7 +16,7 @@ char *ret_cwd(void) { - char buf[PATH_MAX_LEN]; + static char buf[PATH_MAX_LEN]; ft_bzero(buf, PATH_MAX_LEN); return (getcwd(buf, PATH_MAX_LEN));