diff options
Diffstat (limited to 'src/builtin')
| -rw-r--r-- | src/builtin/cd.c | 17 | ||||
| -rw-r--r-- | src/builtin/exit.c | 12 |
2 files changed, 7 insertions, 22 deletions
diff --git a/src/builtin/cd.c b/src/builtin/cd.c index d7115e5..5f7cdd8 100644 --- a/src/builtin/cd.c +++ b/src/builtin/cd.c @@ -6,7 +6,7 @@ /* By: charles <charles@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 17:10:20 by charles #+# #+# */ -/* Updated: 2020/07/19 19:05:25 by charles ### ########.fr */ +/* Updated: 2020/09/10 19:40:31 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,27 +24,18 @@ int builtin_cd(char **argv, t_env env) (void)env; if (argv[1] != NULL && argv[2] != NULL) - { - errorf("cd: too many arguments\n"); - return (1); - } + return (errorf_ret(1, "cd: too many arguments\n")); if (argv[1] != NULL && argv[1][0] == '\0') return (0); if (argv[1] == NULL) { if ((home = env_search(env, "HOME")) == NULL) - { - errorf("cd: HOME not set\n"); - return (1); - } + return (errorf_ret(1, "cd: HOME not set\n")); argv[1] = home; } errno = 0; if (chdir(argv[1]) == -1) - { - errorf("cd: %s: %s\n", argv[1], strerror(errno)); - return (1); - } + return (errorf_ret(1, "cd: %s: %s\n", argv[1], strerror(errno))); if (!(getcwd(buf, PATH_MAX))) return (1); if (env_export(env, "PWD", buf) == NULL) diff --git a/src/builtin/exit.c b/src/builtin/exit.c index 52a4462..a24efad 100644 --- a/src/builtin/exit.c +++ b/src/builtin/exit.c @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 17:10:16 by charles #+# #+# */ -/* Updated: 2020/08/20 17:31:18 by charles ### ########.fr */ +/* Updated: 2020/09/10 19:41:03 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,15 +32,9 @@ int builtin_exit(char **argv, t_env env) while (ft_isblank(*after)) after++; if (*after != '\0' || errno == ERANGE) - { - errorf("exit: %s: numeric argument required\n", argv[1]); - return (2); - } + return (errorf_ret(2, "exit: %s: numeric argument required\n", argv[1])); if (argv[2] != NULL) - { - errorf("exit: too many arguments\n"); - return (1); - } + return (errorf_ret(1, "exit: too many arguments\n")); } exit(status % 256); return (0); |