From 6e456095fce214a2eadea0cafa3fa7ea1113b4e6 Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 19 Jul 2020 19:27:52 +0200 Subject: Added errof for cleaner error message, Removed previous error functions --- src/builtin/cd.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/builtin/cd.c') diff --git a/src/builtin/cd.c b/src/builtin/cd.c index 2377ce7..d7115e5 100644 --- a/src/builtin/cd.c +++ b/src/builtin/cd.c @@ -6,7 +6,7 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 17:10:20 by charles #+# #+# */ -/* Updated: 2020/07/19 15:55:08 by charles ### ########.fr */ +/* Updated: 2020/07/19 19:05:25 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,8 +25,7 @@ int builtin_cd(char **argv, t_env env) (void)env; if (argv[1] != NULL && argv[2] != NULL) { - ft_putstr_fd(g_basename, STDERR_FILENO); - ft_putendl_fd(": cd: too many arguments", STDERR_FILENO); + errorf("cd: too many arguments\n"); return (1); } if (argv[1] != NULL && argv[1][0] == '\0') @@ -35,8 +34,7 @@ int builtin_cd(char **argv, t_env env) { if ((home = env_search(env, "HOME")) == NULL) { - ft_putstr_fd(g_basename, STDERR_FILENO); - ft_putendl_fd(": cd: HOME not set", STDERR_FILENO); + errorf("cd: HOME not set\n"); return (1); } argv[1] = home; @@ -44,11 +42,7 @@ int builtin_cd(char **argv, t_env env) errno = 0; if (chdir(argv[1]) == -1) { - ft_putstr_fd(g_basename, STDERR_FILENO); - ft_putstr_fd(": cd: ", STDERR_FILENO); - ft_putstr_fd(argv[1], STDERR_FILENO); - ft_putstr_fd(": ", STDERR_FILENO); - ft_putendl_fd(strerror(errno), STDERR_FILENO); + errorf("cd: %s: %s\n", argv[1], strerror(errno)); return (1); } if (!(getcwd(buf, PATH_MAX))) -- cgit