From 73a7027a9d58c6ca71817170bff23ac71edac9d8 Mon Sep 17 00:00:00 2001
From: Charles <sircharlesaze@gmail.com>
Date: Sat, 28 Mar 2020 12:10:13 +0100
Subject: Cleaning env and path, Removed state struct

---
 src/builtin/cd.c     | 4 ++--
 src/builtin/echo.c   | 5 ++++-
 src/builtin/env.c    | 4 ++--
 src/builtin/export.c | 8 ++++----
 src/builtin/pwd.c    | 3 +--
 src/builtin/unset.c  | 4 ++--
 6 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'src/builtin')

diff --git a/src/builtin/cd.c b/src/builtin/cd.c
index c67cd23..f82a876 100644
--- a/src/builtin/cd.c
+++ b/src/builtin/cd.c
@@ -1,12 +1,12 @@
 #include "minishell.h"
 
-int	ms_cd(t_state *state, char **argv)
+int	ms_cd(t_env env, char **argv)
 {
 	char	*path;
 
 	path = argv[1];
 	if (argv[1] == NULL)
-		path = ft_htget(state->environment, "HOME");
+		path = ft_htget(env, "HOME");
 	if (path == NULL)
 		return (1);
 	if (chdir(path) == -1)
diff --git a/src/builtin/echo.c b/src/builtin/echo.c
index b8d2d43..b2bcee9 100644
--- a/src/builtin/echo.c
+++ b/src/builtin/echo.c
@@ -5,10 +5,13 @@ int	ms_echo(char **argv)
 	bool	newline;
 
 	newline = ft_strcmp(argv[1], "-n") == 0;
+	if (newline)
+		argv++;
 	while (*++argv != NULL)
 	{
 		ft_putstr(*argv);
-		ft_putchar(' ');
+		if (*(argv + 1) != NULL)
+			ft_putchar(' ');
 	}
 	if (newline)
 		ft_putchar('\n');
diff --git a/src/builtin/env.c b/src/builtin/env.c
index 24e474f..9e962ec 100644
--- a/src/builtin/env.c
+++ b/src/builtin/env.c
@@ -8,8 +8,8 @@ void	st_print_env_variable(t_ftht_content *content)
 	ft_putchar('\n');
 }
 
-int		ms_env(t_state *state)
+int		ms_env(t_env env)
 {
-	ft_htiter(state->environment, st_print_env_variable);
+	ft_htiter(env, st_print_env_variable);
 	return (0);
 }
diff --git a/src/builtin/export.c b/src/builtin/export.c
index e284270..df27655 100644
--- a/src/builtin/export.c
+++ b/src/builtin/export.c
@@ -1,6 +1,6 @@
 #include "minishell.h"
 
-int	ms_export(t_state *state, char **argv)
-{
-	return (0);
-}
+/* int	ms_export(t_env env, char **argv) */
+/* { */
+/* 	return (0); */
+/* } */
diff --git a/src/builtin/pwd.c b/src/builtin/pwd.c
index 9825bee..2836852 100644
--- a/src/builtin/pwd.c
+++ b/src/builtin/pwd.c
@@ -1,10 +1,9 @@
 #include "minishell.h"
 
-int	ms_pwd(t_state *state)
+int	ms_pwd(void)
 {
 	char	buf[PATH_MAX];
 
-	(void)state;
 	ft_bzero(buf, PATH_MAX);
 	if (getcwd(buf, PATH_MAX) == NULL)
 		return (1);
diff --git a/src/builtin/unset.c b/src/builtin/unset.c
index ea24a63..bc4327b 100644
--- a/src/builtin/unset.c
+++ b/src/builtin/unset.c
@@ -1,9 +1,9 @@
 #include "minishell.h"
 
-int	ms_unset(t_state *state, char **argv)
+int	ms_unset(t_env env, char **argv)
 {
 	if (argv[1] == NULL)
 		return (1);
-	ft_htdelone(state->environment, argv[1], ms_ht_del_str_entry);
+	ft_htdelone(env, argv[1], ms_ht_del_str_entry);
 	return (0);
 }
-- 
cgit