merging
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/01/24 14:31:49 by lderidde #+# #+# */
|
||||
/* Updated: 2025/01/28 10:06:11 by lderidde ### ########.fr */
|
||||
/* Updated: 2025/02/03 13:12:47 by lderidde ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
void pwd_update(t_ast_n *head, char *src, char *dest)
|
||||
{
|
||||
set_var_env("OLDPWD", src, head);
|
||||
set_var_env("PWD", dest, head);
|
||||
set_var_env("OLDPWD", src, head->msh);
|
||||
set_var_env("PWD", dest, head->msh);
|
||||
free_null_ptr(src);
|
||||
free_null_ptr(dest);
|
||||
}
|
||||
@@ -39,7 +39,7 @@ int builtin_cd(char **arg, t_ast_n *head)
|
||||
|
||||
if (count_var(arg) == 1 || (count_var(arg) == 2 && ft_strncmp(arg[1], "~", 1) == 0))
|
||||
{
|
||||
path = get_var_value("HOME", head->env);
|
||||
path = get_var_value("HOME", head->msh->env);
|
||||
if (!path)
|
||||
return (err_msg_cmd("cd", NULL, "HOME not set\n", EXIT_FAILURE));
|
||||
return (exec_cd(path, head));
|
||||
@@ -48,7 +48,7 @@ int builtin_cd(char **arg, t_ast_n *head)
|
||||
return (err_msg_cmd("cd", NULL, "too many arguments\n", EXIT_FAILURE));
|
||||
if (ft_strncmp(arg[1], "-", 1) == 0)
|
||||
{
|
||||
path = get_var_value("OLDPWD", head->env);
|
||||
path = get_var_value("OLDPWD", head->msh->env);
|
||||
if (!path)
|
||||
return (err_msg_cmd("cd", NULL, "OLDPWD not set\n", EXIT_FAILURE));
|
||||
return (exec_cd(path, head));
|
||||
|
||||
Reference in New Issue
Block a user