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

3
includes/exec/builtins.h
View File

@@ -6,14 +6,13 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/28 09:01:33 by lderidde #+# #+# */ /* Created: 2025/01/28 09:01:33 by lderidde #+# #+# */
/* Updated: 2025/01/30 10:40:49 by lderidde ### ########.fr */ /* Updated: 2025/02/03 13:03:14 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#ifndef BUILTINS_H #ifndef BUILTINS_H
# define BUILTINS_H # define BUILTINS_H
# include "../lib/libft/libft.h"
# include "../minishell.h" # include "../minishell.h"
# include <stdio.h> # include <stdio.h>
# include <sys/types.h> # include <sys/types.h>

11
includes/exec/env.h
View File

@@ -6,14 +6,13 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/28 10:11:07 by lderidde #+# #+# */ /* Created: 2025/01/28 10:11:07 by lderidde #+# #+# */
/* Updated: 2025/01/28 10:31:54 by lderidde ### ########.fr */ /* Updated: 2025/02/03 13:09:33 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#ifndef ENV_H #ifndef ENV_H
# define ENV_H # define ENV_H
# include "../lib/libft/libft.h"
# include "../minishell.h" # include "../minishell.h"
# include <unistd.h> # include <unistd.h>
# include <stdlib.h> # include <stdlib.h>
@@ -21,13 +20,13 @@
//VAR //VAR
int count_var(char **envp); int count_var(char **envp);
int get_var_index(char *key, t_ast_n *head); int get_var_index(char *key, t_msh *msh);
void free_null_ptr(void *ptr); void free_null_ptr(void *ptr);
char **copy_env_var(char **envp, int count); char **copy_env_var(char **envp, int count);
char *get_var_value(char *key, char **envp); char *get_var_value(char *key, char **envp);
bool is_valid_key(char *key, t_ast_n *head); bool is_valid_key(char *key, t_msh *msh);
int remove_env_var(char *key, t_ast_n *head); int remove_env_var(char *key, t_msh *msh);
void set_var_env(char *key, char *value, t_ast_n *head); void set_var_env(char *key, char *value, t_msh *msh);
char **init_env(char **envp); char **init_env(char **envp);
#endif #endif

10
srcs/builtins/cd.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:31:49 by lderidde #+# #+# */ /* 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) void pwd_update(t_ast_n *head, char *src, char *dest)
{ {
set_var_env("OLDPWD", src, head); set_var_env("OLDPWD", src, head->msh);
set_var_env("PWD", dest, head); set_var_env("PWD", dest, head->msh);
free_null_ptr(src); free_null_ptr(src);
free_null_ptr(dest); 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)) 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) if (!path)
return (err_msg_cmd("cd", NULL, "HOME not set\n", EXIT_FAILURE)); return (err_msg_cmd("cd", NULL, "HOME not set\n", EXIT_FAILURE));
return (exec_cd(path, head)); 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)); return (err_msg_cmd("cd", NULL, "too many arguments\n", EXIT_FAILURE));
if (ft_strncmp(arg[1], "-", 1) == 0) if (ft_strncmp(arg[1], "-", 1) == 0)
{ {
path = get_var_value("OLDPWD", head->env); path = get_var_value("OLDPWD", head->msh->env);
if (!path) if (!path)
return (err_msg_cmd("cd", NULL, "OLDPWD not set\n", EXIT_FAILURE)); return (err_msg_cmd("cd", NULL, "OLDPWD not set\n", EXIT_FAILURE));
return (exec_cd(path, head)); return (exec_cd(path, head));

2
srcs/builtins/echo.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:31:56 by lderidde #+# #+# */ /* 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> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:32:20 by lderidde #+# #+# */ /* 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; i = 0;
if (count_args(arg) == 1) if (count_args(arg) == 1)
return (print_export(head->env)); return (print_export(head->msh->env));
while (++i < count_args(arg)) while (++i < count_args(arg))
{ {
if (is_export_valid(arg[i])) if (is_export_valid(arg[i]))
@@ -122,11 +122,11 @@ int builtin_export(char **arg, t_ast_n *head)
tmp = key_value(arg[i]); tmp = key_value(arg[i]);
if (!tmp) if (!tmp)
return (1); return (1);
set_var_env(tmp[0], tmp[1], head); set_var_env(tmp[0], tmp[1], head->msh);
free_tab(tmp); free_tab(tmp);
} }
else else
set_var_env(arg[i], NULL, head); set_var_env(arg[i], NULL, head->msh);
} }
else else
return (err_msg_cmd("export", arg[i], EXPRT_INV, 1)); 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> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:32:36 by lderidde #+# #+# */ /* 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) if (count_args(arg) == 1)
return (err_msg_cmd("unset", NULL, "not enough arguments", EXIT_FAILURE)); return (err_msg_cmd("unset", NULL, "not enough arguments", EXIT_FAILURE));
while (++i < count_args(arg)) while (++i < count_args(arg))
ret = remove_env_var(arg[i], head); ret = remove_env_var(arg[i], head->msh);
return (!ret); return (!ret);
} }

54
srcs/env/var.c vendored
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/28 10:08:49 by lderidde #+# #+# */ /* Created: 2025/01/28 10:08:49 by lderidde #+# #+# */
/* Updated: 2025/01/28 10:09:55 by lderidde ### ########.fr */ /* Updated: 2025/02/03 13:10:32 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -75,7 +75,7 @@ char *get_var_value(char *key, char **envp)
return (NULL); return (NULL);
} }
bool is_valid_key(char *key, t_ast_n *head) bool is_valid_key(char *key, t_msh *msh)
{ {
char *tmp; char *tmp;
int i; int i;
@@ -83,9 +83,9 @@ bool is_valid_key(char *key, t_ast_n *head)
tmp = ft_strjoin(key, "="); tmp = ft_strjoin(key, "=");
if (!tmp) if (!tmp)
return (false); return (false);
while (head->env[i]) while (msh->env[i])
{ {
if (ft_strncmp(head->env[i], tmp, ft_strlen(tmp)) == 0) if (ft_strncmp(msh->env[i], tmp, ft_strlen(tmp)) == 0)
{ {
free_null_ptr(tmp); free_null_ptr(tmp);
return (true); return (true);
@@ -96,7 +96,7 @@ bool is_valid_key(char *key, t_ast_n *head)
return (false); return (false);
} }
int get_var_index(char *key, t_ast_n *head) int get_var_index(char *key, t_msh *msh)
{ {
int i; int i;
char *new_key; char *new_key;
@@ -105,16 +105,16 @@ int get_var_index(char *key, t_ast_n *head)
if (!new_key) if (!new_key)
return (-1); return (-1);
i = 0; i = 0;
while (head->env[i]) while (msh->env[i])
{ {
if (ft_strncmp(head->env[i], new_key, ft_strlen(new_key)) == 0) if (ft_strncmp(msh->env[i], new_key, ft_strlen(new_key)) == 0)
{ {
free_null_ptr(new_key); free_null_ptr(new_key);
return (i); return (i);
} }
else if (ft_strncmp(head->env[i], key, ft_strlen(key)) == 0 else if (ft_strncmp(msh->env[i], key, ft_strlen(key)) == 0
&& (ft_strchr(head->env[i], '=') == NULL && && (ft_strchr(msh->env[i], '=') == NULL &&
(ft_strlen(head->env[i]) == ft_strlen(key)))) (ft_strlen(msh->env[i]) == ft_strlen(key))))
{ {
free_null_ptr(new_key); free_null_ptr(new_key);
return (i); return (i);
@@ -126,51 +126,51 @@ int get_var_index(char *key, t_ast_n *head)
} }
int remove_env_var(char *key, t_ast_n *head) int remove_env_var(char *key, t_msh *msh)
{ {
int i; int i;
int j; int j;
i = get_var_index(key, head); i = get_var_index(key, msh);
if (i == -1) if (i == -1)
return (0); return (0);
j = i; j = i;
free_null_ptr(head->env[i]); free_null_ptr(msh->env[i]);
while (head->env[i + 1]) while (msh->env[i + 1])
{ {
head->env[i] = ft_strdup(head->env[i + 1]); msh->env[i] = ft_strdup(msh->env[i + 1]);
free_null_ptr(head->env[i + 1]); free_null_ptr(msh->env[i + 1]);
j++; j++;
i++; i++;
} }
head->env = copy_env_var(head->env, j); msh->env = copy_env_var(msh->env, j);
if (head->env) if (msh->env)
return (1); return (1);
return (0); return (0);
} }
void set_var_env(char *key, char *value, t_ast_n *head) void set_var_env(char *key, char *value, t_msh *msh)
{ {
int i; int i;
char *tmp; char *tmp;
i = get_var_index(key, head); i = get_var_index(key, msh);
if (value) if (value)
tmp = ft_strjoin(key, "="); tmp = ft_strjoin(key, "=");
if (!tmp) if (!tmp)
return ; return ;
if (i != -1 && head->env[i]) if (i != -1 && msh->env[i])
{ {
free_null_ptr(head->env[i]); free_null_ptr(msh->env[i]);
head->env[i] = ft_strjoin(tmp, value); msh->env[i] = ft_strjoin(tmp, value);
} }
else else
{ {
i = count_var(head->env); i = count_var(msh->env);
head->env = copy_env_var(head->env, i + 1); msh->env = copy_env_var(msh->env, i + 1);
if (!head->env) if (!msh->env)
return ; return ;
head->env[i] = ft_strjoin(tmp, value); msh->env[i] = ft_strjoin(tmp, value);
} }
free_null_ptr(tmp); free_null_ptr(tmp);
return ; return ;

14
srcs/execution/exec.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/27 11:22:33 by lderidde #+# #+# */ /* Created: 2025/01/27 11:22:33 by lderidde #+# #+# */
/* Updated: 2025/01/31 11:47:38 by lderidde ### ########.fr */ /* Updated: 2025/02/03 13:15:41 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -84,15 +84,15 @@ int exec_builtin(t_ast_n *node)
else if (ft_strncmp(node->cmd, "pwd", 3) == 0) else if (ft_strncmp(node->cmd, "pwd", 3) == 0)
return (builtin_pwd(node->args)); return (builtin_pwd(node->args));
else if (ft_strncmp(node->cmd, "echo", 4) == 0) else if (ft_strncmp(node->cmd, "echo", 4) == 0)
return (builtin_echo(node->args, node->head->env)); return (builtin_echo(node->args, node->msh->env));
else if (ft_strncmp(node->cmd, "env", 3) == 0) else if (ft_strncmp(node->cmd, "env", 3) == 0)
return (builtin_env(node->args, node->head->env)); return (builtin_env(node->args, node->msh->env));
else if (ft_strncmp(node->cmd, "unset", 5) == 0) else if (ft_strncmp(node->cmd, "unset", 5) == 0)
return (builtin_unset(node->args, node->head)); return (builtin_unset(node->args, node));
else if (ft_strncmp(node->cmd, "cd", 2) == 0) else if (ft_strncmp(node->cmd, "cd", 2) == 0)
return (builtin_cd(node->args, node->head)); return (builtin_cd(node->args, node));
else else
return (builtin_export(node->args, node->head)); return (builtin_export(node->args, node));
} }
int count_cmds(t_ast_n **pline) int count_cmds(t_ast_n **pline)
@@ -145,7 +145,7 @@ int exec(t_ast_n *node)
char *path; char *path;
handle_redir(node); handle_redir(node);
path = find_path(node->cmd, node->head->env); path = find_path(node->cmd, node->msh->env);
if (!path) if (!path)
return_error(node->cmd, "command not found", 127); return_error(node->cmd, "command not found", 127);
if (access(path, X_OK) != 0) if (access(path, X_OK) != 0)

23
srcs/main.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/27 14:16:52 by lderidde #+# #+# */ /* Created: 2025/01/27 14:16:52 by lderidde #+# #+# */
/* Updated: 2025/01/31 09:57:17 by lderidde ### ########.fr */ /* Updated: 2025/02/03 13:19:31 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -52,6 +52,20 @@ char **ft_setnewenv(void)
return (envp); return (envp);
} }
t_msh *init_msh(char **envp)
{
t_msh *msh;
msh = malloc(sizeof(t_msh) * 1);
if (!msh)
return (NULL);
if (!envp[0])
msh->env = ft_setnewenv();
else
msh->env = copy_env_var(envp, count_var(envp));
return (msh);
}
int main(int ac, char **av, char **envp) int main(int ac, char **av, char **envp)
{ {
char *input; char *input;
@@ -59,10 +73,9 @@ int main(int ac, char **av, char **envp)
(void)ac; (void)ac;
(void)av; (void)av;
if (!envp[0]) msh = init_msh(envp);
msh->env = ft_setnewenv(); if (!msh)
else return (1);
msh->env = copy_env_var(envp, count_var(envp));
while (1) while (1)
{ {
input = powerline(); input = powerline();