tom/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed builtin edge cases

Browse Source
This commit is contained in:
mdev9
2024-03-06 09:10:48 +01:00
parent 87f8f9abc9
commit 4df96de4a3
4 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srcs/cd.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/16 21:02:54 by marde-vr #+# #+# */ /* Created: 2024/02/16 21:02:54 by marde-vr #+# #+# */
/* Updated: 2024/02/21 17:30:36 by marde-vr ### ########.fr */ /* Updated: 2024/03/06 08:43:53 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -19,6 +19,7 @@ int cd(t_cmd *args)
if (args->next && args->next->next && args->next->next->type == ARG) if (args->next && args->next->next && args->next->next->type == ARG)
{ {
ft_printf_fd(2, "minishell: cd: too many arguments\n"); ft_printf_fd(2, "minishell: cd: too many arguments\n");
g_return_code = 1;
return (1); return (1);
} }
if (!args->next || args->next->type != ARG) if (!args->next || args->next->type != ARG)
@ -26,6 +27,9 @@ int cd(t_cmd *args)
else else
new_wd = args->next->token; new_wd = args->next->token;
if (chdir(new_wd) == -1) if (chdir(new_wd) == -1)
{
perror("minishell: cd"); perror("minishell: cd");
g_return_code = 1;
}
return (0); return (0);
} }

31
srcs/exit.c
View File

@ -6,43 +6,42 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/07 16:04:11 by tomoron #+# #+# */ /* Created: 2024/02/07 16:04:11 by tomoron #+# #+# */
/* Updated: 2024/02/21 17:43:52 by marde-vr ### ########.fr */ /* Updated: 2024/03/06 09:10:11 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
void print_numeric_arg_err(char *arg) void numeric_arg_err(char *arg, int *exit_code)
{ {
ft_putstr_fd("minishell: exit: ", 2); ft_putstr_fd("minishell: exit: ", 2);
ft_putstr_fd(arg, 2); ft_putstr_fd(arg, 2);
ft_putstr_fd(": numeric argument required\n", 2); ft_putstr_fd(": numeric argument required\n", 2);
*exit_code = 2;
} }
void exit_bt(t_msh *msh) void exit_bt(t_msh *msh)
{ {
t_cmd *start; t_cmd *cur_cmd;
int exit_code; int exit_code;
start = msh->cmds; cur_cmd = msh->cmds->next;
msh->cmds = msh->cmds->next;
ft_printf("exit\n"); ft_printf("exit\n");
if (msh->cmds && msh->cmds->next && msh->cmds->next->type == ARG if (cur_cmd && cur_cmd->next && cur_cmd->next->type == ARG
&& ft_strisnbr(msh->cmds->token)) && ft_strisnbr(cur_cmd->token))
{
ft_putstr_fd("minishell: exit: too many arguments\n", 2); ft_putstr_fd("minishell: exit: too many arguments\n", 2);
g_return_code = 1;
}
else else
{ {
if (msh->cmds && msh->cmds->type == ARG if (cur_cmd && cur_cmd->type == ARG
&& !ft_strisnbr(msh->cmds->token)) && !ft_strisnbr(cur_cmd->token))
print_numeric_arg_err(msh->cmds->token); numeric_arg_err(cur_cmd->token, &exit_code);
if (msh->cmds && msh->cmds->type == ARG) else if (cur_cmd && cur_cmd->type == ARG)
exit_code = (unsigned char)ft_atoi(msh->cmds->token); exit_code = (unsigned char)ft_atoi(cur_cmd->token);
else if (msh->cmds && msh->cmds->type == ARG
&& !ft_strisnbr(msh->cmds->token))
exit_code = 2;
else else
exit_code = g_return_code; exit_code = g_return_code;
free_cmd(start);
free_msh(msh); free_msh(msh);
exit(exit_code); exit(exit_code);
} }

4
srcs/main.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */
/* Updated: 2024/03/05 18:30:57 by marde-vr ### ########.fr */ /* Updated: 2024/03/06 08:32:18 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -88,7 +88,7 @@ int main(int argc, char **argv, char **envp)
commands = (char *)1; commands = (char *)1;
init_minishell(&msh, argc, argv, envp); init_minishell(&msh, argc, argv, envp);
handle_minishellrc(msh); //handle_minishellrc(msh);
while (msh->env && commands) while (msh->env && commands)
{ {
prompt = get_prompt(msh->env); prompt = get_prompt(msh->env);

3
srcs/path.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/21 21:47:15 by marde-vr #+# #+# */ /* Created: 2024/02/21 21:47:15 by marde-vr #+# #+# */
/* Updated: 2024/03/05 17:30:27 by marde-vr ### ########.fr */ /* Updated: 2024/03/06 08:42:49 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -103,5 +103,6 @@ void get_cmd_path(t_msh *msh)
ft_printf_fd(2, "%s: command not found\n", msh->cmds->token); ft_printf_fd(2, "%s: command not found\n", msh->cmds->token);
free(msh->cmds->token); free(msh->cmds->token);
msh->cmds->token = 0; msh->cmds->token = 0;
g_return_code = 127;
} }
} }