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

exec

Browse Source
This commit is contained in:
Loic Deridder
2025-01-28 10:56:15 +01:00
parent 5c3cd44e5a
commit 66ebd61d6f
17 changed files with 252 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
srcs/builtins/cd.c
View File

@@ -6,21 +6,21 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:31:49 by lderidde #+# #+# */
/* Updated: 2025/01/24 14:31:49 by lderidde ### ########.fr */
/* Updated: 2025/01/28 10:06:11 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../includes/builtins.h"
void pwd_update(t_data *data, char *src, char *dest)
void pwd_update(t_ast_n *head, char *src, char *dest)
{
set_var_env("OLDPWD", src, data);
set_var_env("PWD", dest, data);
set_var_env("OLDPWD", src, head);
set_var_env("PWD", dest, head);
free_null_ptr(src);
free_null_ptr(dest);
}
int exec_cd(char *path, t_data *data)
int exec_cd(char *path, t_ast_n *head)
{
char *src;
char *dest;
@@ -29,29 +29,29 @@ int exec_cd(char *path, t_data *data)
if (chdir(path) == -1)
return (err_msg_cmd("cd", path, strerror(errno), EXIT_FAILURE));
dest = getcwd(NULL, 0);
pwd_update(data, src, dest);
pwd_update(head, src, dest);
return (0);
}
int builtin_cd(char **arg, t_data *data)
int builtin_cd(char **arg, t_ast_n *head)
{
char *path;
if (count_var(arg) == 1 || (count_var(arg) == 2 && ft_strncmp(arg[1], "~", 1) == 0))
{
path = get_var_value("HOME", data->env);
path = get_var_value("HOME", head->env);
if (!path)
return (err_msg_cmd("cd", NULL, "HOME not set\n", EXIT_FAILURE));
return (exec_cd(path, data));
return (exec_cd(path, head));
}
if (count_var(arg) > 2)
return (err_msg_cmd("cd", NULL, "too many arguments\n", EXIT_FAILURE));
if (ft_strncmp(arg[1], "-", 1) == 0)
{
path = get_var_value("OLDPWD", data->env);
path = get_var_value("OLDPWD", head->env);
if (!path)
return (err_msg_cmd("cd", NULL, "OLDPWD not set\n", EXIT_FAILURE));
return (exec_cd(path, data));
return (exec_cd(path, head));
}
return (exec_cd(arg[1], data));
return (exec_cd(arg[1], head));
}

5
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/24 14:31:56 by lderidde ### ########.fr */
/* Updated: 2025/01/28 09:34:41 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -89,7 +89,7 @@ static void echo_print(char **arg, int j, char **envp)
}
}
void builtin_echo(char **arg, char **envp)
int builtin_echo(char **arg, char **envp)
{
int i;
bool flag;
@@ -104,4 +104,5 @@ void builtin_echo(char **arg, char **envp)
echo_print(arg, i, envp);
if (!flag)
printf("\n");
return (0);
}

11
srcs/builtins/env.c
View File

@@ -6,22 +6,27 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:32:04 by lderidde #+# #+# */
/* Updated: 2025/01/24 14:32:04 by lderidde ### ########.fr */
/* Updated: 2025/01/28 09:54:32 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../includes/builtins.h"
void builtin_env(char *str, char **envp)
int builtin_env(char **arg, char **envp)
{
int i;
i = 0;
(void)str;
if (count_args(arg) > 1)
{
err_msg_cmd("env", NULL, "too many arguments", 1);
return (1);
}
while (envp[i])
{
if (envp[i][0] && ft_strchr(envp[i], '=') != NULL)
printf("%s\n", envp[i]);
i++;
}
return (0);
}

88
srcs/builtins/exit.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:32:13 by lderidde #+# #+# */
/* Updated: 2025/01/27 11:19:17 by lderidde ### ########.fr */
/* Updated: 2025/01/28 10:39:44 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -38,86 +38,36 @@ void bash_exit(int code)
void bash_exit_errornum(char *arg)
{
ft_putendl_fd("exit", 2);
ft_put_s_fd("minishell: exit: ", 2);
write(2, arg, ft_strlen(arg));
ft_putendl_fd(": numeric argument required", 2);
err_msg_cmd("exit", arg, "numeric argument required", 2);
exit(2);
}
static char *get_arg(char *str)
{
int i;
i = 4;
if (!str[i])
return (NULL);
while (str[i] && str[i] == ' ')
i++;
return (&str[i]);
}
int is_sep(char c)
{
if ((c >= 9 && c <= 13) || c == ' ' || c == '\0')
return (1);
else
return (0);
}
int count_arg(char *str)
{
int count;
int i;
count = 0;
i = 0;
while (str[i] && str[i + 1])
{
if (!is_sep(str[i]) && is_sep(str[i + 1]))
count++;
i++;
}
return (count);
}
void bash_exiterrorcount(void)
int bash_exiterrorcount(void)
{
ft_putendl_fd("exit", 2);
ft_putendl_fd("minishell: exit: too many arguments", 2);
/*
* SET EXIT CODE WITHOUT EXITING MINISHELL
*/
return (2);
}
void builtin_exit(char *str, bool depth)
int builtin_exit(char **arg, bool depth)
{
char *arg;
long res;
arg = get_arg(str);
long res = ft_atol(arg);
(void)res;
if (errno == ERANGE)
ft_printf("error numeric aarg\n");
if (ft_isnumeric(arg[1]))
res = ft_atol(arg[1]);
if (depth == true)
{
if (count_arg(str) >= 2)
{
ft_putendl_fd("minishell: exit: too many arguments", 2);
exit (1);
}
if (!ft_isnumeric(arg))
{
ft_put_s_fd("minishell: exit: ", 2);
write(2, arg, ft_strlen(arg));
ft_putendl_fd(": numeric argument required", 2);
exit(2);
}
exit(ft_atol(arg) % 256);
if (count_args(arg) > 2 && ft_isnumeric(arg[1]))
return (err_msg_cmd("exit", NULL, "too many arguments", 1));
else if (!ft_isnumeric(arg[1]) || errno == ERANGE)
return (err_msg_cmd("exit", arg[1], "numeric argument required", 2));
return (res % 256);
}
if (count_arg(str) >= 2)
bash_exiterrorcount();
else if (ft_isnumeric(arg))
bash_exit(ft_atol(arg) % 256);
if (count_args(arg) > 2 && ft_isnumeric(arg[1]))
return (bash_exiterrorcount());
else if (!ft_isnumeric(arg[1]) || errno == ERANGE)
bash_exit_errornum(arg[1]);
else
bash_exit_errornum(arg);
bash_exit(res % 256);
return (1);
}

