nalebrun/mmoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merging

Browse Source
This commit is contained in:
Loic Deridder
2025-02-03 13:21:25 +01:00
parent 2fdfa68256
commit 1d6c03da53
9 changed files with 70 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
srcs/builtins/cd.c
View File

@@ -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));

2
srcs/builtins/echo.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:31:56 by lderidde #+# #+# */
/* Updated: 2025/01/28 12:40:27 by lderidde ### ########.fr */
/* Updated: 2025/02/03 13:13:38 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */

8
srcs/builtins/export.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:32:20 by lderidde #+# #+# */
/* Updated: 2025/01/30 13:07:49 by lderidde ### ########.fr */
/* Updated: 2025/02/03 13:11:35 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -112,7 +112,7 @@ int builtin_export(char **arg, t_ast_n *head)
i = 0;
if (count_args(arg) == 1)
return (print_export(head->env));
return (print_export(head->msh->env));
while (++i < count_args(arg))
{
if (is_export_valid(arg[i]))
@@ -122,11 +122,11 @@ int builtin_export(char **arg, t_ast_n *head)
tmp = key_value(arg[i]);
if (!tmp)
return (1);
set_var_env(tmp[0], tmp[1], head);
set_var_env(tmp[0], tmp[1], head->msh);
free_tab(tmp);
}
else
set_var_env(arg[i], NULL, head);
set_var_env(arg[i], NULL, head->msh);
}
else
return (err_msg_cmd("export", arg[i], EXPRT_INV, 1));

4
srcs/builtins/unset.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:32:36 by lderidde #+# #+# */
/* Updated: 2025/01/28 12:43:49 by lderidde ### ########.fr */
/* Updated: 2025/02/03 13:12:14 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -42,6 +42,6 @@ int builtin_unset(char **arg, t_ast_n *head)
if (count_args(arg) == 1)
return (err_msg_cmd("unset", NULL, "not enough arguments", EXIT_FAILURE));
while (++i < count_args(arg))
ret = remove_env_var(arg[i], head);
ret = remove_env_var(arg[i], head->msh);
return (!ret);
}