diff --git a/includes/minishell.h b/includes/minishell.h index 5329ac7..018d18d 100644 --- a/includes/minishell.h +++ b/includes/minishell.h @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/09 22:33:49 by apommier #+# #+# */ -/* Updated: 2022/04/11 17:13:23 by apommier ### ########.fr */ +/* Updated: 2022/04/11 17:53:06 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -98,7 +98,7 @@ int tab_len(char **tab); int find_len(char *input, int i, char c); void lone_export(t_s_cmd *cmd); void find_variable(char *variable, t_s_cmd *cmd); -int find_it(char **str, char *s); +int find_it(char **str, char *s); //real builtin void print_env(char **tab); diff --git a/srcs/built_in/cd.c b/srcs/built_in/cd.c index 334b477..9195914 100644 --- a/srcs/built_in/cd.c +++ b/srcs/built_in/cd.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/21 18:30:26 by sadjigui #+# #+# */ -/* Updated: 2022/04/11 17:39:48 by apommier ### ########.fr */ +/* Updated: 2022/04/11 17:54:03 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -128,7 +128,7 @@ void reboot_pwd(t_s_cmd *cmd, int i) free(str); } -int find_it(char **str, char *s) +int find_it(char **str, char *s) { int i; @@ -161,6 +161,7 @@ void open_directory(t_s_cmd *cmd) { if (find_it(cmd->big_cmd->env, "HOME") < 0) { + // printf("---->%s\n", cmd->big_cmd->env[find_it(cmd->big_cmd->env, "HOME")]); printf("Minishell: cd: HOME not set\n"); cmd->big_cmd->err_var = 1; return ; @@ -208,5 +209,6 @@ void ft_pwd(t_s_cmd *cmd) ft_putstr_fd("Minishell: pwd: Not found\n", 2); } else - ft_putstr_fd(p, 1); + ft_putendl_fd(p, 1); + } \ No newline at end of file diff --git a/srcs/built_in/export.c b/srcs/built_in/export.c index 74c6b89..3f9c4c5 100644 --- a/srcs/built_in/export.c +++ b/srcs/built_in/export.c @@ -74,6 +74,7 @@ void ft_export_variable(t_s_cmd *cmd, char *variable) // printf("jojo\n"); dest = check_value(variable); unset = ft_substr(dest, 0, find_len(dest, 0, '=')); + printf("%s\n", unset); while (cmd->big_cmd->env[i] != NULL) { if (ft_strncmp(unset, cmd->big_cmd->env[i], ft_strlen(unset)) == 0) diff --git a/srcs/built_in/unset.c b/srcs/built_in/unset.c index f96fdd7..5066ba8 100644 --- a/srcs/built_in/unset.c +++ b/srcs/built_in/unset.c @@ -52,7 +52,7 @@ void unset_variable(t_s_cmd *cmd, int i) cmd->big_cmd->env[a] = NULL; if (tmp) free_double(tmp); - printf("2-------------\n"); + } @@ -65,7 +65,6 @@ void find_variable(char *variable, t_s_cmd *cmd) i = 0; str = ft_strjoin(variable, "="); j = 0; - // printf("variable == %s\n", variable); while (str[j]) j++; while (cmd->big_cmd->env[i] && !(ft_strncmp(cmd->big_cmd->env[i], str, j) == 0)) @@ -74,7 +73,6 @@ void find_variable(char *variable, t_s_cmd *cmd) return ; unset_variable(cmd, i); free(str); - printf("%s\n", "3----------------"); } void ft_unset(t_s_cmd *cmd)