From: Lukas Jiriste <ljiriste@student.42prague.com>
Date: Thu, 22 Aug 2024 15:54:02 +0000 (+0200)
Subject: Fix the return value of the builtins
X-Git-Url: https://git.ljiriste.work/?a=commitdiff_plain;h=74c1c0eef77a7f5ada1e40a5c0c9fa95d1916740;p=42%2Fminishell.git

Fix the return value of the builtins
---

diff --git a/src/builtins/echo.c b/src/builtins/echo.c
index 441f920..5c9f079 100644
--- a/src/builtins/echo.c
+++ b/src/builtins/echo.c
@@ -13,8 +13,6 @@ int	ft_check_n(char *str)
 
 int	echo(int argc, char **argv)
 {
-	if (argc == 1)
-		return (1);
 	int i = 1;
 	int flag = 0;
 	int t;
@@ -34,5 +32,5 @@ int	echo(int argc, char **argv)
 	}
 	if (flag == 0)
 		ft_putstr_fd("\n", 1);
-	return (1);
+	return (0);
 }
diff --git a/src/builtins/env.c b/src/builtins/env.c
index 03597df..ebfc66f 100644
--- a/src/builtins/env.c
+++ b/src/builtins/env.c
@@ -19,7 +19,7 @@ int	env_exec(const t_execution_env *env)
 		ft_putstr_fd("\n", 1);
 		++i;
 	}
-	return (1);
+	return (0);
 }
 
 int	ft_env(int argc, t_execution_env *env)
@@ -27,8 +27,8 @@ int	ft_env(int argc, t_execution_env *env)
 	if (argc == 1)
 	{
 		env_exec(env);
-		return (1);
+		return (0);
 	}
 	ft_putstr_fd("env: invalid option\n", 1);
-	return (0);
-}
\ No newline at end of file
+	return (1);
+}
diff --git a/src/execution.c b/src/execution.c
index 18d9265..70a86a9 100644
--- a/src/execution.c
+++ b/src/execution.c
@@ -6,7 +6,7 @@
 /*   By: lnikolov <lnikolov@student.42prague.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/21 08:57:54 by ljiriste          #+#    #+#             */
-/*   Updated: 2024/08/22 17:30:15 by ljiriste         ###   ########.fr       */
+/*   Updated: 2024/08/22 17:39:27 by ljiriste         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -782,11 +782,11 @@ int	ex_builtin(char **fields, __attribute__((unused)) t_vec *assignments, __attr
 {
 	if (!ft_strcmp(fields[0], "cd"))
 		env->ret_val = cd(count_fields(fields), fields, env);
-	if (!ft_strcmp(fields[0], "echo"))
+	else if (!ft_strcmp(fields[0], "echo"))
 		env->ret_val = echo(count_fields(fields), fields);
-	if (!ft_strcmp(fields[0], "pwd"))
+	else if (!ft_strcmp(fields[0], "pwd"))
 		env->ret_val = pwd(count_fields(fields));
-	if (!ft_strcmp(fields[0], "env"))
+	else if (!ft_strcmp(fields[0], "env"))
 		env->ret_val = ft_env(count_fields(fields), env);
 	else
 		return (-1);