From 3d260621c5033323ed8867d54c99bc5d52bd6d4f Mon Sep 17 00:00:00 2001 From: PrStein Date: Wed, 20 Apr 2022 15:59:53 +0200 Subject: [PATCH 1/2] fix cd --- Makefile | 8 ++++---- includes/minishell.h | 5 +++-- srcs/built_in/cd.c | 30 +++++++++++++++--------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 0baae2b..fed0997 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ # ::: :::::::: # # Makefile :+: :+: :+: # # +:+ +:+ +:+ # -# By: apommier +#+ +:+ +#+ # +# By: sadjigui +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/03/06 12:50:24 by apommier #+# #+# # -# Updated: 2022/04/20 04:44:00 by apommier ### ########.fr # +# Updated: 2022/04/20 15:52:32 by sadjigui ### ########.fr # # # # **************************************************************************** # @@ -26,6 +26,7 @@ SRCS = srcs/main.c\ srcs/set_redirection/set_output.c\ srcs/built_in/unset.c\ srcs/built_in/cd.c\ + srcs/built_in/cd_erreur.c\ srcs/built_in/echo.c\ srcs/built_in/export.c\ srcs/built_in/utils_builtin.c\ @@ -37,8 +38,7 @@ SRCS = srcs/main.c\ srcs/set_quote/split_with_quote.c\ srcs/set_quote/set_quote.c\ srcs/set_signals/set_signal.c\ - srcs/set_quote/set_var.c - + srcs/set_quote/set_var.c\ OBJS = ${SRCS:.c=.o} CC = clang diff --git a/includes/minishell.h b/includes/minishell.h index a6f8539..3db2b62 100644 --- a/includes/minishell.h +++ b/includes/minishell.h @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* minishell.h :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: apommier +#+ +:+ +#+ */ +/* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/09 22:33:49 by apommier #+# #+# */ -/* Updated: 2022/04/20 04:44:53 by apommier ### ########.fr */ +/* Updated: 2022/04/20 15:41:57 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ @@ -148,6 +148,7 @@ int check_variable(char *variable); int cd_error(t_s_cmd *cmd, char *str, int i); int size_path(char **str); int check_return(t_s_cmd *cmd, int var); +void change_oldpwd(char **env, int old_pwd, int pwd, char *p); //real builtin void ft_exit(t_s_cmd *cmd); diff --git a/srcs/built_in/cd.c b/srcs/built_in/cd.c index 4260850..53dee03 100644 --- a/srcs/built_in/cd.c +++ b/srcs/built_in/cd.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* cd.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: syd +#+ +:+ +#+ */ +/* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/21 18:30:26 by sadjigui #+# #+# */ -/* Updated: 2022/04/19 16:56:35 by syd ### ########.fr */ +/* Updated: 2022/04/20 15:52:57 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ @@ -39,7 +39,7 @@ void change_path(t_s_cmd *cmd) add_one(cmd); } -void check_home(char *p, char **env) +int check_home(t_s_cmd *cmd, char *p, char **env) { int home; int len_home; @@ -53,18 +53,18 @@ void check_home(char *p, char **env) p = ft_substr(env[home], 5, ft_strlen(env[len_home])); if (chdir(p) == 0) { - if (find_it(env, "PWD") != -1) - { - if (find_it(env, "OLDPWD") != -1) - { - free(env[old_pwd]); - env[old_pwd] = ft_strjoin("OLD", env[pwd]); - } - free(env[pwd]); - env[pwd] = ft_strjoin("PWD=", p); - } + change_oldpwd(env, old_pwd, pwd, p); + free(p); + return (check_return(cmd, 0)); } - free(p); + else + { + ft_putstr_fd("Minishell: cd: ", 2); + ft_putstr_fd(p, 2); + ft_putstr_fd(": No such directory\n", 2); + free(p); + return (check_return(cmd, 1)); + } } int check_dir(t_s_cmd *cmd) @@ -100,7 +100,7 @@ int open_directory(t_s_cmd *cmd) { if (find_it(cmd->big_cmd->env, "HOME") < 0) return (cd_error(cmd, "Minishell: cd: HOME not set", 1)); - check_home(p, cmd->big_cmd->env); + return(check_home(cmd, p, cmd->big_cmd->env)); } else if (cmd->nb_args == 2) i = check_dir(cmd); From 3015b4c3456ffe24b36e501eb1ac9b41f204139f Mon Sep 17 00:00:00 2001 From: PrStein Date: Wed, 20 Apr 2022 16:12:28 +0200 Subject: [PATCH 2/2] norme built-in --- includes/minishell.h | 4 ++-- srcs/built_in/cd.c | 10 +++++----- srcs/built_in/cd_utils.c | 27 +++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 srcs/built_in/cd_utils.c diff --git a/includes/minishell.h b/includes/minishell.h index 3db2b62..613c82d 100644 --- a/includes/minishell.h +++ b/includes/minishell.h @@ -6,7 +6,7 @@ /* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/09 22:33:49 by apommier #+# #+# */ -/* Updated: 2022/04/20 15:41:57 by sadjigui ### ########.fr */ +/* Updated: 2022/04/20 16:10:27 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ @@ -148,7 +148,7 @@ int check_variable(char *variable); int cd_error(t_s_cmd *cmd, char *str, int i); int size_path(char **str); int check_return(t_s_cmd *cmd, int var); -void change_oldpwd(char **env, int old_pwd, int pwd, char *p); +void change_oldpwd(char **env, int old_pwd, int pwd, char *p); //real builtin void ft_exit(t_s_cmd *cmd); diff --git a/srcs/built_in/cd.c b/srcs/built_in/cd.c index 53dee03..59ab949 100644 --- a/srcs/built_in/cd.c +++ b/srcs/built_in/cd.c @@ -6,7 +6,7 @@ /* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/21 18:30:26 by sadjigui #+# #+# */ -/* Updated: 2022/04/20 15:52:57 by sadjigui ### ########.fr */ +/* Updated: 2022/04/20 16:09:32 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ @@ -53,16 +53,16 @@ int check_home(t_s_cmd *cmd, char *p, char **env) p = ft_substr(env[home], 5, ft_strlen(env[len_home])); if (chdir(p) == 0) { - change_oldpwd(env, old_pwd, pwd, p); + change_oldpwd(env, old_pwd, pwd, p); free(p); - return (check_return(cmd, 0)); + return (check_return(cmd, 0)); } else { ft_putstr_fd("Minishell: cd: ", 2); ft_putstr_fd(p, 2); ft_putstr_fd(": No such directory\n", 2); - free(p); + free(p); return (check_return(cmd, 1)); } } @@ -100,7 +100,7 @@ int open_directory(t_s_cmd *cmd) { if (find_it(cmd->big_cmd->env, "HOME") < 0) return (cd_error(cmd, "Minishell: cd: HOME not set", 1)); - return(check_home(cmd, p, cmd->big_cmd->env)); + return (check_home(cmd, p, cmd->big_cmd->env)); } else if (cmd->nb_args == 2) i = check_dir(cmd); diff --git a/srcs/built_in/cd_utils.c b/srcs/built_in/cd_utils.c new file mode 100644 index 0000000..f5cb8f7 --- /dev/null +++ b/srcs/built_in/cd_utils.c @@ -0,0 +1,27 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* cd_utils.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: sadjigui +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/04/20 15:35:02 by sadjigui #+# #+# */ +/* Updated: 2022/04/20 16:07:58 by sadjigui ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "../../includes/minishell.h" + +void change_oldpwd(char **env, int old_pwd, int pwd, char *p) +{ + if (find_it(env, "PWD") != -1) + { + if (find_it(env, "OLDPWD") != -1) + { + free(env[old_pwd]); + env[old_pwd] = ft_strjoin("OLD", env[pwd]); + } + free(env[pwd]); + env[pwd] = ft_strjoin("PWD=", p); + } +}