42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-03-15 11:26:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

「🔨」 fix: CD not vomiting valgrind error

Browse Source
This commit is contained in:
Adam JOLY
2024-06-25 17:20:20 +02:00
parent e7a5e8041b
commit 7460600fa2
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/builtins.h
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/22 13:05:18 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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

8
src/builtins/ft_cd.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/22 15:07:24 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 *tmp;
char *dir; char *dir;
//char *parent;
tmp = pwd; tmp = pwd;
while (*tmp) while (*tmp)
@ -28,7 +27,6 @@ char *__get_parent_directory(char *pwd)
dir = tmp; dir = tmp;
tmp++; tmp++;
} }
//parent = ft_calloc(dir - pwd + 1, sizeof(char));
ft_strlcpy(pwd, pwd, dir - pwd + 1); ft_strlcpy(pwd, pwd, dir - pwd + 1);
return (pwd); return (pwd);
} }
@ -51,7 +49,8 @@ char *__relative_path(char *args, char *pwd)
else if (*tmp) else if (*tmp)
{ {
ft_strlcat(new_path, "/", ft_strlen(new_path) + 2); 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++; tmp++;
} }
@ -66,7 +65,6 @@ void ft_cd(t_env *env, char *args)
new_pwd = NULL; new_pwd = NULL;
pwd = ret_cwd(); pwd = ret_cwd();
ft_putendl_fd(env_get_value("OLDPWD", env), STDOUT_FILENO);
if (!args) if (!args)
new_pwd = env_get_value("HOME", env); new_pwd = env_get_value("HOME", env);
else if (args[0] == '/') else if (args[0] == '/')

4
src/builtins/ret_cwd.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/25 10:41:43 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 *ret_cwd(void)
{ {
char buf[PATH_MAX_LEN]; static char buf[PATH_MAX_LEN];
ft_bzero(buf, PATH_MAX_LEN); ft_bzero(buf, PATH_MAX_LEN);
return (getcwd(buf, PATH_MAX_LEN)); return (getcwd(buf, PATH_MAX_LEN));