From b1267254008b75f3bfea5a9c47dee525e7da1860 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sat, 12 Dec 2020 18:19:38 +0100 Subject: Good --- src/s_init_next.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'src/s_init_next.c') diff --git a/src/s_init_next.c b/src/s_init_next.c index 3cc676d..1271b53 100644 --- a/src/s_init_next.c +++ b/src/s_init_next.c @@ -20,6 +20,7 @@ #endif #include #include +#include #include #include "b_export_next.h" @@ -118,21 +119,30 @@ void s_set_cwd(char cwd[], t_msh *msh) char fmt[PATH_MAX]; DIR *dir; + return ; u_get_var_value(cwd, "$PWD", PATH_MAX, msh); if (cwd[0] == C_NUL) { - getcwd(cwd, PATH_MAX); - ft_sprintf(fmt, "%s=%s", "PWD", cwd); - b_export_with_equals(fmt, msh); + if (getcwd(cwd, PATH_MAX) != NULL) + { + ft_sprintf(fmt, "%s=%s", "PWD", cwd); + b_export_with_equals(fmt, msh); + } + else + ft_dprintf(STDERR_FILENO, "minishell: %s\n", strerror(errno)); return ; } if ((dir = opendir(cwd)) != NULL) closedir(dir); else if (errno == ENOENT) { - getcwd(cwd, PATH_MAX); - ft_sprintf(fmt, "%s=%s", "PWD", cwd); - b_export_with_equals(fmt, msh); + if (getcwd(cwd, PATH_MAX) != NULL) + { + ft_sprintf(fmt, "%s=%s", "PWD", cwd); + b_export_with_equals(fmt, msh); + } + else + ft_dprintf(STDERR_FILENO, "minishell: %s\n", strerror(errno)); return ; } } -- cgit v1.2.3