logistic-bot/minishell
1
0
Fork 0
mirror of https://codeberg.org/la-chouette/minishell.git synced 2025-12-05 23:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

exit: handle invalid and large arguments

Browse source
This commit is contained in:
Khaïs COLIN 2025-04-02 19:14:00 +02:00
parent f1c132337b
commit 715c2aced8
Signed by: logistic-bot
SSH key fingerprint: SHA256:RlpiqKeXpcPFZZ4y9Ou4xi2M8OhRJovIwDlbCaMsuAo
2 changed files with 104 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/executing/simple_cmd/builtin_exit.c
View file

@ -6,21 +6,73 @@
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/01 18:17:56 by khais #+# #+# */
/* Updated: 2025/04/02 15:06:22 by khais ### ########.fr */
/* Updated: 2025/04/15 11:48:05 by khais ### ########.fr */
/* */
/* ************************************************************************** */
#include "builtins.h"
#include <stdlib.h>
#include "libft.h"
#include "simple_cmd_execute.h"
#include "unistd.h"
static int ft_isspace(char c)
{
return ((c == ' ' || c == '\f' || c == '\n'
|| c == '\r' || c == '\t' || c == '\v'));
}
static int ft_atoi_strict(const char *nptr, bool *ok)
{
int sign;
int calc;
sign = 1;
calc = 0;
*ok = true;
while (*nptr && ft_isspace(*nptr))
nptr++;
if (*nptr == '+' || *nptr == '-')
{
if (nptr[0] == '-')
sign = -1;
nptr++;
}
while (*nptr && ft_isdigit(*nptr))
{
calc = calc * 10 + (*nptr - '0');
nptr++;
}
if (*nptr != '\0')
*ok = false;
return (sign * calc);
}
static int numeric_arg_required(char *arg)
{
ft_dprintf(STDERR_FILENO,
"minishell: exit: %s: numeric argument required\n", arg);
return (2);
}
t_builtin_type builtin_exit(t_simple_cmd *cmd, t_minishell *app)
{
int status;
int status;
bool ok;
status = 0;
if (cmd->words->next != NULL)
status = ft_atoi(cmd->words->next->word->word);
{
status = ft_atoi_strict(cmd->words->next->word->word, &ok);
if (!ok)
status = numeric_arg_required(cmd->words->next->word->word);
else if (cmd->words->next->next != NULL)
{
ft_dprintf(STDERR_FILENO, "minishell: exit: too many arguments\n");
app->last_return_value = 1;
return (BUILTIN_EXIT);
}
}
simple_cmd_destroy(cmd);
env_destroy(app->env);
exit(status);

49
test.sh
View file

@ -375,6 +375,55 @@ expecting <<EOF
99
EOF
when_run <<EOF "exit works with extreme exit codes"
$MINISHELL
exit 1234567890
echo \$?
$MINISHELL
exit -1234567890
echo \$?
EOF
expecting <<EOF
210
46
EOF
when_run <<EOF "exit works with nan input"
$MINISHELL
exit not-a-number
echo \$?
EOF
expecting <<EOF
minishell: exit: not-a-number: numeric argument required
2
EOF
when_run <<EOF "exit works with too many arguments"
$MINISHELL
exit 1 2
echo \$?
exit
echo \$?
$MINISHELL
exit not-a-number 3
echo \$?
$MINISHELL
exit 3 not-a-number
echo \$?
exit
echo \$?
EOF
expecting <<EOF
minishell: exit: too many arguments
1
0
minishell: exit: not-a-number: numeric argument required
2
minishell: exit: too many arguments
1
0
EOF
when_run <<EOF "quoted parentheses are not operators"
echo unclosed '('
EOF