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

fixes

Browse Source
This commit is contained in:
Loic Deridder
2025-02-11 14:25:40 +01:00
parent 5149604867
commit ebc62388a2
13 changed files with 375 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
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/02/06 13:27:33 by lderidde ### ########.fr */
/* Updated: 2025/02/11 13:01:12 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -29,16 +29,19 @@ int ft_isnumeric(char *str)
return (1);
}
void bash_exit(int code)
void bash_exit(int code, int check, t_ast_n *node)
{
ft_putendl_fd("exit", 2);
if (check)
ft_putendl_fd("exit", 2);
free_child(node->msh);
exit(code);
}
void bash_exit_errornum(char *arg)
void bash_exit_errornum(char *arg, t_ast_n *node)
{
ft_putendl_fd("exit", 2);
err_msg_cmd("exit", arg, "numeric argument required", 2);
free_child(node->msh);
exit(2);
}
@@ -52,6 +55,7 @@ int bash_exiterrorcount(void)
int builtin_exit(char **arg, bool depth, t_ast_n *node)
{
long res;
int ret;
res = node->msh->ex_code;
if (arg[1] && ft_isnumeric(arg[1]))
@@ -61,14 +65,18 @@ int builtin_exit(char **arg, bool depth, t_ast_n *node)
if (count_args(arg) > 2 && ft_isnumeric(arg[1]))
return (err_msg_cmd("exit", NULL, "too many arguments", 1));
else if (arg[1] && (!ft_isnumeric(arg[1]) || errno == ERANGE))
exit (err_msg_cmd("exit", arg[1], "numeric argument required", 2));
exit (res % 256);
{
ret = err_msg_cmd("exit", arg[1], "numeric argument required", 2);
free_child(node->msh);
exit (ret);
}
bash_exit (res % 256, 0, node);
}
if (count_args(arg) > 2 && ft_isnumeric(arg[1]))
return (bash_exiterrorcount());
else if (arg[1] && (!ft_isnumeric(arg[1]) || errno == ERANGE))
bash_exit_errornum(arg[1]);
bash_exit_errornum(arg[1], node);
else
bash_exit(res % 256);
bash_exit(res % 256, 1, node);
return (1);
}

2
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/02/08 14:57:34 by lderidde ### ########.fr */
/* Updated: 2025/02/11 14:25:21 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */

13
srcs/execution/exec.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/27 11:22:33 by lderidde #+# #+# */
/* Updated: 2025/02/11 11:06:48 by lderidde ### ########.fr */
/* Updated: 2025/02/11 12:30:00 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -186,15 +186,17 @@ void read_input(t_ast_n *node, int j)
check = ifhere_remove_quote(node, j);
len = ft_strlen(node->files[j]);
str = get_next_line(node->msh->here_fd);
str = get_next_line(node->msh->here_fd, 0);
while (str && ft_strncmp(str, node->files[j], len) != 0)
{
if (!check)
expander_here(&str, node);
write(1, str, ft_strlen(str));
ft_free(&str);
str = get_next_line(node->msh->here_fd);
str = get_next_line(node->msh->here_fd, 0);
}
if (!str)
get_next_line(node->msh->here_fd, 1);
ft_free(&str);
}
@@ -210,6 +212,7 @@ void here_doc(t_ast_n *node, int i)
close(node->fds[0]);
close(node->fds[1]);
read_input(node, i);
free_child(node->msh);
exit(EXIT_SUCCESS);
}
else if (pid > 0)
@@ -334,8 +337,10 @@ char *find_path(char *cmd, char **env)
if (access(cmd, F_OK) == 0 && access(cmd, X_OK) == 0)
return (cmd);
i = 0;
while (ft_strnstr(env[i], "PATH=", 5) == NULL)
while (env[i] && ft_strnstr(env[i], "PATH=", 5) == NULL)
i++;
if (!env[i])
return (NULL);
paths = ft_split(env[i] + 5, ":");
i = -1;
while (paths[++i])

4
srcs/expander/expand_star.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/10 09:09:37 by lderidde #+# #+# */
/* Updated: 2025/02/10 13:29:09 by lderidde ### ########.fr */
/* Updated: 2025/02/11 13:04:05 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -100,7 +100,7 @@ int expand_star(t_ast_n *node, int j)
int i;
i = 0;
while (node->args[j][i])
while (node->args[j] && node->args[j][i])
{
if (node->args[j][i] == '*' && !in_quote(node->args[j], &node->args[j][i]))
return (expander_star(node, j, node->args[j]), 1);

6
srcs/expander/expander.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/07 10:23:02 by lderidde #+# #+# */
/* Updated: 2025/02/10 10:40:34 by lderidde ### ########.fr */
/* Updated: 2025/02/11 13:10:18 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -106,7 +106,7 @@ t_ast_n *expand_node(t_ast_n *node)
int check;
i = -1;
while (node->args[++i])
while (node->args && node->args[++i])
{
check = 0;
if (expand_tilde(node, i))
@@ -116,6 +116,8 @@ t_ast_n *expand_node(t_ast_n *node)
if (!ifremove_quote(node, i) && check)
{
split_tab(node, i);
if (!node->args[i])
i--;
check = 0;
}
check = expand_star(node, i);

14
srcs/main.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* main.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/27 14:16:52 by nalebrun #+# #+# */
/* Updated: 2025/02/10 12:31:46 by nalebrun ### ########.fr */
/* Created: 2025/01/27 14:16:52 by lderidde #+# #+# */
/* Updated: 2025/02/11 13:22:49 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -37,14 +37,14 @@ static void add_prevhistory(t_msh *msh)
char *str;
char *tmp;
str = get_next_line(msh->hist);
str = get_next_line(msh->hist, 0);
while (str)
{
tmp = ft_substr(str, 0, ft_strlen(str) - 1);
add_history(tmp);
free(tmp);
free(str);
str = get_next_line(msh->hist);
str = get_next_line(msh->hist, 0);
}
}
@@ -58,7 +58,9 @@ static void interpret_cmd(char **input, t_msh *msh)
}
msh->here_fd = open(".heredoc", O_RDONLY);
msh->ex_code = execute_command(msh->head);
close(msh->here_fd);
get_next_line(msh->here_fd, 1);
if (msh->here_fd != -1)
close(msh->here_fd);
unlink(".heredoc");
free_ast(msh->head);
msh->head = NULL;

5
srcs/msh_struct.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/06 15:32:03 by lderidde #+# #+# */
/* Updated: 2025/02/10 13:31:17 by lderidde ### ########.fr */
/* Updated: 2025/02/11 13:18:58 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -50,7 +50,8 @@ t_msh *init_msh(char **envp)
void free_msh(t_msh *msh)
{
free_tab(msh->env);
close(msh->hist);
if (msh->hist != -1)
close(msh->hist);
free(msh->input);
free(msh);
}

10
srcs/powerline.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* powerline.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/10 12:19:10 by nalebrun #+# #+# */
/* Updated: 2025/02/10 12:19:10 by nalebrun ### ########.fr */
/* Created: 2025/02/10 12:19:10 by lderidde #+# #+# */
/* Updated: 2025/02/11 14:19:32 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -29,12 +29,14 @@ char *get_pwd()
char *out;
pwd = getcwd(NULL, 0);
if (!pwd)
return (ft_strdup(""));
pwd_base = pwd;
cpy = pwd;
if (ft_strncmp(pwd, "/home", 5) == 0)
{
pwd += 6;
while (*pwd && (*pwd) != '/')
while (pwd && *pwd && (*pwd) != '/')
pwd++;
out = ft_strjoin("~", pwd);
}