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: Made a cd wayyy more simpler, thx bonsthie

Browse Source
This commit is contained in:
Adam JOLY
2024-07-03 12:00:30 +02:00
parent 4a2b882d22
commit 9f25b17170
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
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/29 16:36:56 by adjoly ### ########.fr */ /* Updated: 2024/07/03 11:45:04 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -36,6 +36,7 @@ char *__relative_path(char *args, char *pwd)
{ {
char **path; char **path;
char **tmp; char **tmp;
char *ret;
char *new_path; char *new_path;
path = ft_split(args, '/'); path = ft_split(args, '/');
@ -47,7 +48,7 @@ char *__relative_path(char *args, char *pwd)
{ {
if (is_str(*tmp, "..")) if (is_str(*tmp, ".."))
new_path = __get_parent_directory(new_path); new_path = __get_parent_directory(new_path);
else if (*tmp) else if (*tmp && !is_str(*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_strlcat(new_path, *tmp, ft_strlen(new_path) + \
@ -55,9 +56,9 @@ char *__relative_path(char *args, char *pwd)
} }
tmp++; tmp++;
} }
*tmp = ft_strdup(new_path); ret = ft_strdup(new_path);
ft_free("a", path); ft_free("a", &path);
return (*tmp); return (ret);
} }
void ft_cd(t_env *env, char *args) void ft_cd(t_env *env, char *args)
@ -67,22 +68,23 @@ void ft_cd(t_env *env, char *args)
int ret; int ret;
new_pwd = NULL; new_pwd = NULL;
pwd = ret_cwd(); pwd = ft_strdup(ret_cwd());
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] == '/')
new_pwd = ft_strdup(args); //new_pwd = ft_strdup(args);
else if (args[0] == '-') else if (args[0] == '-')
new_pwd = env_get_value("OLDPWD", env); new_pwd = env_get_value("OLDPWD", env);
else else
new_pwd = __relative_path(args, pwd); new_pwd = ft_strdup(args);
//new_pwd = __relative_path(args, pwd);
ret = chdir(new_pwd); ret = chdir(new_pwd);
if (ret == -1) if (ret == -1)
{ {
printf("./minishell: cd: %s: %s\n", args, ERROR_NO_FILE); printf("./minishell: cd: %s: %s\n", args, ERROR_NO_FILE);
return ; return ;
} }
env_edit("PWD", ft_strdup(new_pwd), env); env_edit("PWD", ft_strdup(ret_cwd()), env);
env_edit("OLDPWD", ft_strdup(pwd), env); env_edit("OLDPWD", pwd, env);
free(args); free(args);
} }