20
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/24 14:32:20 by lderidde ### ########.fr */
/* Updated: 2025/01/28 10:19:06 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -59,7 +59,7 @@ void print_arr(char **envp)
}
}
void print_export(char **envp)
int print_export(char **envp)
{
int i;
int j;
@@ -85,25 +85,29 @@ void print_export(char **envp)
}
}
print_arr(envp);
return (0);
}
void builtin_export(char **arg, t_data *data)
int builtin_export(char **arg, t_ast_n *head)
{
int i;
char **tmp;
i = 0;
if (count_var(arg) == 1)
return (print_export(data->env));
while (++i < count_var(arg))
if (count_args(arg) == 1)
return (print_export(head->env));
while (++i < count_args(arg))
{
if (ft_strchr(arg[i], '=') != NULL)
{
tmp = key_value(arg[i]);
set_var_env(tmp[0], tmp[1], data);
if (!tmp)
return (1);
set_var_env(tmp[0], tmp[1], head);
free_tmp(tmp);
}
else
set_var_env(arg[i], NULL, data);
set_var_env(arg[i], NULL, head);
}
return (0);
}

42
srcs/builtins/pwd.c
View File

@@ -6,43 +6,27 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:32:30 by lderidde #+# #+# */
/* Updated: 2025/01/24 14:32:30 by lderidde ### ########.fr */
/* Updated: 2025/01/28 10:38:07 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../includes/builtins.h"
int count_char(char *str)
{
int i;
int count;
i = 0;
count = 0;
while (str[i])
{
if (str[i] != ' ')
count++;
i++;
}
return (count);
}
void builtin_pwd(char *arg)
int builtin_pwd(char **arg)
{
char *cwd;
if (count_char(arg) > 3)
ft_putendl_fd("pwd: too many arguments", 2);
else
(void)arg;
cwd = getcwd(NULL, 0);
if (cwd != NULL)
{
cwd = getcwd(NULL, 0);
if (cwd != NULL)
{
printf("%s\n", cwd);
free(cwd);
}
if (!cwd)
perror("pwd");
ft_printf("%s\n", cwd);
free(cwd);
return (0);
}
else
{
perror("pwd");
return (1);
}
}

6
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/24 14:32:36 by lderidde ### ########.fr */
/* Updated: 2025/01/28 10:32:54 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -33,7 +33,7 @@
// envp[i][0] = '\0';
// }
//
int builtin_unset(char **arg, t_data *data)
int builtin_unset(char **arg, t_ast_n *head)
{
int i;
int ret;
@@ -42,6 +42,6 @@ int builtin_unset(char **arg, t_data *data)
if (count_var(arg) == 1)
return (err_msg_cmd("unset", NULL, "not enough arguments", EXIT_FAILURE));
while (++i < count_var(arg))
ret = remove_env_var(arg[i], data);
ret = remove_env_var(arg[i], head);
return (ret);
}

26
srcs/builtins/utils.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:32:41 by lderidde #+# #+# */
/* Updated: 2025/01/24 14:32:41 by lderidde ### ########.fr */
/* Updated: 2025/01/28 10:53:44 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -14,13 +14,21 @@
int err_msg_cmd(char *cmd, char *arg, char *msg, int code)
{
ft_put_s_fd(cmd, 2);
ft_put_s_fd(": ", 2);
ft_put_s_fd(msg, 2);
if (arg)
{
ft_put_s_fd(": ", 2);
ft_putendl_fd(arg, 2);
}
if (arg != NULL)
ft_fprintf(2, "minishell: %s: %s: %s\n", cmd, arg, msg);
else
ft_fprintf(2, "minishell: %s: %s\n", cmd, msg);
return (code);
}
int count_args(char **tab)
{
int i;
i = 0;
if (!tab || !*tab)
return (0);
while (tab[i])
i++;
return (i);
}