From 5d896c6fe27a25a402bf890843967804d89499a8 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sat, 28 Nov 2020 06:20:20 +0100 Subject: Fixing exit not exiting on argument error --- .gitignore | 2 ++ minishell_test | 2 +- src/builtin/exit.c | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f70fd1a..097e4e9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ a.out vgcore.* *.orig *.dSYM +*.ppm +*.mp4 diff --git a/minishell_test b/minishell_test index 689138c..96871d6 160000 --- a/minishell_test +++ b/minishell_test @@ -1 +1 @@ -Subproject commit 689138c699f15c7a892a79cf4ffe07b9fc6abb10 +Subproject commit 96871d6f9554ba8d0ff5981edd252245aec9001e diff --git a/src/builtin/exit.c b/src/builtin/exit.c index ad0bfa7..a516391 100644 --- a/src/builtin/exit.c +++ b/src/builtin/exit.c @@ -6,7 +6,7 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 17:10:16 by charles #+# #+# */ -/* Updated: 2020/10/11 14:27:03 by cacharle ### ########.fr */ +/* Updated: 2020/11/28 06:16:24 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -41,10 +41,10 @@ int builtin_exit(char **argv, t_env env) if (errno == ERANGE || *after != '\0') { errorf("exit: %s: numeric argument required\n", argv[1]); - return (255); + exit(255); } if (argv[2] != NULL) - return (errorf_ret(1, "exit: too many arguments\n")); + exit(errorf_ret(1, "exit: too many arguments\n")); } exit(status % 256); return (0); -- cgit