From 211c35dacf1ed8e3f9a90bdbd13171ff5ed2c414 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Wed, 20 Apr 2022 18:14:50 +0200
Subject: [PATCH] fix check args exit

---
 srcs/built_in/exit.c | 81 ++++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 37 deletions(-)

diff --git a/srcs/built_in/exit.c b/srcs/built_in/exit.c
index ef0df9a..8c7c4fe 100644
--- a/srcs/built_in/exit.c
+++ b/srcs/built_in/exit.c
@@ -3,58 +3,55 @@
 /*                                                        :::      ::::::::   */
 /*   exit.c                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: sadjigui <sadjigui@student.42.fr>          +#+  +:+       +#+        */
+/*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2022/04/15 11:23:32 by apommier          #+#    #+#             */
-/*   Updated: 2022/04/20 17:48:23 by sadjigui         ###   ########.fr       */
+/*   Created: 2022/04/20 17:53:35 by apommier          #+#    #+#             */
+/*   Updated: 2022/04/20 18:14:27 by apommier         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "../../includes/minishell.h"
 
-unsigned long long    ft_atoi_long(const char *nptr)
+unsigned long long	ft_atoi_long(const char *nptr)
 {
-    int                    i;
-    unsigned long long    nbr;
-    unsigned long long    minus;
+	int					i;
+	unsigned long long	nbr;
+	unsigned long long	minus;
 
-    minus = 1;
-    nbr = 0;
-    i = 0;
-    while ((nptr[i] >= 9 && nptr[i] <= 13) || nptr[i] == 32)
-        i++;
-    if (nptr[i] == '+')
-        i++;
-    else if (nptr[i] == '-')
-    {
-        i++;
-        minus = -1;
-    }
-    while (nptr[i] >= '0' && nptr[i] <= '9')
-    {
-        nbr = nbr * 10 + nptr[i] - '0';
-        i++;
-    }
-    return (minus * nbr);
+	minus = 1;
+	nbr = 0;
+	i = 0;
+	while ((nptr[i] >= 9 && nptr[i] <= 13) || nptr[i] == 32)
+		i++;
+	if (nptr[i] == '+')
+		i++;
+	else if (nptr[i] == '-')
+	{
+		i++;
+		minus = -1;
+	}
+	while (nptr[i] >= '0' && nptr[i] <= '9')
+	{
+		nbr = nbr * 10 + nptr[i] - '0';
+		i++;
+	}
+	return (minus * nbr);
 }
 
 int	max_long(char *nbr)
 {
-	unsigned long long long_max;
+	unsigned long long	long_max;
 
 	long_max = 9223372036854775807;
-	printf("%s\n", nbr);
 	if (ft_strlen(nbr) > 20)
 		return (1);
 	if (nbr[0] == '-')
 	{
-		printf("--->%lld\n", ft_atoi_long(nbr));
 		if (ft_atoi_long(nbr + 1) > long_max + 1)
 			return (1);
 	}
 	else if (ft_atoi_long(nbr) > long_max)
 		return (1);
-	printf("return 0\n");
 	return (0);
 }
 
@@ -64,11 +61,8 @@ void	exit_error(t_cmd *cmd)
 	exit_shell(cmd, 2);
 }
 
-void	ft_exit(t_s_cmd *cmd)
+int	check_exit_args(t_s_cmd *cmd)
 {
-	int	i;
-
-	i = -1;
 	if (cmd->nb_args > 2)
 	{
 		ft_putstr_fd("Minishell: exit: too many arguments\n", 2);
@@ -76,14 +70,27 @@ void	ft_exit(t_s_cmd *cmd)
 			cmd->big_cmd->err_var = 1;
 		else
 			exit(1);
-		return ;
+		return (0);
 	}
+	return (1);
+}
+
+void	ft_exit(t_s_cmd *cmd)
+{
+	int	i;
+
+	i = 0;
+	if (!check_exit_args(cmd))
+		return ;
 	else if (cmd->nb_args == 1)
 		exit_shell(cmd->big_cmd, 0);
-	while (cmd->args[1][++i])
+	while (cmd->args[1][i] == ' ')
+		i++;
+	if (cmd->args[1][i] == '-')
+		i++;
+	while (cmd->args[1][i])
 	{
-		if ((!ft_isdigit(cmd->args[1][i]) && !(cmd->args[1][i] == '-'
-			&& ft_isdigit(cmd->args[1][i + 1]))))
+		if (!ft_isdigit(cmd->args[1][i++]))
 			exit_error(cmd->big_cmd);
 	}
 	if (max_long(cmd->args[1]))