diff options
| author | Rudy Bousset <rbousset@z2r5p6.le-101.fr> | 2019-10-30 17:05:31 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r5p6.le-101.fr> | 2019-10-30 17:05:31 +0100 |
| commit | 3051df7c3e57d5645a78d87fa63ff1144fd8699a (patch) | |
| tree | 5676fe8501f965cc9e62b8c25791ce1c9a04b0f4 /src | |
| parent | work work (diff) | |
| download | 42-minishell-3051df7c3e57d5645a78d87fa63ff1144fd8699a.tar.gz 42-minishell-3051df7c3e57d5645a78d87fa63ff1144fd8699a.tar.bz2 42-minishell-3051df7c3e57d5645a78d87fa63ff1144fd8699a.tar.xz 42-minishell-3051df7c3e57d5645a78d87fa63ff1144fd8699a.tar.zst 42-minishell-3051df7c3e57d5645a78d87fa63ff1144fd8699a.zip | |
exit function works
Diffstat (limited to 'src')
| -rw-r--r-- | src/ft_error.c | 4 | ||||
| -rw-r--r-- | src/ft_exit.c | 13 | ||||
| -rw-r--r-- | src/ft_process_arg.c | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/ft_error.c b/src/ft_error.c index 2cc9cb6..2216eae 100644 --- a/src/ft_error.c +++ b/src/ft_error.c @@ -1,7 +1,7 @@ #include <libft.h> #include <minishell.h> -void +int ft_error(const char *com, int errno) { ft_putstr("joe-sh: "); @@ -10,5 +10,7 @@ ft_error(const char *com, int errno) ft_putendl(": too many arguments"); else if (errno == 127) ft_putendl(": command not found"); + else if (errno == 255) + ft_putendl(": numeric argument required"); return (errno); } diff --git a/src/ft_exit.c b/src/ft_exit.c index e09212c..513b4d1 100644 --- a/src/ft_exit.c +++ b/src/ft_exit.c @@ -16,7 +16,7 @@ #include <stdlib.h> uint8_t -ft_exit(const char **com) +ft_exit(char **com) { uint8_t i; @@ -26,4 +26,15 @@ ft_exit(const char **com) i++; if (i > 2) return (ft_error(com[0], 1)); + else if (com[1]) + { + i = 0; + while (ft_isdigit(com[1][i])) + i++; + if (i != ft_strlen(com[1])) + return (ft_error(com[0], 255)); + else + exit((uint8_t)ft_atoi(com[1])); + } + exit(0); } diff --git a/src/ft_process_arg.c b/src/ft_process_arg.c index 4f6ccf6..9a1b620 100644 --- a/src/ft_process_arg.c +++ b/src/ft_process_arg.c @@ -21,6 +21,6 @@ ft_process_arg(const char *arg) else if (!ft_strncmp(com[0], "pwd", ft_strlen(com[0]))) return (ft_pwd()); else - return (ft_error(com[0]), 127); + return (ft_error(com[0], 127)); return (0); } |