fixed echo bt and did some norming

This commit is contained in:
mdev9
2024-03-26 09:12:32 +01:00
parent c5b6f8f53e
commit 0fb72c0c2c
12 changed files with 211 additions and 171 deletions

View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/07 16:04:11 by tomoron #+# #+# */
/* Updated: 2024/03/23 19:20:54 by marde-vr ### ########.fr */
/* Updated: 2024/03/26 08:59:44 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -20,6 +20,20 @@ void numeric_arg_err(char *arg, int *exit_code)
*exit_code = 2;
}
void get_exit_bt_return_code(t_msh *msh)
{
t_cmd *cur_cmd;
int exit_code;
cur_cmd = msh->cmds->next;
if (cur_cmd && cur_cmd->type == ARG && !ft_strisnbr(cur_cmd->token))
numeric_arg_err(cur_cmd->token, &exit_code);
else if (cur_cmd && cur_cmd->type == ARG)
exit_code = (unsigned char)ft_atoi(cur_cmd->token);
else
exit_code = g_return_code;
}
void exit_bt(t_msh *msh)
{
t_cmd *cur_cmd;
@ -36,12 +50,7 @@ void exit_bt(t_msh *msh)
}
else
{
if (cur_cmd && cur_cmd->type == ARG && !ft_strisnbr(cur_cmd->token))
numeric_arg_err(cur_cmd->token, &exit_code);
else if (cur_cmd && cur_cmd->type == ARG)
exit_code = (unsigned char)ft_atoi(cur_cmd->token);
else
exit_code = g_return_code;
get_exit_bt_return_code(msh);
if (msh->fds)
{
cmd_count = get_cmd_count(msh->cmds);